Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 00B99112A4 for ; Tue, 17 Jun 2014 19:38:20 +0000 (UTC) Received: (qmail 30625 invoked by uid 500); 17 Jun 2014 19:38:19 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 30601 invoked by uid 500); 17 Jun 2014 19:38:19 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 30592 invoked by uid 99); 17 Jun 2014 19:38:19 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jun 2014 19:38:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 17 Jun 2014 19:38:11 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id E7D882388980; Tue, 17 Jun 2014 19:37:44 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1603273 - /db/derby/docs/trunk/src/ref/ Date: Tue, 17 Jun 2014 19:37:42 -0000 To: derby-commits@db.apache.org From: chaase3@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20140617193744.E7D882388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: chaase3 Date: Tue Jun 17 19:37:41 2014 New Revision: 1603273 URL: http://svn.apache.org/r1603273 Log: DERBY-6379 Manuals are inconsistent in their use of the element Modified 50 Reference Manual topics. Patch: DERBY-6379-ref-jdbc.diff Modified: db/derby/docs/trunk/src/ref/crefjavbclobnot.dita db/derby/docs/trunk/src/ref/crefjavccns.dita db/derby/docs/trunk/src/ref/crefjavgcasyn.dita db/derby/docs/trunk/src/ref/crefjavstateautogen.dita db/derby/docs/trunk/src/ref/crefjdbc12657.dita db/derby/docs/trunk/src/ref/rrefcrsrgpc1.dita db/derby/docs/trunk/src/ref/rrefdmdfns1.dita db/derby/docs/trunk/src/ref/rrefdmrs.dita db/derby/docs/trunk/src/ref/rrefjavcallstatout.dita db/derby/docs/trunk/src/ref/rrefjavciro.dita db/derby/docs/trunk/src/ref/rrefjavcsro.dita db/derby/docs/trunk/src/ref/rrefjavcsti.dita db/derby/docs/trunk/src/ref/rrefjavsqlprst.dita db/derby/docs/trunk/src/ref/rrefjavsqlrssc.dita db/derby/docs/trunk/src/ref/rrefjdbc1020262.dita db/derby/docs/trunk/src/ref/rrefjdbc10889.dita db/derby/docs/trunk/src/ref/rrefjdbc12124.dita db/derby/docs/trunk/src/ref/rrefjdbc15905.dita db/derby/docs/trunk/src/ref/rrefjdbc16643.dita db/derby/docs/trunk/src/ref/rrefjdbc20377.dita db/derby/docs/trunk/src/ref/rrefjdbc20485.dita db/derby/docs/trunk/src/ref/rrefjdbc23502.dita db/derby/docs/trunk/src/ref/rrefjdbc27433.dita db/derby/docs/trunk/src/ref/rrefjdbc27734.dita db/derby/docs/trunk/src/ref/rrefjdbc28456.dita db/derby/docs/trunk/src/ref/rrefjdbc29874.dita db/derby/docs/trunk/src/ref/rrefjdbc30469.dita db/derby/docs/trunk/src/ref/rrefjdbc32052.dita db/derby/docs/trunk/src/ref/rrefjdbc34565.dita db/derby/docs/trunk/src/ref/rrefjdbc34954.dita db/derby/docs/trunk/src/ref/rrefjdbc37244.dita db/derby/docs/trunk/src/ref/rrefjdbc37352.dita db/derby/docs/trunk/src/ref/rrefjdbc38274.dita db/derby/docs/trunk/src/ref/rrefjdbc40794.dita db/derby/docs/trunk/src/ref/rrefjdbc41784.dita db/derby/docs/trunk/src/ref/rrefjdbc4_1connection.dita db/derby/docs/trunk/src/ref/rrefjdbc4_1summary.dita db/derby/docs/trunk/src/ref/rrefjdbc4_2compactprofiles.dita db/derby/docs/trunk/src/ref/rrefjdbc4_2databasemetadata.dita db/derby/docs/trunk/src/ref/rrefjdbc4_2sqltype.dita db/derby/docs/trunk/src/ref/rrefjdbc4_2summary.dita db/derby/docs/trunk/src/ref/rrefjdbc70824.dita db/derby/docs/trunk/src/ref/rrefjdbc75719.dita db/derby/docs/trunk/src/ref/rrefjdbc88908.dita db/derby/docs/trunk/src/ref/rrefjdbc96386.dita db/derby/docs/trunk/src/ref/rrefjdbcescapedate.dita db/derby/docs/trunk/src/ref/rrefjdbcjavasqlsavepoint.dita db/derby/docs/trunk/src/ref/rrefjdbclimit.dita db/derby/docs/trunk/src/ref/rrefjdbcrefsqlxml.dita db/derby/docs/trunk/src/ref/rrefso2.dita Modified: db/derby/docs/trunk/src/ref/crefjavbclobnot.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefjavbclobnot.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/crefjavbclobnot.dita (original) +++ db/derby/docs/trunk/src/ref/crefjavbclobnot.dita Tue Jun 17 19:37:41 2014 @@ -20,15 +20,17 @@ limitations under the License. "../dtd/concept.dtd"> Notes on mapping of java.sql.Blob and java.sql.Clob interfaces +The usual +locking mechanisms (shared locks) prevent other transactions from updating or +deleting the database item to which the java.sql.Blob or +java.sql.Clob object is a pointer. -

The usual locking -mechanisms (shared locks) prevent other transactions from updating or deleting -the database item to which the java.sql.Blob or java.sql.Clob object -is a pointer. However, in some cases, 's -instantaneous lock mechanisms could allow a period of time in which the column -underlying the java.sql.Blob or java.sql.Clob is unprotected. -A subsequent call to getBlob/getClob, or to a java.sql.Blob/java.sql.Clobmethod, -could cause undefined behavior.

+

However, in some cases, +'s instantaneous lock +mechanisms could allow a period of time in which the column underlying the +java.sql.Blob or java.sql.Clob is unprotected. A subsequent call +to getBlob/getClob, or to a java.sql.Blob/java.sql.Clob +method, could cause undefined behavior.

Furthermore, there is nothing to prevent the transaction that holds the java.sql.Blob/java.sql.Clob (as opposed to another transaction) from updating the underlying row. (The same problem exists with the getXXXStream methods.) Program applications Modified: db/derby/docs/trunk/src/ref/crefjavccns.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefjavccns.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/crefjavccns.dita (original) +++ db/derby/docs/trunk/src/ref/crefjavccns.dita Tue Jun 17 19:37:41 2014 @@ -20,11 +20,10 @@ limitations under the License. "../dtd/concept.dtd"> Connection functionality not supported + does not use +catalog names. In addition, the following optional methods raise "Feature not +supported" exceptions. -

does not use catalog -names. In addition, the following optional methods raise "Feature not -supported" exceptions: -

  • createArrayOf( java.lang.String, java.lang.Object[] )
  • createNClob( )
  • Modified: db/derby/docs/trunk/src/ref/crefjavgcasyn.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefjavgcasyn.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/crefjavgcasyn.dita (original) +++ db/derby/docs/trunk/src/ref/crefjavgcasyn.dita Tue Jun 17 19:37:41 2014 @@ -20,10 +20,11 @@ limitations under the License. "../dtd/concept.dtd"> Additional SQL syntax + also +supports the following SQL standard syntax to obtain a reference to the current +connection in a database-side JDBC routine. -

    also supports -the following SQL standard syntax to obtain a reference to the current connection -in a database-side JDBC routine: jdbc:default:connection

    +jdbc:default:connection
    Modified: db/derby/docs/trunk/src/ref/crefjavstateautogen.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefjavstateautogen.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/crefjavstateautogen.dita (original) +++ db/derby/docs/trunk/src/ref/crefjavstateautogen.dita Tue Jun 17 19:37:41 2014 @@ -20,20 +20,21 @@ limitations under the License. --> Autogenerated keys +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. autogenerated keys -

    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. supports the auto-increment -feature, which allows users to create columns in tables for which the database -system automatically assigns increasing integer values. Users can call the -method Statement.getGeneratedKeys to retrieve the value of such a column. -This method returns a ResultSet object with a column for the -automatically generated key. The - implementation of -Statement.getGeneratedKeys returns meaningful results only if the last +

    supports the +auto-increment feature, which allows users to create columns in tables for which +the database system automatically assigns increasing integer values. Users can +call the method Statement.getGeneratedKeys to retrieve the value of such +a column. This method returns a ResultSet object with a column for the +automatically generated key.

    +

    The implementation +of Statement.getGeneratedKeys returns meaningful results only if the last statement was a single-row insert statement. If it was a multi-row insert, Statement.getGeneratedKeys will return a result set with only a single row, even though it should return one row for each inserted row.

    Modified: db/derby/docs/trunk/src/ref/crefjdbc12657.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefjdbc12657.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/crefjdbc12657.dita (original) +++ db/derby/docs/trunk/src/ref/crefjdbc12657.dita Tue Jun 17 19:37:41 2014 @@ -20,22 +20,23 @@ limitations under the License. --> JDBC reference - comes -with a built-in JDBC driver. +This section provides reference information about +'s implementation of the +Java Database Connectivity (JDBC) API and documents the way it conforms to the +JDBC APIs. JDBC APIDerby implementation of -

    That makes the JDBC API the only API for working with databases. +

    comes with a +built-in JDBC driver. That makes the JDBC API the only API for working with + databases. The driver is a native-protocol fully Java technology-enabled driver (Type 4 of the types described under "JDBC Architecture" in http://www.oracle.com/technetwork/java/overview-141217.html).

    -

    This section provides reference information about -'s implementation of the -JDBC API and documents the way it conforms to the JDBC APIs.

    See the for task-oriented instructions on working with the driver.

    This JDBC driver implements the standard JDBC interfaces. Modified: db/derby/docs/trunk/src/ref/rrefcrsrgpc1.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcrsrgpc1.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefcrsrgpc1.dita (original) +++ db/derby/docs/trunk/src/ref/rrefcrsrgpc1.dita Tue Jun 17 19:37:41 2014 @@ -19,10 +19,11 @@ limitations under the License. --> Columns in the ResultSets returned by getFunctionColumns and getProcedureColumns +Columns in the ResultSets returned by +getFunctionColumns and getProcedureColumns are as described by the +API. -

    Columns in the ResultSets returned by -getFunctionColumns and getProcedureColumns are -as described by the API.

    +

    The following table shows -specific details for some specific columns returned by getFunctionColumns.

    Modified: db/derby/docs/trunk/src/ref/rrefdmdfns1.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefdmdfns1.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefdmdfns1.dita (original) +++ db/derby/docs/trunk/src/ref/rrefdmdfns1.dita Tue Jun 17 19:37:41 2014 @@ -20,6 +20,9 @@ limitations under the License. --> java.sql.DatabaseMetaData.getBestRowIdentifier method +The java.sql.DatabaseMetaData.getBestRowIdentifier method +looks for identifiers in a specific order. This order might not return a unique +row. java.sql.DatabaseMetaData.getBestRowIdentifier method methodsjava.sql.DatabaseMetaData.getBestRowIdentifier @@ -28,9 +31,6 @@ limitations under the License.

    The java.sql.DatabaseMetaData.getBestRowIdentifier method -looks for identifiers in a specific order. This order might not return a unique -row.

    -

    The java.sql.DatabaseMetaData.getBestRowIdentifier method looks for identifiers in the following order:

    • A primary key on the table
    • A unique constraint or unique index on the table
    • Modified: db/derby/docs/trunk/src/ref/rrefdmrs.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefdmrs.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefdmrs.dita (original) +++ db/derby/docs/trunk/src/ref/rrefdmrs.dita Tue Jun 17 19:37:41 2014 @@ -20,9 +20,9 @@ limitations under the License. "../dtd/reference.dtd"> DatabaseMetaData result sets +DatabaseMetaData result sets do not close the result sets of +other statements, even when auto-commit is set to true. -

      DatabaseMetaData result sets do not close the result sets -of other statements, even when auto-commit is set to true.

      DatabaseMetaData result sets are closed if a user performs any other action on a JDBC object that causes an automatic commit to occur. If you need the DatabaseMetaData result sets to be accessible Modified: db/derby/docs/trunk/src/ref/rrefjavcallstatout.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjavcallstatout.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjavcallstatout.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjavcallstatout.dita Tue Jun 17 19:37:41 2014 @@ -20,19 +20,22 @@ limitations under the License. "../dtd/reference.dtd"> CallableStatements and OUT Parameters <ph></ph> + supports OUT +parameters and CALL statements that return values, as in the following +example. java.sql.CallableStatementand OUT parameters -

      supports -OUT parameters and CALL statements that return values, as in the following -example: CallableStatement cs = conn.prepareCall( +

      +CallableStatement cs = conn.prepareCall( "? = CALL getDriverType(cast (? as INT))" cs.registerOutParameter(1, Types.INTEGER); cs.setInt(2, 35); -cs.executeUpdate(); Using a CALL statement with a procedure -that returns a value is only supported with the ? = syntax.

      +cs.executeUpdate(); Using a CALL statement with a +procedure that returns a value is only supported with the ? = +syntax.

      Register the output type of the parameter before executing the call.

      Modified: db/derby/docs/trunk/src/ref/rrefjavciro.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjavciro.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjavciro.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjavciro.dita Tue Jun 17 19:37:41 2014 @@ -20,16 +20,17 @@ limitations under the License. "../dtd/reference.dtd"> java.sql.Connection.isReadOnly method +If you connect to a read-only database, the appropriate +isReadOnly DatabaseMetaData value is returned. java.sql.Connection.isReadOnly method -

      If you connect to a read-only database, the appropriate isReadOnly -DatabaseMetaData value is returned. For example, Connections set -to read-only using the setReadOnly method, Connections for which -the user has been defined as a readOnlyAccess user (with one of the properties), and Connections to -databases on read-only media return true.

      +

      For example, Connections set to read-only using the +setReadOnly method, Connections for which the user has been +defined as a readOnlyAccess user (with one of the + properties), and +Connections to databases on read-only media return true.

      Modified: db/derby/docs/trunk/src/ref/rrefjavcsro.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjavcsro.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjavcsro.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjavcsro.dita Tue Jun 17 19:37:41 2014 @@ -20,12 +20,14 @@ limitations under the License. --> java.sql.Connection.setReadOnly method +The java.sql.Connection.setReadOnly method is +supported. java.sql.Connection.setReadOnly method -

      java.sql.Connection.setReadOnly is supported.

      See -the section "Differences using the Connection.setReadOnly method" in -the for more information.

      +

      See the section "Differences using the Connection.setReadOnly +method" in the for more +information.

      Modified: db/derby/docs/trunk/src/ref/rrefjavcsti.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjavcsti.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjavcsti.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjavcsti.dita Tue Jun 17 19:37:41 2014 @@ -20,15 +20,18 @@ limitations under the License. "../dtd/reference.dtd"> java.sql.Connection.setTransactionIsolation method +The transaction isolation levels +java.sql.Connection.TRANSACTION_SERIALIZABLE, +java.sql.Connection.TRANSACTION_REPEATABLE_READ, +java.sql.Connection.TRANSACTION_READ_COMMITTED, and +java.sql.Connection.TRANSACTION_READ_UNCOMMITTED are available from a + database. java.sql.Connection.setTransactionIsolation method Isolation levelssetting via JDBC -

      java.sql.Connection.TRANSACTION_SERIALIZABLE, java.sql.Connection.TRANSACTION_REPEATABLE_READ, - java.sql.Connection.TRANSACTION_READ_COMMITTED, and java.sql.Connection.TRANSACTION_READ_UNCOMMITTED transaction -isolations are available from a database.

      TRANSACTION_READ_COMMITTED is the default isolation level.

      Changing the current isolation for the connection with setTransactionIsolation commits the current transaction and begins a new transaction. Modified: db/derby/docs/trunk/src/ref/rrefjavsqlprst.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjavsqlprst.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjavsqlprst.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjavsqlprst.dita Tue Jun 17 19:37:41 2014 @@ -20,6 +20,8 @@ limitations under the License. --> Prepared statements and streaming columns +The setXXXStream methods request stream data between the +application and the database. setXXXStream requestsStreaming columnsas IN parameters to prepared statement @@ -29,8 +31,6 @@ columnsas IN parameters to pr -

      setXXXStream requests stream data between the application -and the database.

      JDBC allows an IN parameter to be set to a Java input stream for passing in large amounts of data in smaller chunks. When the statement is run, the JDBC driver makes repeated calls to this input stream. Modified: db/derby/docs/trunk/src/ref/rrefjavsqlrssc.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjavsqlrssc.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjavsqlrssc.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjavsqlrssc.dita Tue Jun 17 19:37:41 2014 @@ -20,18 +20,21 @@ limitations under the License. "../dtd/reference.dtd"> ResultSets and streaming columns +If the underlying object is itself an OutputStream class, +getBinaryStream returns the object directly. -getXXXStream requestsStreaming -columnsretrieving from ResultSets using getXXXStream methods - +getXXXStream requests +Streaming columnsretrieving from ResultSets using getXXXStream methods +getAsciiStream +getCharacterStream +getBinaryStream -

      If the underlying object is itself an OutputStream class, getBinaryStream returns -the object directly.

      -

      getAsciiStreamgetCharacterStreamgetBinaryStreamTo -get a field from the ResultSet using streaming columns, you can use -the getXXXStream methods if the type supports it. See for -a list of types that support the various streams. (See also .)

      +

      To get a field from the ResultSet using streaming columns, +you can use the getXXXStream methods if the type supports it. See + for a list of +types that support the various streams. (See also +.)

      You can retrieve data from one of the supported data type columns as a stream, whether or not it was stored as a stream.

      The following code fragment shows how a user can retrieve a LONG VARCHAR Modified: db/derby/docs/trunk/src/ref/rrefjdbc1020262.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc1020262.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc1020262.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc1020262.dita Tue Jun 17 19:37:41 2014 @@ -20,38 +20,22 @@ limitations under the License. "../dtd/reference.dtd"> JDBC escape syntax +JDBC provides a way of smoothing out some of the differences in the +ways different DBMS vendors implement SQL. This is called escape +syntax. JDBC escape syntaxEscape syntax (JDBC) -

      JDBC provides a way of smoothing out some of the differences in -the way different DBMS vendors implement SQL. This is called escape syntax. -Escape syntax signals that the JDBC driver, which is provided by a particular -vendor, scans for any escape syntax and converts it into the code that the -particular database understands. This makes escape syntax DBMS-independent.

      +

      Escape syntax signals that the JDBC driver, which is provided by a +particular vendor, scans for any escape syntax and converts it into the code +that the particular database understands. This makes escape syntax +DBMS-independent.

      A JDBC escape clause begins and ends with curly braces. A keyword always follows the opening curly brace:

      { keyword } -

      supports -the following JDBC escape keywords, which are case-insensitive:

        -
      • The escape keyword -for use in CallableStatements.

      • -
      • The keyword -for specifying escape characters for LIKE clauses.

      • -
      • The -escape keywords for specifying limit/offset clauses.

      • -
      • The escape keyword -for scalar functions.

      • -
      • The escape keyword -for outer joins.

      • -
      • The escape keyword -for time formats.

      • -
      • The escape keyword -for date formats.

      • -
      • The escape keyword -for timestamp formats.

      • -

      +

      The JDBC escape keywords are case-insensitive.

      Other JDBC escape keywords are not supported. returns the SQL unchanged in the Connection.nativeSQL call, since the escape syntax is native to SQL. In addition, it is unnecessary to call Statement.setEscapeProcessing for Modified: db/derby/docs/trunk/src/ref/rrefjdbc10889.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc10889.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc10889.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc10889.dita Tue Jun 17 19:37:41 2014 @@ -20,20 +20,24 @@ limitations under the License. --> Attributes of the Derby database connection URL +You can supply an optional list of attributes to a database +connection URL. Database connection URLattributes Database connection URLProperties object -

      You can supply an optional list of attributes to a database connection -URL. translates these -attributes into properties, so you can also set attributes in a Properties object -passed to DriverManager.getConnection. (You cannot set those attributes -as system properties, only in an object passed to the DriverManager.getConnection method.) -If you specify any attributes both on the connection URL and in a +

      +

      translates +these attributes into properties, so you can also set attributes in a +Properties object passed to DriverManager.getConnection. (You +cannot set those attributes as system properties, only in an object passed to +the DriverManager.getConnection method.)

      +

      If you specify any attributes both on the connection URL and in a Properties object, the attributes on the connection URL override the -attributes in the Properties object.

      +attributes in the Properties object.

      +

      These attributes are specific to and are listed in .

      Attribute name/value pairs are converted into properties and added Modified: db/derby/docs/trunk/src/ref/rrefjdbc12124.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc12124.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc12124.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc12124.dita Tue Jun 17 19:37:41 2014 @@ -19,16 +19,18 @@ limitations under the License. --> JDBC escape syntax for time formats + interprets +the JDBC escape syntax for time formats as equivalent to the correct SQL syntax +for times. t (JDBC escape keyword){t (JDBC escape syntax)JDBC escape syntax forTime formats -

      interprets -the JDBC escape syntax for time as equivalent to the correct SQL syntax for -times. also supports -the ISO format of 8 characters (6 digits, and 2 decimal points).

      +

      also +supports the ISO format of 8 characters (6 digits, and 2 decimal +points).

      Syntax { t 'hh:mm:ss' }
      Equivalent toTIME('hh:mm:ss')
      Modified: db/derby/docs/trunk/src/ref/rrefjdbc15905.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc15905.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc15905.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc15905.dita Tue Jun 17 19:37:41 2014 @@ -20,13 +20,13 @@ limitations under the License. "../dtd/reference.dtd"> java.sql.DatabaseMetaData interface + implements +the java.sql.DatabaseMetaData interface. java.sql.DatabaseMetaData interface -

      This section discusses java.sql.DatabaseMetaData -functionality in . -

      +

      For methods that take a catalog parameter, always specify null for this parameter, since does not support catalogs. Similarly, methods that return a catalog in the Modified: db/derby/docs/trunk/src/ref/rrefjdbc16643.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc16643.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc16643.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc16643.dita Tue Jun 17 19:37:41 2014 @@ -20,20 +20,23 @@ limitations under the License. "../dtd/reference.dtd"> java.sql.SQLException class + supplies +values for the getMessage, getSQLState, and getErrorCode +calls of SQLException. java.sql.SQLException classchaining exceptions SQLExceptions -

      supplies -values for the getMessage(), getSQLState(), and getErrorCode() calls -of SQLExceptions. In addition, sometimes -returns multiple SQLExceptions using the nextException chain. -The first exception is always the most severe exception, with SQL-92 Standard -exceptions preceding those that are specific to . -For information on processing SQLExceptions, see "Working with SQLExceptions in an application" -in the .

      +

      In addition, + sometimes returns +multiple SQLExceptions using the nextException chain. The first +exception is always the most severe exception, with SQL-92 Standard exceptions +preceding those that are specific to +.

      +

      For information on processing SQLExceptions, see "Working with + SQLExceptions in an +application" in the .

      Exceptions raised by will generally be one of the refined subclasses of SQLException. These refined exceptions are raised under the conditions described by their respective Modified: db/derby/docs/trunk/src/ref/rrefjdbc20377.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc20377.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc20377.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc20377.dita Tue Jun 17 19:37:41 2014 @@ -20,6 +20,8 @@ limitations under the License. --> Mapping of java.sql.Types to SQL types +In , the +java.sql.Types are mapped to SQL data types. java.sql.Typesmapped to SQL types SQL typesmapped to java.sql.Types @@ -31,10 +33,8 @@ data type

      -

      In , the -java.sql.Types are mapped to SQL data types.

      -

      The following table shows the mapping of java.sql.Types to -SQL types.

      +

      The following table shows the mapping of java.sql.Types to SQL +types.

      Mapping of <i>java.sql.Types</i> to SQL typesThis table lists the java.sql.Types and shows how they map to SQL types. Modified: db/derby/docs/trunk/src/ref/rrefjdbc20485.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc20485.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc20485.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc20485.dita Tue Jun 17 19:37:41 2014 @@ -20,13 +20,12 @@ limitations under the License. "../dtd/reference.dtd"> java.sql.CallableStatement interface + supports +all methods of CallableStatement except setBlob, getBlob, +setClob, and getClob. java.sql.CallableStatement interface - -

      supports -all methods of CallableStatement except setBlob, getBlob, -setClob, and getClob.

      -
      +
      Modified: db/derby/docs/trunk/src/ref/rrefjdbc23502.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc23502.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc23502.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc23502.dita Tue Jun 17 19:37:41 2014 @@ -20,16 +20,17 @@ limitations under the License. "../dtd/reference.dtd"> java.sql.ResultSet interface +A positioned update or delete issued against a cursor being accessed +through a ResultSet object modifies or deletes the current row of the +ResultSet object. -java.sql.ResultSet interface +java.sql.ResultSet interface +Cursorspre-fetching affecting -

      A positioned update or delete issued against a cursor being accessed -through a ResultSet object modifies or deletes the current row of the ResultSet object.

      Some intermediate protocols might pre-fetch rows. This causes positioned updates and deletes to operate against the row the underlying cursor -is on, and not the current row of the ResultSet.Cursorspre-fetching -affecting

      +is on, and not the current row of the ResultSet.

      JDBC does not define the sort of rounding to use for ResultSet.getBigDecimal. uses java.math.BigDecimal.ROUND_HALF_DOWN.

      Modified: db/derby/docs/trunk/src/ref/rrefjdbc27433.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc27433.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc27433.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc27433.dita Tue Jun 17 19:37:41 2014 @@ -21,13 +21,13 @@ limitations under the License. <ph conref="../conrefs.dita#prod/productshortname"></ph> database connection URL syntax +A database +connection URL consists of the basic database connection URL followed by an +optional subsubprotocol and optional attributes. database connection URL -

      A database -connection URL consists of the basic database connection URL followed by an -optional subsubprotocol and optional attributes.

      The following section provides reference information on the connection URL syntax for applications with embedded databases. For information on the connection URL syntax for accessing the Network Server, see "Accessing Modified: db/derby/docs/trunk/src/ref/rrefjdbc27734.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc27734.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc27734.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc27734.dita Tue Jun 17 19:37:41 2014 @@ -20,19 +20,22 @@ limitations under the License. "../dtd/reference.dtd"> java.sql.Connection interface +A + Connection +object is not garbage-collected until all other JDBC objects created from that +connection are closed or are themselves garbage-collected. -java.sql.Connection interfaceConnectionssession-severity -exceptions closingsystem-severity exceptions closing +java.sql.Connection interface +Connectionssession-severity exceptions closing +Connectionssystem-severity exceptions closing +Connectionsgarbage collection of -

      A  Connection object -is not garbage-collected until all other JDBC objects created from that connection -are closed or are themselves garbage-collected. Once the connection -is closed, no further JDBC requests can be made against objects created from -the connection. Do not explicitly close the Connection object until -you no longer need it for executing statements.Connectionsgarbage -collection of

      +

      Once the connection is closed, no further JDBC requests can be made +against objects created from the connection. Do not explicitly close the +Connection object until you no longer need it for executing +statements.

      The Connection interface extends AutoCloseable in JDK 7 and after. If you declare a connection in a try-with-resources statement and Modified: db/derby/docs/trunk/src/ref/rrefjdbc28456.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc28456.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc28456.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc28456.dita Tue Jun 17 19:37:41 2014 @@ -20,16 +20,16 @@ limitations under the License. "../dtd/reference.dtd"> JDBC escape syntax for LIKE clauses +The percent sign (%) and underscore +(_) are metacharacters within SQL LIKE clauses. JDBC provides +syntax to force these characters to be interpreted literally. escape (JDBC escape keyword)Escape character for LIKE clauses -

      The percent sign (%) and underscore -(_) are metacharacters -within SQL LIKE clauses. JDBC provides syntax to force these characters to -be interpreted literally. The JDBC clause immediately following a LIKE expression -allows you to specify an escape character:

      +

      The JDBC clause immediately following a LIKE expression allows you +to specify an escape character.

      Syntax WHERE characterExpression [ NOT ] LIKE characterExpressionWithWildCard Modified: db/derby/docs/trunk/src/ref/rrefjdbc29874.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc29874.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc29874.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc29874.dita Tue Jun 17 19:37:41 2014 @@ -20,14 +20,14 @@ limitations under the License. "../dtd/reference.dtd"> java.sql.PreparedStatement interface + provides all +the required JDBC type conversions and additionally allows use of the individual +setXXX methods for each type as if a setObject(Value, +JDBCTypeCode) invocation were made. java.sql.PreparedStatement interface -

      provides -all the required JDBC type conversions and additionally allows use of -the individual setXXX methods for each type as if a setObject(Value, -JDBCTypeCode) invocation were made.

      This means that setString can be used for any built-in target type.

      The setCursorName method can be used on a PreparedStatement prior Modified: db/derby/docs/trunk/src/ref/rrefjdbc30469.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc30469.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc30469.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc30469.dita Tue Jun 17 19:37:41 2014 @@ -20,17 +20,19 @@ limitations under the License. "../dtd/reference.dtd"> java.sql.SQLWarning class + can generate +a warning in certain circumstances. A warning is generated if, for example, you +try to connect to a database with the create attribute set to true +if the database already exists. java.sql.SQLWarning class -

      can generate -a warning in certain circumstances. A warning is generated if, for example, -you try to connect to a database with the create attribute set to true if -the database already exists. Aggregates like sum() also raise a warning if -NULL values are encountered during the evaluation.

      -

      All other informational messages are written to the system's derby.log file.

      +

      Aggregates like SUM also raise a warning if NULL values are +encountered during the evaluation.

      +

      All other informational messages are written to the + system's +derby.log file.

      Modified: db/derby/docs/trunk/src/ref/rrefjdbc32052.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc32052.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc32052.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc32052.dita Tue Jun 17 19:37:41 2014 @@ -19,20 +19,21 @@ limitations under the License. --> java.sql.Driver interface +The class that loads +'s local JDBC driver is +the class org.apache.derby.jdbc.EmbeddedDriver. The class that loads +'s network client driver +is the class org.apache.derby.jdbc.ClientDriver. java.sql.Driver interface JDBC driverloading -

      The class that loads 's -local JDBC driver is the class org.apache.derby.jdbc.EmbeddedDriver. -The class that loads 's -network client driver is the class org.apache.derby.jdbc.ClientDriver. -Usually, you will not need to create an instance of one of these classes, -because the driver class is loaded and registered automatically when the -java.sql.DriverManager class is initialized. That typically happens on -the first call to a DriverManager method such as +

      Usually, you will not need to create an instance of one of these +classes, because the driver class is loaded and registered automatically when +the java.sql.DriverManager class is initialized. That typically happens +on the first call to a DriverManager method such as DriverManager.getConnection. This section describes a few exceptions to this rule.

      With the embedded driver, if your application shuts down Modified: db/derby/docs/trunk/src/ref/rrefjdbc34565.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc34565.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc34565.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc34565.dita Tue Jun 17 19:37:41 2014 @@ -20,16 +20,17 @@ limitations under the License. "../dtd/reference.dtd"> java.sql.DriverManager.getConnection method +A Java application that uses the JDBC API establishes a connection to +a database by obtaining a Connection object. The standard way to obtain a +Connection object is to call the method +DriverManager.getConnection, which takes a String that contains a +database connection URL. java.sql.DriverManager.getConnection method -

      A Java application using the JDBC API establishes a connection -to a database by obtaining a Connection object. The standard way to -obtain a Connection object is to call the method DriverManager.getConnection, -which takes a String containing a database connection URL. A JDBC database -connection URL (uniform resource locator) provides a way of identifying a -database.

      +

      A JDBC database connection URL (uniform resource locator) provides a +way of identifying a database.

      DriverManager.getConnection can take one argument besides a database connection URL, a Properties object. You can use the Properties object to set database connection URL attributes. If you specify any attributes both on Modified: db/derby/docs/trunk/src/ref/rrefjdbc34954.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc34954.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc34954.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc34954.dita Tue Jun 17 19:37:41 2014 @@ -20,12 +20,12 @@ limitations under the License. "../dtd/reference.dtd"> java.sql.Driver.getPropertyInfo method +To get the DriverPropertyInfo object, request the JDBC driver +from the driver manager. java.sql.Driver.getPropertyInfo method -

      To get the DriverPropertyInfo object, request the JDBC -driver from the driver manager:

      java.sql.DriverManager.getDriver("jdbc:derby:"). getPropertyInfo(URL, Prop)

      Do not request it from org.apache.derby.jdbc.EmbeddedDriver, Modified: db/derby/docs/trunk/src/ref/rrefjdbc37244.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc37244.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc37244.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc37244.dita Tue Jun 17 19:37:41 2014 @@ -20,16 +20,18 @@ limitations under the License. "../dtd/reference.dtd"> JDBC escape syntax for outer joins + interprets +the JDBC escape syntax for outer joins (and all join operations) as equivalent +to the correct SQL syntax for outer joins or the appropriate join +operation. oj (JDBC escape keyword){oj (JDBC escape syntax)Outer joinsJDBC escape syntax for -

      interprets -the JDBC escape syntax for outer joins (and all join operations) as equivalent -to the correct SQL syntax for outer joins or the appropriate join operation.

      For -information about join operations, see .

      +

      For information about join operations, see +.

      Syntax { oj joinOperation [ joinOperation ]* } Modified: db/derby/docs/trunk/src/ref/rrefjdbc37352.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc37352.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc37352.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc37352.dita Tue Jun 17 19:37:41 2014 @@ -21,6 +21,8 @@ limitations under the License. Syntax of database connection URLs for applications with embedded databases +For applications with embedded databases, the syntax of the database +connection URL is as follows. database connection URLsyntax in embedded mode @@ -30,9 +32,9 @@ syntax from -

      For applications with embedded databases, the syntax of the database -connection URL is

      +
      jdbc:derby:[subsubprotocol:][databaseName][;attributes]* +

      This syntax has the following components.

      • jdbc:derby:

        In JDBC terminology, derby is the subprotocol for Modified: db/derby/docs/trunk/src/ref/rrefjdbc38274.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc38274.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc38274.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc38274.dita Tue Jun 17 19:37:41 2014 @@ -19,14 +19,15 @@ limitations under the License. --> java.sql.ResultSetMetaData interface + does not +track the source or updatability of columns in ResultSets, and so always +returns the constants shown for the methods listed in the following +table. java.sql.ResultSetMetaData interface -

        does -not track the source or updatability of columns in ResultSets, and -so always returns the constants shown for the methods listed in the -following table.

        +
      Implementation notes on <i>ResultSetMetadata</i> methodsThis table lists the implementation-specific return type for three ResultSetMetadata methods. Modified: db/derby/docs/trunk/src/ref/rrefjdbc40794.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc40794.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc40794.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc40794.dita Tue Jun 17 19:37:41 2014 @@ -19,14 +19,15 @@ limitations under the License. --> java.sql.Statement interface + does not +implement the setEscapeProcessing method of java.sql.Statement. +In addition, the cancel method raises a "Feature not supported" +exception. java.sql.Statement interface -

      does -not implement the setEscapeProcessing method of java.sql.Statement. -In addition, the cancel method raises a "Feature not supported" -exception.

      +

      The following table describes features of Statement methods that are specific to .

      Modified: db/derby/docs/trunk/src/ref/rrefjdbc41784.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc41784.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc41784.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc41784.dita Tue Jun 17 19:37:41 2014 @@ -20,15 +20,16 @@ limitations under the License. "../dtd/reference.dtd"> JDBC escape syntax for timestamp formats + interprets +the JDBC escape syntax for timestamp formats as equivalent to the correct SQL +syntax for timestamps. ts (JDBC escape keyword){ts (JDBC escape syntax)Timestamp formatsJDBC escape syntax for -

      interprets -the JDBC escape syntax for timestamp as equivalent to the correct SQL syntax -for timestamps. also +

      also supports the ISO format of 23 characters (17 digits, 3 dashes, and 3 decimal points).

      Syntax Modified: db/derby/docs/trunk/src/ref/rrefjdbc4_1connection.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc4_1connection.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc4_1connection.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc4_1connection.dita Tue Jun 17 19:37:41 2014 @@ -20,6 +20,8 @@ limitations under the License. "../dtd/reference.dtd"> java.sql.Connection interface: JDBC 4.1 features +JDBC 4.1 adds new features to the Connection +interface. Connection interface @@ -28,9 +30,6 @@ limitations under the License.
      -

      -JDBC 4.1 adds new features to the Connection interface: -

      • Aborting connections - The abort(Executor) method aborts a running connection. Outstanding transactional work is rolled back, and the Modified: db/derby/docs/trunk/src/ref/rrefjdbc4_1summary.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc4_1summary.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc4_1summary.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc4_1summary.dita Tue Jun 17 19:37:41 2014 @@ -20,17 +20,16 @@ limitations under the License. "../dtd/reference.dtd"> Features supported on JDBC 4.1 and above +JDBC 4.1 added some functionality to the core API. This section +documents the JDBC 4.1 features supported by +. JDBC 4.1 -JDBC 4.2
        -

        JDBC 4.1 added some functionality to the core API. This section -documents the JDBC 4.1 features supported by -.

        For information on features supported by all releases of JDBC 4, see . For information about features supported only by JDBC 4.2, see Modified: db/derby/docs/trunk/src/ref/rrefjdbc4_2compactprofiles.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc4_2compactprofiles.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc4_2compactprofiles.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc4_2compactprofiles.dita Tue Jun 17 19:37:41 2014 @@ -19,15 +19,16 @@ limitations under the License. "../dtd/reference.dtd"> JDBC support for Java SE 8 Compact Profiles + provides +support for Compact Profiles on the Java SE 8 platform by means of a group of +JDBC DataSource classes. Compact ProfilesJDBC support -

        provides -support for Compact Profiles on the Java SE 8 platform by means of a -group of JDBC DataSource classes. These DataSource classes cannot be used in -applications that use the Java Naming and Directory Interface (JNDI) API. -Otherwise, they are just like the versions for the full Java SE platform.

        +

        These DataSource classes cannot be used in applications that use the +Java Naming and Directory Interface (JNDI) API. Otherwise, they are just like +the versions for the full Java SE platform.

        Applications using Java SE 8 Compact Profile 2 must use these classes. Applications using Java SE 8 Compact Profile 3 can use the ordinary DataSource classes. (Compact Profile 1 does not provide any JDBC support, so Modified: db/derby/docs/trunk/src/ref/rrefjdbc4_2databasemetadata.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc4_2databasemetadata.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc4_2databasemetadata.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc4_2databasemetadata.dita Tue Jun 17 19:37:41 2014 @@ -20,6 +20,8 @@ limitations under the License. "../dtd/reference.dtd"> java.sql.DatabaseMetaData interface: JDBC 4.2 features + implements +all of the new metadata methods added by JDBC 4.2. JDBC 4.2DatabaseMetaData interface @@ -27,16 +29,11 @@ limitations under the License.

        -

        - implements all of the -new metadata methods added by JDBC 4.2. -

        The implementation -of the getMaxLogicalLOBSize() method returns zero (0). For details on -the meaningful limits on -'s BLOB and CLOB -datatypes, see and -. +of the getMaxLogicalLOBSize method returns zero (0). For details on the +meaningful limits on 's +BLOB and CLOB datatypes, see and +.

        Modified: db/derby/docs/trunk/src/ref/rrefjdbc4_2sqltype.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc4_2sqltype.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc4_2sqltype.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc4_2sqltype.dita Tue Jun 17 19:37:41 2014 @@ -20,6 +20,10 @@ limitations under the License. "../dtd/reference.dtd"> java.sql.SQLType interface +JDBC 4.2 introduces a new data type identifier, +java.sql.SQLType, to help databases describe data types which do not +appear in the ANSI/ISO SQL Standard. Databases which provide non-standard types +can provide their own implementations of SQLType. JDBC 4.2SQLType interface @@ -28,12 +32,8 @@ limitations under the License.

        -JDBC 4.2 introduces a new data type identifier, java.sql.SQLType, to help -databases describe data types which do not appear in the ANSI/ISO SQL Standard. -Databases which provide non-standard types can provide their own -implementations of SQLType. JDBC 4.2 also supplies its own -implementation, java.sql.JDBCType, which provides an enum for each of the -type identifiers in java.sql.Types. +JDBC 4.2 also supplies its own implementation, java.sql.JDBCType, which +provides an enum for each of the type identifiers in java.sql.Types.

        does not expose any datatypes which are not represented by JDBCType enums. Therefore, Modified: db/derby/docs/trunk/src/ref/rrefjdbc4_2summary.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc4_2summary.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc4_2summary.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc4_2summary.dita Tue Jun 17 19:37:41 2014 @@ -20,6 +20,9 @@ limitations under the License. "../dtd/reference.dtd"> JDBC 4.2-only features +JDBC 4.2 adds some functionality to the core API. This section +documents the JDBC 4.2 features supported by +. JDBC 4.2 @@ -27,9 +30,6 @@ limitations under the License.

        -

        JDBC 4.2 adds some functionality to the core API. This section -documents the JDBC 4.2 features supported by -.

        For information on features supported by all versions of JDBC 4, see . For information on features supported by both JDBC 4.1 and JDBC 4.2, see Modified: db/derby/docs/trunk/src/ref/rrefjdbc70824.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc70824.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc70824.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc70824.dita Tue Jun 17 19:37:41 2014 @@ -20,13 +20,14 @@ limitations under the License. "../dtd/reference.dtd"> JDBC escape keyword for call statements +This escape syntax is supported for a java.sql.Statement and +a java.sql.PreparedStatement in addition to a +CallableStatement. call (JDBC escape keyword){call (JDBC escape syntax) -

        This syntax is supported for a java.sql.Statement and -a java.sql.PreparedStatement in addition to a CallableStatement.

        Syntax { call statement } Example Modified: db/derby/docs/trunk/src/ref/rrefjdbc75719.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc75719.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc75719.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc75719.dita Tue Jun 17 19:37:41 2014 @@ -20,14 +20,14 @@ limitations under the License. "../dtd/reference.dtd"> CallableStatements and INOUT parameters +INOUT parameters map to an array of the parameter type in the +Java programming language. (The method must take an array as its parameter.) +This conforms to the recommendations of the SQL standard. java.sql.CallableStatementand INOUT parameters -

        INOUT parameters map to an array of the parameter type -in the Java programming language. (The method must take an array as its parameter.) This conforms to -the recommendations of the SQL standard.

        Given the following example: CallableStatement call = conn.prepareCall( "{CALL doubleMyInt(?)}"); // for inout parameters, it is good practice to Modified: db/derby/docs/trunk/src/ref/rrefjdbc88908.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc88908.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc88908.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc88908.dita Tue Jun 17 19:37:41 2014 @@ -20,6 +20,8 @@ limitations under the License. --> JDBC escape syntax for fn keyword +You can specify functions in JDBC escape syntax by using the +fn keyword. fnJDBC escape keyword JDBCescape keyword @@ -66,8 +68,6 @@ limitations under the License. -

        You can specify functions in JDBC escape syntax by using the -fn keyword.

        Syntax { fn functionCall }

        where functionCall is the name of one of the scalar functions listed Modified: db/derby/docs/trunk/src/ref/rrefjdbc96386.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc96386.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbc96386.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbc96386.dita Tue Jun 17 19:37:41 2014 @@ -19,16 +19,17 @@ limitations under the License. --> Mapping of java.sql.Blob and java.sql.Clob interfaces +In the JDBC API, java.sql.Blob is the mapping for the SQL BLOB +(binary large object) type; java.sql.Clob is the mapping for the SQL CLOB +(character large object) type. BLOB and CLOB objects are collectively referred +to as LOBs (large objects). -java.sql.Blob interfacejava.sql.Clob interface +java.sql.Blob interface +java.sql.Clob interface BLOB data typeCLOB data type -

        In the JDBC API, java.sql.Blob is the mapping for the SQL BLOB -(binary large object) type; java.sql.Clob is the mapping for the SQL -CLOB (character large object) type. BLOB and CLOB objects are collectively -referred to as LOBs (large objects).

        The implementation of the java.sql.Blob and java.sql.Clob interfaces is LOCATOR-based, meaning that the implementation provides a logical pointer to Modified: db/derby/docs/trunk/src/ref/rrefjdbcescapedate.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbcescapedate.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbcescapedate.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbcescapedate.dita Tue Jun 17 19:37:41 2014 @@ -19,15 +19,15 @@ limitations under the License. --> JDBC escape syntax for date formats + interprets +the JDBC escape syntax for date formats as equivalent to the correct SQL syntax +for dates. Date formatsJDBC escape syntax for d (JDBC escape keyword){d (JDBC escape syntax) -

        interprets -the JDBC escape syntax for dates as equivalent to the correct SQL syntax for -dates.

        Syntax { d 'yyyy-mm-dd' }
        Equivalent to Modified: db/derby/docs/trunk/src/ref/rrefjdbcjavasqlsavepoint.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbcjavasqlsavepoint.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbcjavasqlsavepoint.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbcjavasqlsavepoint.dita Tue Jun 17 19:37:41 2014 @@ -20,17 +20,18 @@ limitations under the License. "../dtd/reference.dtd"> java.sql.Savepoint interface +The Savepoint 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. java.sql.SavepointSavepoints (JDBC) Savepointssetting and rollong back -

        The Savepoint 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.

        +

        Savepoints provide finer-grained control of transactions by marking +intermediate points within a transaction.

        does not support savepoints within a trigger.

        does not release Modified: db/derby/docs/trunk/src/ref/rrefjdbclimit.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbclimit.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbclimit.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbclimit.dita Tue Jun 17 19:37:41 2014 @@ -20,6 +20,8 @@ limitations under the License. "../dtd/reference.dtd"> JDBC escape syntax for limit/offset clauses +The LIMIT escape clause can occur in a query at the point where an +OFFSET/FETCH FIRST clause can appear. LIMIT (JDBC escape keyword) OFFSET (JDBC escape keyword) @@ -27,10 +29,8 @@ limitations under the License.

        -

        The LIMIT escape clause can occur in a query at the point where an -OFFSET/FETCH FIRST clause can appear. See - for more -information.

        +

        See for +more information.

        Syntax { LIMIT rowCount [ OFFSET startRow ] } Modified: db/derby/docs/trunk/src/ref/rrefjdbcrefsqlxml.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbcrefsqlxml.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefjdbcrefsqlxml.dita (original) +++ db/derby/docs/trunk/src/ref/rrefjdbcrefsqlxml.dita Tue Jun 17 19:37:41 2014 @@ -20,19 +20,23 @@ limitations under the License. --> java.sql.SQLXML interface +The java.sql.SQLXML interface is the mapping for the SQL XML +data type. However, +defines the XML data type and operators only in the SQL layer. There is no +JDBC-side support for the XML data type and operators. java.sql.SQLXML interface -

        The java.sql.SQLXML interface is the mapping for the SQL XML data -type. However, defines -the XML data type and operators only in the SQL layer. There is no JDBC-side -support for the XML data type and operators.

        You cannot instantiate a -java.sql.SQLXML object in , -or bind directly into an XML value or retrieve an XML value directly from -a result set. You must bind and retrieve the XML data as Java strings or -character streams by explicitly specifying the XML operators, XMLPARSE and -XMLSERIALIZE, as part of your SQL queries.

        Additionally, does -not provide JDBC metadata support for the XML data type.

        +

        You cannot instantiate a java.sql.SQLXML object in +, or bind directly into +an XML value or retrieve an XML value directly from a result set. You must bind +and retrieve the XML data as Java strings or character streams by explicitly +specifying the XML operators, XMLPARSE +and XMLSERIALIZE, as part of your +SQL queries.

        +

        Additionally, does +not provide JDBC metadata support for the +XML data type.

        Modified: db/derby/docs/trunk/src/ref/rrefso2.dita URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefso2.dita?rev=1603273&r1=1603272&r2=1603273&view=diff ============================================================================== --- db/derby/docs/trunk/src/ref/rrefso2.dita (original) +++ db/derby/docs/trunk/src/ref/rrefso2.dita Tue Jun 17 19:37:41 2014 @@ -20,20 +20,20 @@ limitations under the License. "../dtd/reference.dtd"> ResultSet objects +An error that occurs when a SELECT statement is first executed +prevents a ResultSet object from being opened on it. The same error does +not close the ResultSet if it occurs after the ResultSet has been +opened. ResultSetserrors in statement affecting creation of -

        An error that occurs when a SELECT statement is first executed -prevents a ResultSet object from being opened on it. The same error -does not close the ResultSet if it occurs after the ResultSet has -been opened.

        -

        For example, a divide-by-zero error that happens while the executeQuery method -is called on a java.sql.Statement or java.sql.PreparedStatement throws -an exception and returns no result set at all, while if the same error happens -while the next method is called on a ResultSet object, it does -not cause the result set to be closed.

        +

        For example, a divide-by-zero error that happens while the +executeQuery method is called on a java.sql.Statement or +java.sql.PreparedStatement throws an exception and returns no result set +at all, while if the same error happens while the next method is called +on a ResultSet object, it does not cause the result set to be closed.

        Errors can happen when a ResultSet is first being created if the system partially executes the query before the first row is fetched. This can happen on any query that uses more than one table and on queries