db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r666320 - in /db/derby/docs/trunk/src: devguide/ ref/
Date Tue, 10 Jun 2008 20:56:16 GMT
Author: chaase3
Date: Tue Jun 10 13:56:15 2008
New Revision: 666320

URL: http://svn.apache.org/viewvc?rev=666320&view=rev
Log:
DERBY-3668: Remove JDBC 3.0-specific topics from Reference Manual and merge implementation
notes as needed

Developer's Guide: Added new topic on savepoints, modified 6 others and map file.
Reference Manual: Modified 7 topics and map file, deleted 10 topics.

Patch: DERBY-3668-6.diff

Added:
    db/derby/docs/trunk/src/devguide/cdevconceptssavepoints.dita   (with props)
Removed:
    db/derby/docs/trunk/src/ref/crefjavsaverel.dita
    db/derby/docs/trunk/src/ref/crefjavsaverules.dita
    db/derby/docs/trunk/src/ref/crefjavsavesetroll.dita
    db/derby/docs/trunk/src/ref/rrefjavsaverestrict.dita
    db/derby/docs/trunk/src/ref/rrefjdbc32593.dita
    db/derby/docs/trunk/src/ref/rrefjdbcdatabasemetadata30.dita
    db/derby/docs/trunk/src/ref/rrefjdbcjavasqlconnection30.dita
    db/derby/docs/trunk/src/ref/rrefjdbcjavasqlpreparedstatement30.dita
    db/derby/docs/trunk/src/ref/rrefjdbcjavasqlstatement30.dita
    db/derby/docs/trunk/src/ref/rrefjdbcparametermetadata30.dita
Modified:
    db/derby/docs/trunk/src/devguide/cdevconcepts14433.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts22641.dita
    db/derby/docs/trunk/src/devguide/cdevconcepts29416.dita
    db/derby/docs/trunk/src/devguide/cdevstandards806118.dita
    db/derby/docs/trunk/src/devguide/cdevstandardsxml.dita
    db/derby/docs/trunk/src/devguide/derbydev.ditamap
    db/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita
    db/derby/docs/trunk/src/ref/crefjavstateautogen.dita
    db/derby/docs/trunk/src/ref/crefjdbc12657.dita
    db/derby/docs/trunk/src/ref/crefjdbc25142.dita
    db/derby/docs/trunk/src/ref/refderby.ditamap
    db/derby/docs/trunk/src/ref/rrefjdbc15905.dita
    db/derby/docs/trunk/src/ref/rrefjdbc27734.dita
    db/derby/docs/trunk/src/ref/rrefjdbc40794.dita
    db/derby/docs/trunk/src/ref/rrefjdbcjavasqlsavepoint.dita

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts14433.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevconcepts14433.dita?rev=666320&r1=666319&r2=666320&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts14433.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts14433.dita Tue Jun 10 13:56:15 2008
@@ -40,7 +40,8 @@
 developer can insert code to explicitly roll back the entire transaction if
 desired.</p>
 <p><ph conref="../conrefs.dita#prod/productshortname"></ph> supports partial
-rollback through the use of savepoints. See the <cite><ph conref="../conrefs.dita#pub/citref"></ph></cite>
for
-more information.</p>
+rollback through the use of savepoints. See 
+<xref href="cdevconceptssavepoints.dita#cdevconceptssavepoints"></xref> for more
+information.</p>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts22641.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevconcepts22641.dita?rev=666320&r1=666319&r2=666320&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts22641.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts22641.dita Tue Jun 10 13:56:15 2008
@@ -20,14 +20,14 @@
 -->
 <concept id="cdevconcepts22641" xml:lang="en-us">
 <title>Scrollable result sets</title>
-<shortdesc>JDBC 2.0 adds two new types of result sets which allows
+<shortdesc>JDBC provides two types of result sets that allow
 you to scroll in either direction or to move the cursor to a
 particular row. <ph conref="../conrefs.dita#prod/productshortname"></ph> supports
one of
 these types: scrollable insensitive result sets
 (<codeph>ResultSet.TYPE_SCROLL_INSENSITIVE</codeph>).
 </shortdesc>
 <prolog><metadata>
-<keywords><indexterm>result set</indexterm><indexterm>Scrollable
cursors</indexterm><indexterm>ResultSets<indexterm>scrollable insensitive
(JDBC 2.0)</indexterm></indexterm><indexterm>Cursors<indexterm>scrollable
insensitive</indexterm></indexterm></keywords>
+<keywords><indexterm>result set</indexterm><indexterm>Scrollable
cursors</indexterm><indexterm>ResultSets<indexterm>scrollable insensitive</indexterm></indexterm><indexterm>Cursors<indexterm>scrollable
insensitive</indexterm></indexterm></keywords>
 </metadata></prolog>
 <conbody>
 <section>
@@ -42,17 +42,17 @@
 
 <p>
 Insensitive result sets, in contrast to sensitive result sets,
-are insensitive to changes made by others on the rows which have been
+cannot see changes made by others on the rows which have been
 materialized. <ph conref="../conrefs.dita#prod/productshortname"></ph>
-allows updates of scrollable insensitive result sets, please see <xref
-href="rdevconceptssur.dita#visibility">Visibilty of changes</xref>,
+allows updates of scrollable insensitive result sets; see <xref
+href="rdevconceptssur.dita#visibility">Visibility of changes</xref>,
 which also explains visibility of own changes.
 </p>
 
 <p>
 <note>
 <ph conref="../conrefs.dita#prod/productshortname"></ph> does not
-support result sets of type ResultSet.TYPE_SCROLL_SENSITIVE.
+support result sets of type <codeph>ResultSet.TYPE_SCROLL_SENSITIVE</codeph>.
 </note>
 </p>
 

Modified: db/derby/docs/trunk/src/devguide/cdevconcepts29416.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevconcepts29416.dita?rev=666320&r1=666319&r2=666320&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts29416.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts29416.dita Tue Jun 10 13:56:15 2008
@@ -39,14 +39,19 @@
 <p>You should be aware of the following when you use auto-commit:</p>
 <ul>
 <li><i>Cursors</i>   <p>You cannot use auto-commit if you do any
positioned
-updates or deletes (that is, an update or delete statement with a "WHERE CURRENT
-OF" clause) on cursors which have the <i>close cursors on commit</i> option
-set.</p><p>Auto-commit automatically closes cursors, which are explicitly
-opened with the <i>close on commit</i> option, when you do any in-place updates
-or deletes.</p><p>A cursor declared to be held across commit can execute updates
-and issue multiple commits before closing the cursor, but the cursor must
-be repositioned before any statement following the commit. If this is attempted
-with auto-commit on, an error is generated. </p></li>
+updates or deletes (that is, an update or delete statement with a WHERE CURRENT
+OF clause) on cursors which have the
+<codeph><i>ResultSet.CLOSE_CURSORS_AT_COMMIT</i></codeph> holdability
value
+set.</p><p>Auto-commit automatically closes cursors that are
+explicitly opened with the
+<codeph><i>ResultSet.CLOSE_CURSORS_AT_COMMIT</i></codeph> value,
when you do any
+in-place updates or deletes.</p><p>An updatable cursor declared to be held
+across commit (this is the default value) can execute updates and issue multiple
+commits before closing the cursor. After an explicit or implicit commit, a
+holdable forward-only cursor must be repositioned with a call to the
+<codeph><i>next</i></codeph> method before it can accessed again.
In this state,
+the only other valid operation besides calling <codeph><i>next</i></codeph>
is
+calling <codeph><i>close</i></codeph>.</p></li>
 <li><i>Database-side JDBC Procedures (procedures using nested connections)</i>

  <p>You cannot execute procedures within SQL statements if those procedures
 perform a commit or rollback on the current connection. Since in the auto-commit
@@ -76,7 +81,7 @@
 <row>
 <entry colname="1">Transactions</entry>
 <entry colname="2">Each statement is a separate transaction.</entry>
-<entry colname="3">Commit() or rollback() begins a transaction.</entry>
+<entry colname="3">Commit() or rollback() completes a transaction.</entry>
 </row>
 <row>
 <entry colname="1">Database-side JDBC procedures (routines using nested connections)</entry>
@@ -85,7 +90,7 @@
 </row>
 <row>
 <entry colname="1">Updatable cursors</entry>
-<entry colname="2">Does not work.</entry>
+<entry colname="2">Works for holdable cursors; does not work for non-holdable cursors.</entry>
 <entry colname="3">Works.</entry>
 </row>
 <row>
@@ -97,7 +102,12 @@
 <row>
 <entry colname="1">Updatable ResultSets</entry>
 <entry colname="2">Works.</entry>
-<entry colname="3">Works. Not required by the JDBC program.</entry>
+<entry colname="3">Works.</entry>
+</row>
+<row>
+<entry colname="1">Savepoints</entry>
+<entry colname="2">Does not work.</entry>
+<entry colname="3">Works.</entry>
 </row>
 </tbody>
 </tgroup>

Added: db/derby/docs/trunk/src/devguide/cdevconceptssavepoints.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevconceptssavepoints.dita?rev=666320&view=auto
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconceptssavepoints.dita (added)
+++ db/derby/docs/trunk/src/devguide/cdevconceptssavepoints.dita Tue Jun 10 13:56:15 2008
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
+ "../dtd/concept.dtd">
+<!-- 
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License.  You may obtain a copy of the License at      
+
+   http://www.apache.org/licenses/LICENSE-2.0  
+
+Unless required by applicable law or agreed to in writing, software  
+distributed under the License is distributed on an "AS IS" BASIS,  
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
+See the License for the specific language governing permissions and  
+limitations under the License.
+-->
+<concept id="cdevconceptssavepoints" xml:lang="en-us">
+<title>Using savepoints</title>
+<shortdesc>The <i>Savepoint</i> interface contains
+methods to set, release, or roll back a transaction to designated savepoints.
+Once a savepoint has been set, the transaction can be rolled back to that
+savepoint without affecting preceding work. Savepoints provide finer-grained
+control of transactions by marking intermediate points within a transaction.
+</shortdesc>
+<prolog><metadata>
+<keywords>
+<indexterm>java.sql.Savepoint</indexterm><indexterm>Savepoints (JDBC)</indexterm>
+<indexterm>Savepoints<indexterm>setting and rollong back</indexterm></indexterm>
+<indexterm>Savepoints<indexterm>releasing</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<conbody>
+<section><title>Setting and rolling back to a savepoint</title>
+<p>The <i>Connection.setSavepoint</i> method sets a savepoint within the
current
+transaction. The <i>Connection.rollback</i> method is overloaded to take a
+savepoint argument.</p>
+<p>The code example below inserts a row into a table, sets the savepoint
+<codeph>svpt1</codeph>, and then inserts a second row. When the transaction is
+later rolled back to <codeph>svpt1</codeph>, the second insertion is undone,
but
+the first insertion remains intact. In other words, when the transaction is
+committed, only the row containing '1' will be added to TABLE1.
+<codeblock expanse="column"><b>conn.setAutoCommit(false); // Autocommit must
be off to use savepoints.
+Statement stmt = conn.createStatement();
+int rows = stmt.executeUpdate("INSERT INTO TABLE1 (COL1) VALUES(1)");
+// set savepoint
+Savepoint svpt1 = conn.setSavepoint("S1");
+rows = stmt.executeUpdate("INSERT INTO TABLE1 (COL1) VALUES (2)");
+...
+conn.rollback(svpt1);
+...
+conn.commit();</b></codeblock></p>
+</section>
+<section><title>Releasing a savepoint </title>
+<p>The method <i>Connection.releaseSavepoint</i> takes a <i>Savepoint</i>
object
+as a parameter and removes it from the current transaction. Once a savepoint
+has been released, attempting to reference it in a rollback operation will
+cause an <i>SQLException</i> to be thrown.</p>
+<p>Any savepoints that have been created in a transaction are automatically
+released and become invalid when the transaction is committed or when the
+entire transaction is rolled back.</p>
+<p>Rolling a transaction back to a savepoint automatically releases and makes
+invalid any other savepoints created after the savepoint in question.</p>
+</section>
+<section><title>Rules for savepoints</title>
+<p>The savepoint cannot be set within a batch of statements to enable partial
+recovery. If a savepoint is set any time before the method <i>executeBatch</i>
+is called, it is set before any of the statements that have been added to the
+batch are executed.</p>
+<p>A savepoint can be reused after it has been released explicitly (by issuing a
+release of the savepoint) or implicitly (by issuing a connection
+commit/rollback to that savepoint or to a savepoint declared earlier than that
+savepoint).</p>
+<p>It is possible to nest savepoints, but only in an embedded environment.</p>
+</section>
+</conbody>
+</concept>

Propchange: db/derby/docs/trunk/src/devguide/cdevconceptssavepoints.dita
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/docs/trunk/src/devguide/cdevstandards806118.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevstandards806118.dita?rev=666320&r1=666319&r2=666320&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstandards806118.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstandards806118.dita Tue Jun 10 13:56:15 2008
@@ -21,7 +21,7 @@
 <concept id="cdevstandards806118" xml:lang="en-us">
 <title>Derby and standards</title>
 <shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> adheres
-to SQL99 standards wherever possible. This section describes those
+to SQL99 or newer standards wherever possible. This section describes those
 features currently in <ph conref="../conrefs.dita#prod/productshortname"></ph>
that
 are not standard; these features are currently being evaluated and might be
 removed in future releases.</shortdesc>
@@ -121,17 +121,11 @@
 <dt>Transactions</dt>
 <dd>All operations in <ph conref="../conrefs.dita#prod/productshortname"></ph>
 are transactional. <ph conref="../conrefs.dita#prod/productshortname"></ph>
-supports transaction control using JDBC 3.0 Connection methods. This includes
+supports transaction control using JDBC Connection methods. This includes
 support for savepoints and for the four JDBC transaction isolation levels. The
 only SQL command provided for transaction control is SET TRANSACTION ISOLATION.
 </dd>
 </dlentry>
-<dlentry>
-<dt>Unique constraints and nulls</dt>
-<dd>The SQL standard defines that unique constraints on nullable columns
-allow any number of nulls; <ph conref="../conrefs.dita#prod/productshortname"></ph>
does
-not permit unique constraints on nullable columns.</dd>
-</dlentry>
 </dl>
 </conbody>
 </concept>

Modified: db/derby/docs/trunk/src/devguide/cdevstandardsxml.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevstandardsxml.dita?rev=666320&r1=666319&r2=666320&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevstandardsxml.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevstandardsxml.dita Tue Jun 10 13:56:15 2008
@@ -21,7 +21,8 @@
 <concept id="cdevstandardsxml" xml:lang="en-us">
 <title>XML data types and operators</title>
 <shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> supports
-the XML data type and a set of operators that work with the XML data type.
+the XML data type and a set of operators that work with the XML data type,
+but does not provide JDBC support for the XML data type.
 The XML data type and operators are based on a small subset of the SQL/XML
 specification. </shortdesc>
 <prolog><metadata>

Modified: db/derby/docs/trunk/src/devguide/derbydev.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/derbydev.ditamap?rev=666320&r1=666319&r2=666320&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/derbydev.ditamap (original)
+++ db/derby/docs/trunk/src/devguide/derbydev.ditamap Tue Jun 10 13:56:15 2008
@@ -792,6 +792,8 @@
 </topicref>
 <topicref href="rdevconceptsholdablecursors.dita" navtitle="Holdable result sets">
 </topicref>
+<topicref href="cdevconceptssavepoints.dita" navtitle="Using savepoints">
+</topicref>
 </relcell>
 </relrow>
 <relrow>
@@ -807,7 +809,8 @@
 </topicref>
 <topicref href="cdevconcepts41275.dita" navtitle="Result set and cursor mechanisms">
 </topicref>
-</relcell>
+<topicref href="cdevconceptssavepoints.dita" navtitle="Using savepoints">
+</topicref></relcell>
 </relrow>
 <relrow>
 <relcell>
@@ -819,7 +822,8 @@
 </topicref>
 <topicref href="cdevconcepts14433.dita" navtitle="Statement versus transaction runtime
rollback">
 </topicref>
-</relcell>
+<topicref href="cdevconceptssavepoints.dita" navtitle="Using savepoints">
+</topicref></relcell>
 </relrow>
 <relrow>
 <relcell>
@@ -829,6 +833,18 @@
 <relcell>
 <topicref href="cdevconcepts14433.dita" navtitle="Statement versus transaction runtime
rollback">
 </topicref>
+<topicref href="cdevconceptssavepoints.dita" navtitle="Using savepoints">
+</topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="cdevconcepts14433.dita" navtitle="Statement versus transaction runtime
rollback">
+</topicref>
+</relcell>
+<relcell>
+<topicref href="cdevconceptssavepoints.dita" navtitle="Using savepoints">
+</topicref>
 </relcell>
 </relrow>
 <relrow>
@@ -2046,6 +2062,8 @@
 </topicref>
 <topicref href="cdevconcepts14433.dita" navtitle="Statement versus transaction runtime
rollback">
 </topicref>
+<topicref href="cdevconceptssavepoints.dita" navtitle="Using savepoints">
+</topicref>
 </topicref>
 </topicref>
 <topicref href="cdevconcepts41275.dita" navtitle="Result set and cursor mechanisms">

Modified: db/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita?rev=666320&r1=666319&r2=666320&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita (original)
+++ db/derby/docs/trunk/src/devguide/rdevconceptsholdablecursors.dita Tue Jun 10 13:56:15
2008
@@ -27,14 +27,12 @@
 <keywords><indexterm>Cursors<indexterm>holdable</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <note> <ph conref="../conrefs.dita#prod/productshortname"></ph>,
supports
-non-holdable result sets on platforms which support JDBC
-3.</note>
+<section> <note> <ph conref="../conrefs.dita#prod/productshortname"></ph>
also
+supports non-holdable result sets.</note>
 </section>
-<section><p>Starting with Java 2 Platform, Standard Edition, v 1.4 (J2SE),
-result sets can be created with close when a commit occurs option.
-Such result sets 
-will be automatically closed when a commit happens. Result sets are automatically
+<section><p>When you create a statement, you can specify that the result set
+will be automatically closed when a commit occurs.
+Result sets are automatically
 closed when a transaction aborts, whether or not they have been specified
 to be held open.</p></section>
 <section><p>To specify whether a result set should be held open after a commit

Modified: db/derby/docs/trunk/src/ref/crefjavstateautogen.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefjavstateautogen.dita?rev=666320&r1=666319&r2=666320&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefjavstateautogen.dita (original)
+++ db/derby/docs/trunk/src/ref/crefjavstateautogen.dita Tue Jun 10 13:56:15 2008
@@ -24,12 +24,12 @@
 <keywords><indexterm>autogenerated keys</indexterm></keywords>
 </metadata></prolog>
 <conbody>
-<p>JDBC 3.0's auto-generated keys feature provides a way to retrieve values
+<p>JDBC's auto-generated keys feature provides a way to retrieve values
 from columns that are part of an index or have a default value assigned. <ph
 conref="../conrefs.dita#prod/productshortname"></ph> supports the auto-increment
 feature, which allows users to create columns in tables for which the database
-system automatically assigns increasing integer values. In JDBC 3.0, the method <i>Statement.getGeneratedKeys</i>
can
-be called to retrieve the value of such a column. This method returns a <i>ResultSet</i>
object
+system automatically assigns increasing integer values. Users can call the method <i>Statement.getGeneratedKeys</i>
+to retrieve the value of such a column. This method returns a <i>ResultSet</i>
object
 with a column for the automatically generated key. Calling <i>ResultSet.getMetaData</i>
on
 the <i>ResultSet</i> object returned by <i>getGeneratedKeys</i> produces
a <i>ResultSetMetaData</i> object
 that is similar to that returned by <xref href="rrefidentityvallocal.dita#rrefidentityvallocal">IDENTITY_VAL_LOCAL</xref>.
</p>

Modified: db/derby/docs/trunk/src/ref/crefjdbc12657.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefjdbc12657.dita?rev=666320&r1=666319&r2=666320&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefjdbc12657.dita (original)
+++ db/derby/docs/trunk/src/ref/crefjdbc12657.dita Tue Jun 10 13:56:15 2008
@@ -32,7 +32,7 @@
 defined by Sun).</p>
 <p>This section provides reference information about <ph conref="../conrefs.dita#prod/productshortname"></ph>'s
 implementation of the JDBC API and documents the way it conforms to the JDBC
-2.0, 3.0, and 4.0 APIs.</p>
+3.0 and 4.0 APIs.</p>
 <p>See the <cite><ph conref="../conrefs.dita#pub/citdevelop"></ph></cite>
for
 task-oriented instructions on working with the driver.</p>
 <p>This JDBC driver implements the standard JDBC interface defined by Sun.

Modified: db/derby/docs/trunk/src/ref/crefjdbc25142.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefjdbc25142.dita?rev=666320&r1=666319&r2=666320&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefjdbc25142.dita (original)
+++ db/derby/docs/trunk/src/ref/crefjdbc25142.dita Tue Jun 10 13:56:15 2008
@@ -26,7 +26,6 @@
   <ul>
 <li><i><xref href="rrefjdbc32052.dita#rrefjdbc32052"></xref></i></li>
 <li><i><xref href="rrefjdbc34565.dita#rrefjdbc34565"></xref></i></li>
-<li><i><xref href="rrefjdbc34954.dita#rrefjdbc34954"></xref></i></li>
 <li><i><xref href="rrefjdbc27734.dita#rrefjdbc27734"></xref></i></li>
 <li><i><xref href="rrefjdbc15905.dita#rrefjdbc15905"></xref></i></li>
 <li><i><xref href="rrefjdbc40794.dita#rrefjdbc40794"></xref></i></li>
@@ -36,6 +35,7 @@
 <li><i><xref href="rrefjdbc38274.dita#rrefjdbc38274"></xref></i></li>
 <li><i><xref href="rrefjdbc16643.dita#rrefjdbc16643"></xref></i></li>
 <li><i><xref href="rrefjdbc30469.dita#rrefjdbc30469"></xref></i></li>
+<li><i><xref href="rrefjdbcjavasqlsavepoint.dita#rrefjdbcjavasqlsavepoint"></xref></i></li>
 <li><i><xref href="rrefjdbc20377.dita#rrefjdbc20377"></xref></i></li>
 </ul></p>
 </conbody>

Modified: db/derby/docs/trunk/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/refderby.ditamap?rev=666320&r1=666319&r2=666320&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ref/refderby.ditamap Tue Jun 10 13:56:15 2008
@@ -481,6 +481,7 @@
 </topicref>
 <topicref collection-type="family" href="rrefjdbc40794.dita" navtitle="java.sql.Statement
interface">
 <topicref href="rrefso2.dita" navtitle="ResultSet objects "></topicref>
+<topicref href="crefjavstateautogen.dita" navtitle="Autogenerated keys"></topicref>
 </topicref>
 <topicref collection-type="family" href="rrefjdbc20485.dita" navtitle="java.sql.CallableStatement
interface">
 <topicref href="rrefjavcallstatout.dita" navtitle="CallableStatements and OUT Parameters
">
@@ -504,6 +505,8 @@
 </topicref>
 <topicref href="rrefjdbcrefsqlxml.dita" navtitle="java.sql.SQLXML interface">
 </topicref>
+<topicref href="rrefjdbcjavasqlsavepoint.dita" navtitle="java.sql.Savepoint interface">
+</topicref>
 <topicref href="rrefjdbc20377.dita" navtitle="Mapping of java.sql.Types to SQL types">
 <topicref collection-type="family" href="rrefjdbc96386.dita" navtitle="Mapping of java.sql.Blob
and java.sql.Clob interfaces">
 <topicref href="crefjavbclobnot.dita" navtitle="Notes on mapping of java.sql.Blob and
java.sql.Clob interfaces">
@@ -514,28 +517,6 @@
 </topicref>
 <topicref href="rrefjdbcjsr169.dita" navtitle="JDBC Package for Connected Device Configuration/Foundation
Profile
 (JSR169)"></topicref>
-<topicref collection-type="family" href="rrefjdbc32593.dita" navtitle="JDBC 3.0 features
">
-<topicref href="rrefjdbcjavasqlconnection30.dita" navtitle="java.sql.Connection interface:
supported JDBC 3.0 methods">
-</topicref>
-<topicref href="rrefjdbcdatabasemetadata30.dita" navtitle="java.sql.DatabaseMetaData interface:
supported JDBC 3.0 methods">
-</topicref>
-<topicref href="rrefjdbcparametermetadata30.dita" navtitle="java.sql.ParameterMetaData
interface: supported JDBC 3.0 methods">
-</topicref>
-<topicref href="rrefjdbcjavasqlpreparedstatement30.dita" navtitle="java.sql.PreparedStatement
interface: supported JDBC 3.0 methods">
-</topicref>
-<topicref collection-type="family" href="rrefjdbcjavasqlsavepoint.dita" navtitle="java.sql.Savepoint
interface">
-<topicref href="crefjavsavesetroll.dita" navtitle="Setting and rolling back to a savepoint
">
-</topicref>
-<topicref href="crefjavsaverel.dita" navtitle="Releasing a savepoint "></topicref>
-<topicref href="crefjavsaverules.dita" navtitle="Rules for savepoints"></topicref>
-<topicref href="rrefjavsaverestrict.dita" navtitle="Restrictions on savepoints">
-</topicref>
-</topicref>
-<topicref collection-type="family" href="rrefjdbcjavasqlstatement30.dita"
-navtitle="java.sql.Statement interface: supported JDBC 3.0 methods">
-<topicref href="crefjavstateautogen.dita" navtitle="Autogenerated keys"></topicref>
-</topicref>
-</topicref>
 <topicref collection-type="family" href="rrefjdbc4_0summary.dita" navtitle="JDBC 4.0-only
features ">
 <topicref href="rrefjdbc4_0sqlexception.dita" navtitle="Refined subclasses of SQLException">
 </topicref>

Modified: db/derby/docs/trunk/src/ref/rrefjdbc15905.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc15905.dita?rev=666320&r1=666319&r2=666320&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc15905.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc15905.dita Tue Jun 10 13:56:15 2008
@@ -25,6 +25,10 @@
 </metadata></prolog>
 <refbody>
 <section><p>This section discusses <codeph>java.sql.DatabaseMetaData</codeph>
functionality in <ph conref="../conrefs.dita#prod/productshortname"></ph>.
+</p>
+<p>The <ph conref="../conrefs.dita#prod/productshortname"></ph> implementation
+of the <i>getResultSetHoldability</i> method returns
+<i>ResultSet.HOLD_CURSORS_OVER_COMMIT</i>.
 </p></section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/ref/rrefjdbc27734.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc27734.dita?rev=666320&r1=666319&r2=666320&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc27734.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc27734.dita Tue Jun 10 13:56:15 2008
@@ -38,6 +38,42 @@
 exceptions cause the <ph conref="../conrefs.dita#prod/productshortname"></ph>
system
 to shut down, which not only closes the connection but means that no new connections
 should be created in the current JVM.</p></section>
+<section><p>
+<table pgwide="1" frame="all"><title>Implementation Notes on Connection
+Methods</title>
+<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="11*"/>
+<colspec colname="2" colnum="2" colwidth="40*"/><colspec colname="3" colnum="3"
+colwidth="49*"/>
+<thead>
+<row>
+<entry align="left" colname="1" valign="bottom">Returns</entry>
+<entry align="left" colname="2" valign="bottom">Signature</entry>
+<entry align="left" colname="3" valign="bottom">Implementation Notes</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="1"><i>PreparedStatement</i></entry>
+<entry colname="2"><i>prepareStatement(String sql, int [] columnIndexes)</i></entry>
+<entry colname="3">Every column index in the array must correlate to an 
+<xref href="rrefsqlj37836.dita#rrefsqlj37836">auto-increment</xref>
+column within the target table of the INSERT. Supported in embedded mode only.</entry>
+</row>
+<row>
+<entry colname="1"><i>PreparedStatement</i></entry>
+<entry colname="2"><i>prepareStatement(String sql, String [] columnNames)</i></entry>
+<entry colname="3">Every column name in the array must designate an 
+<xref href="rrefsqlj37836.dita#rrefsqlj37836">auto-increment</xref>
+column within the target table of the INSERT. Supported in embedded mode only.</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
+</p>
+<p>See <xref href="crefjavstateautogen.dita#crefjavstateautogen"></xref>
for
+details on the use of the two forms of the <i>Connection.prepareStatement</i>
+method shown in this table.</p>
+</section>
 </refbody>
 </reference>
 

Modified: db/derby/docs/trunk/src/ref/rrefjdbc40794.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc40794.dita?rev=666320&r1=666319&r2=666320&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc40794.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc40794.dita Tue Jun 10 13:56:15 2008
@@ -27,6 +27,57 @@
 not implement the <i>setEscapeProcessing</i> method of <i>java.sql.Statement</i>.
 In addition, the <i>cancel</i> method raises a "Feature not supported"
 exception.</p>
+<table frame="all"><title>Implementation Notes on Statement Methods</title>
+<tgroup cols="3" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="25*"/>
+<colspec colname="2" colnum="2" colwidth="31*"/><colspec colname="3" colnum="3"
+colwidth="44*"/>
+<thead>
+<row>
+<entry align="left" colname="1" valign="bottom">Returns</entry>
+<entry align="left" colname="2" valign="bottom">Signature</entry>
+<entry align="left" colname="3" valign="bottom">Implementation Notes</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="1"><i>ResultSet</i></entry>
+<entry colname="2"><i>getGeneratedKeys()</i></entry>
+<entry colname="3">If the user has indicated that auto-generated keys 
+should be made available, this method returns the same results as a call to the 
+<xref href="rrefidentityvallocal.dita#rrefidentityvallocal">IDENTITY_VAL_LOCAL</xref>
+function. Otherwise this method returns null.</entry>
+</row>
+<row>
+<entry colname="1"><i>boolean</i></entry>
+<entry colname="2"><i>execute(String sql, int [] columnIndexes)</i></entry>
+<entry colname="3">Every column index in the array must correlate to an 
+<xref href="rrefsqlj37836.dita#rrefsqlj37836">auto-increment</xref>
+column within the target table of the INSERT. Supported in embedded mode only.</entry>
+</row>
+<row>
+<entry colname="1"><i>boolean</i></entry>
+<entry colname="2"><i>execute(String sql, String [] columnNames)</i></entry>
+<entry colname="3">Every column name in the array must designate an 
+<xref href="rrefsqlj37836.dita#rrefsqlj37836">auto-increment</xref>
+column within the target table of the INSERT. Supported in embedded mode only.</entry>
+</row>
+<row>
+<entry colname="1"><i>int</i></entry>
+<entry colname="2"><i>executeUpdate(String sql, int [] columnIndexes)</i></entry>
+<entry colname="3">Every column index in the array must correlate to an 
+<xref href="rrefsqlj37836.dita#rrefsqlj37836">auto-increment</xref>
+column within the target table of the INSERT. Supported in embedded mode only.</entry>
+</row>
+<row>
+<entry colname="1"><i>int</i></entry>
+<entry colname="2"><i>executeUpdate(String sql, String [] columnNames)</i></entry>
+<entry colname="3">Every column name in the array must designate an 
+<xref href="rrefsqlj37836.dita#rrefsqlj37836">auto-increment</xref>
+column within the target table of the INSERT. Supported in embedded mode only.</entry>
+</row>
+</tbody>
+</tgroup>
+</table>
 </section>
 </refbody>
 </reference>

Modified: db/derby/docs/trunk/src/ref/rrefjdbcjavasqlsavepoint.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbcjavasqlsavepoint.dita?rev=666320&r1=666319&r2=666320&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbcjavasqlsavepoint.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbcjavasqlsavepoint.dita Tue Jun 10 13:56:15 2008
@@ -26,11 +26,17 @@
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p>The <i>Savepoint</i> interface is new in JDBC 3.0. It
contains
-new methods to set, release, or roll back a transaction to designated savepoints.
+<section><p>The <i>Savepoint</i> interface contains
+methods to set, release, or roll back a transaction to designated savepoints.
 Once a savepoint has been set, the transaction can be rolled back to that
 savepoint without affecting preceding work. Savepoints provide finer-grained
-control of transactions by marking intermediate points within a transaction.</p></section>
+control of transactions by marking intermediate points within a transaction.</p>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> does not support
+savepoints within a trigger.</p>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> does not release
+locks as part of the rollback to savepoint.</p>
+<p>For more information on using savepoints, see the
+<ph conref="../conrefs.dita#pub/citdevelop"></ph>.</p></section>
 </refbody>
 </reference>
 



Mime
View raw message