db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fuzzylo...@apache.org
Subject svn commit: r202296 [11/16] - in /incubator/derby/docs/trunk/src: adminguide/ devguide/ getstart/ ref/ tools/ tuning/
Date Tue, 28 Jun 2005 22:46:37 GMT
Modified: incubator/derby/docs/trunk/src/ref/rrefexcept75154.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefexcept75154.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefexcept75154.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefexcept75154.dita Tue Jun 28 15:46:15 2005
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
-
-Licensed 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.
--->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
-<reference id="rrefexcept75154" xml:lang="en-us">
-<title>Understanding SQLExceptions</title>
-<refbody>
-<section><p><indexterm>SQLState values</indexterm>The JDBC driver returns <i>SQLException</i>s
-for all errors from <ph conref="refconrefs.dita#prod/productshortname"></ph>.
-If the exception originated in a user type but is not itself an <i>SQLException</i>,
-it is wrapped in an <i>SQLException</i>. <ph conref="refconrefs.dita#prod/productshortname"></ph>-specific <i>SQLException</i>s
-use <i>SQLState</i> class codes starting with <i>X</i>. Standard <i>SQLState</i> values
-are returned for exceptions where appropriate.</p></section>
-<section><p><ph conref="refconrefs.dita#prod/productshortname"></ph> database
-exceptions are classified by severity. The severity of an <i>SQLException</i> is
-available through the <i>getErrorCode</i> method call on the <i>SQLException</i>.
-The severities are summarized below. For more information, check the javadoc
-for <i>org.apache.derby.types.ExceptionSeverity</i>:   <ul>
-<li>Warning Severity-a warning is given but current statement is completed. </li>
-<li>Statement Severity-the effects of the current statement, if any, on persistent
-data are undone.</li>
-<li>Transaction Severity-the effects of the current transaction on persistent
-data are undone; a rollback is performed.</li>
-<li>Session Severity-a rollback is performed and the current session is terminated.
-This closes the current connection.</li>
-<li>System Severity-the system is shut down. All uncommitted transactions
-are rolled back.</li>
-</ul></p></section>
-<section><p>Unimplemented aspects of the JDBC driver return an <i>SQLException</i> with
-a message starting "Feature not implemented" and an <i>SQLState</i> of <codeph>XJZZZ</codeph>.
-These unimplemented parts are for features not supported by <ph conref="refconrefs.dita#prod/productshortname"></ph>.</p></section>
-<section><p><indexterm>SQLExceptions<indexterm>chaining</indexterm></indexterm><ph
-conref="refconrefs.dita#prod/productshortname"></ph> supplies values for the
-message and <i>SQLState</i> fields. In addition, <ph conref="refconrefs.dita#prod/productshortname"></ph> sometimes
-returns multiple <i>SQLExceptions</i> using the <i>nextException</i> chain.
-The first exception is always the most severe exception, with SQL-92 Standard
-exceptions preceding those that are specific to <ph conref="refconrefs.dita#prod/productshortname"></ph>.</p></section>
-<section><p>For information on processing <i>SQLExceptions</i>, see  "Working
-with <ph conref="refconrefs.dita#prod/productshortname"></ph> SQLExceptions
-in an Application" in the <cite><ph conref="refconrefs.dita#pub/citdevelop"></ph></cite>.</p></section>
-</refbody>
-</reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefgpc1.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefgpc1.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefgpc1.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefgpc1.dita Tue Jun 28 15:46:15 2005
@@ -18,7 +18,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <reference id="rrefgpc1" xml:lang="en-us">
-<title>getProcedureColumns <ph><indexterm>DatabaseMetaData.getProcedureColumns</indexterm></ph></title>
+<title>getProcedureColumns<ph><indexterm>getProcedureColumns</indexterm></ph></title>
 <refbody>
 <section><p><ph conref="refconrefs.dita#prod/productshortname"></ph> supports
 Java procedures. <ph conref="refconrefs.dita#prod/productshortname"></ph> allows

Modified: incubator/derby/docs/trunk/src/ref/rrefindexname.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefindexname.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefindexname.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefindexname.dita Tue Jun 28 15:46:15 2005
@@ -23,8 +23,8 @@
 <section><p>An <i>index-Name</i> represents an index. Indexes live in schemas,
 so you can qualify their names with <i>schema-Names</i>. Indexes on system
 tables are in the <i>SYS</i> schema.</p></section>
-<section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname"></xref></i> . ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b></codeblock></section>
+<section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> . ] <i><xref
+href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
 <section><title>Example</title> <codeblock><b>DROP INDEX APP.ORIGINDEX;
 <ph>-- OrigIndex is an index-Name without a schema-Name </ph>
 CREATE INDEX ORIGINDEX ON FLIGHTS (ORIG_AIRPORT)</b></codeblock></section>

Modified: incubator/derby/docs/trunk/src/ref/rrefjavcsti.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefjavcsti.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefjavcsti.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefjavcsti.dita Tue Jun 28 15:46:15 2005
@@ -20,7 +20,7 @@
 <reference id="rrefjavcsti" xml:lang="en-us">
 <title>java.sql.Connection.setTransactionIsolation </title>
 <prolog><metadata>
-<keywords><indexterm>java.sql.Connection.setTransactionIsolation</indexterm>
+<keywords><indexterm>java.sql.Connection. setTransactionIsolation</indexterm>
 <indexterm>Isolation levels<indexterm>setting via JDBC</indexterm></indexterm>
 </keywords>
 </metadata></prolog>

Modified: incubator/derby/docs/trunk/src/ref/rrefjdbc15905.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefjdbc15905.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefjdbc15905.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefjdbc15905.dita Tue Jun 28 15:46:15 2005
@@ -23,13 +23,8 @@
 <keywords><indexterm>java.sql.DatabaseMetaData</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <ul>
-<li><xref href="rrefdmrs.dita#rrefdmrs"></xref></li>
-<li><xref href="rrefgpc1.dita#rrefgpc1"></xref></li>
-<li><xref href="rrefpgc1.dita#rrefpgc1"></xref></li>
-<li><xref href="rrefcrsrgpc1.dita#rrefcrsrgpc1"></xref></li>
-<li><xref href="rrefdmdfns1.dita#rrefdmdfns1"></xref></li>
-</ul></section>
+<section><p>This section discuss java.sql.DatabaseMetaData functionality in <ph conref="refconrefs.dita#prod/productshortname"></ph>.
+</p></section>
 </refbody>
 </reference>
 

Modified: incubator/derby/docs/trunk/src/ref/rrefjdbc29973.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefjdbc29973.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefjdbc29973.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefjdbc29973.dita Tue Jun 28 15:46:15 2005
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
-
-Licensed 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.
--->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
-<reference id="rrefjdbc29973" xml:lang="en-us">
-<title>Embedded databases</title>
-<refbody>
-<section><p>The class that loads <ph conref="refconrefs.dita#prod/productshortname"></ph>'s
-local JDBC driver is the class <i>org.apache.derby.jdbc.EmbeddedDriver</i>.
-Some of the ways listed below create instances of the <ph conref="refconrefs.dita#prod/productshortname"></ph> driver
-class. Do not use the class directly through the <i>java.sql.Driver</i> interface.
-Use the <i>DriverManager</i> class to create connections.   <ul id="i1012571">
-<li id="i1012580"><i id="jdbc10841">Class.forName("org.apache.derby.jdbc.EmbeddedDriver")</i> 
- <p>Our recommended manner, because it ensures that the class is loaded in
-all JVMs by creating an instance at the same time.</p></li>
-<li><i>new org.apache.derby.jdbc.EmbeddedDriver()</i>   <p>Same as <i><xref
-href="#rrefjdbc29973/jdbc10841">Class.forName("org.apache.derby.jdbc.EmbeddedDriver")</xref>,</i> except
-that it requires the class to be found when the code is compiled.</p></li>
-<li><i>Class c = org.apache.derby.jdbc.EmbeddedDriver.class</i>   <p>This
-is also the same as <i><xref href="rrefjdbc29973.dita#rrefjdbc29973/jdbc10841">Class.forName("org.apache.derby.jdbc.EmbeddedDriver")</xref>,</i> except
-that it requires the class to be found when the code is compiled. The pseudo-static
-field <i>class</i> evaluates to the class that is named.</p></li>
-<li><i>Setting the System property jdbc.drivers<ph><indexterm>JDBC driver<indexterm>loading</indexterm></indexterm></ph><ph><indexterm>jdbc.drivers
-system property<indexterm>using to load driver</indexterm></indexterm></ph></i> 
- <p>To set a System property, you alter the invocation command line or the
-system properties within your application. It is not possible to alter system
-properties within an applet.</p></li>
-</ul></p></section>
-<example><codeblock><b>java -Djdbc.drivers=org.apache.derby.jdbc.EmbeddedDriver
-    applicationClass</b></codeblock></example>
-<section><p>The actual driver that gets registered in the <i>DriverManager</i> to
-handle the <i>jdbc:derby:</i> protocol is not the class <i>org.apache.derby.jdbc.EmbeddedDriver</i>;
-that class simply detects the type of <ph conref="refconrefs.dita#prod/productshortname"></ph> driver
-needed and then causes the appropriate <ph conref="refconrefs.dita#prod/productshortname"></ph> driver
-to be loaded.</p></section>
-<section><p>The only supported way to connect to a <ph conref="refconrefs.dita#prod/productshortname"></ph> system
-through the <i>jdbc:derby:</i> protocol is using the <i>DriverManager</i> to
-obtain a driver (<i>java.sql.Driver</i>) or connection (<i>java.sql.Connection</i>)
-through the <i>getDriver</i> and <i>getConnection</i> method calls.</p></section>
-</refbody>
-</reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefjdbc32052.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefjdbc32052.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefjdbc32052.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefjdbc32052.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,9 +16,6 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefjdbc32052" xml:lang="en-us">
 <title>java.sql.Driver</title>
 <prolog><metadata>
@@ -24,10 +23,37 @@
 </keywords>
 </metadata></prolog>
 <refbody>
-<section><p>JDBC provides different ways to load a driver, listed below. 
- <ul>
-<li><xref href="rrefjdbc29973.dita#rrefjdbc29973"></xref></li>
+<section><p>The class that loads <ph conref="refconrefs.dita#prod/productshortname"></ph>'s
+local JDBC driver is the class <i>org.apache.derby.jdbc.EmbeddedDriver</i>.
+Some of the ways listed below create instances of the <ph conref="refconrefs.dita#prod/productshortname"></ph> driver
+class. Do not use the class directly through the <i>java.sql.Driver</i> interface.
+Use the <i>DriverManager</i> class to create connections.   <ul id="i1012571">
+<li id="i1012580"><i id="jdbc10841">Class.forName("org.apache.derby.jdbc.EmbeddedDriver")</i> 
+ <p>Our recommended manner, because it ensures that the class is loaded in
+all JVMs by creating an instance at the same time.</p></li>
+<li><i>new org.apache.derby.jdbc.EmbeddedDriver()</i>   <p>Same as <i><xref
+href="#rrefjdbc32052/jdbc10841">Class.forName("org.apache.derby.jdbc.EmbeddedDriver")</xref>,</i> except
+that it requires the class to be found when the code is compiled.</p></li>
+<li><i>Class c = org.apache.derby.jdbc.EmbeddedDriver.class</i>   <p>This
+is also the same as <i><xref href="rrefjdbc32052.dita#rrefjdbc32052/jdbc10841">Class.forName("org.apache.derby.jdbc.EmbeddedDriver")</xref>,</i> except
+that it requires the class to be found when the code is compiled. The pseudo-static
+field <i>class</i> evaluates to the class that is named.</p></li>
+<li><i>Setting the System property jdbc.drivers<ph><indexterm>JDBC driver<indexterm>loading</indexterm></indexterm></ph><ph><indexterm>jdbc.drivers
+system property<indexterm>using to load driver</indexterm></indexterm></ph></i> 
+ <p>To set a System property, you alter the invocation command line or the
+system properties within your application. It is not possible to alter system
+properties within an applet.</p></li>
 </ul></p></section>
+<example><codeblock><b>java -Djdbc.drivers=org.apache.derby.jdbc.EmbeddedDriver
+    applicationClass</b></codeblock></example>
+<section><p>The actual driver that gets registered in the <i>DriverManager</i> to
+handle the <i>jdbc:derby:</i> protocol is not the class <i>org.apache.derby.jdbc.EmbeddedDriver</i>;
+that class simply detects the type of <ph conref="refconrefs.dita#prod/productshortname"></ph> driver
+needed and then causes the appropriate <ph conref="refconrefs.dita#prod/productshortname"></ph> driver
+to be loaded.</p></section>
+<section><p>The only supported way to connect to a <ph conref="refconrefs.dita#prod/productshortname"></ph> system
+through the <i>jdbc:derby:</i> protocol is using the <i>DriverManager</i> to
+obtain a driver (<i>java.sql.Driver</i>) or connection (<i>java.sql.Connection</i>)
+through the <i>getDriver</i> and <i>getConnection</i> method calls.</p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefjdbc34565.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefjdbc34565.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefjdbc34565.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefjdbc34565.dita Tue Jun 28 15:46:15 2005
@@ -20,7 +20,7 @@
 <reference id="rrefjdbc34565" xml:lang="en-us">
 <title>java.sql.DriverManager.getConnection</title>
 <prolog><metadata>
-<keywords><indexterm>java.sql.DriverManager.getConnection</indexterm></keywords>
+<keywords><indexterm>java.sql. DriverManager.getConnection</indexterm></keywords>
 </metadata></prolog>
 <refbody>
 <section><p>A Java application using the JDBC API establishes a connection

Modified: incubator/derby/docs/trunk/src/ref/rrefjdbc34954.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefjdbc34954.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefjdbc34954.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefjdbc34954.dita Tue Jun 28 15:46:15 2005
@@ -32,7 +32,7 @@
 <section><p>This method might return a <i>DriverPropertyInfo</i> object. In
 a <ph conref="refconrefs.dita#prod/productshortname"></ph> system, it consists
 of an array of database connection URL attributes. The most useful attribute
-is <i><xref href="rrefattrib17246.dita#rrefattrib17246"></xref>,</i> which
+is <i><xref href="rrefattrib17246.dita#rrefattrib17246">databaseName=nameofDatabase</xref>,</i> which
 means that the object consists of a list of booted databases in the current
 system.</p></section>
 <section><p>For example, if a <ph conref="refconrefs.dita#prod/productshortname"></ph> system

Modified: incubator/derby/docs/trunk/src/ref/rrefjdbc37244.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefjdbc37244.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefjdbc37244.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefjdbc37244.dita Tue Jun 28 15:46:15 2005
@@ -29,14 +29,15 @@
 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.</p>  <p>For
 information about join operations, see <xref href="rrefsqlj29840.dita#rrefsqlj29840"></xref>.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>{oj <i><xref href="rrefsqlj29840.dita#rrefsqlj29840"></xref></i> [<i><xref
-href="rrefsqlj29840.dita#rrefsqlj29840"></xref></i> ]* }</b></codeblock> </refsyn>
-<section><title>Equivalent to</title> <codeblock><b><b><i><xref href="rrefsqlj29840.dita#rrefsqlj29840"></xref></i></b> [<b><i><xref
-href="rrefsqlj29840.dita#rrefsqlj29840"></xref></i></b> ]* </b></codeblock> </section>
+<refsyn><title>Syntax</title> <codeblock><b>{oj <i><xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operations</xref></i> [<i><xref
+href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operations</xref></i> ]* }</b></codeblock> </refsyn>
+<section><title>Equivalent to</title> <codeblock><b><b><i><xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operations</xref></i></b> [<b><i><xref
+href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operations</xref></i></b> ]* </b></codeblock> </section>
 <example> <codeblock><b><ph>-- outer join</ph>
 SELECT *
 FROM
-{oj Countries LEFT OUTER JOIN Cities ON (Countries.country_ISO_code=Cities.country_ISO_code)}
+{oj Countries LEFT OUTER JOIN Cities ON 
+   (Countries.country_ISO_code=Cities.country_ISO_code)}
 <ph>-- another join operation</ph>
 SELECT *
 FROM

Modified: incubator/derby/docs/trunk/src/ref/rrefjdbc37352.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefjdbc37352.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefjdbc37352.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefjdbc37352.dita Tue Jun 28 15:46:15 2005
@@ -33,14 +33,14 @@
 <li><i>subsubprotocol:<ph><indexterm>Subsubprotocol<indexterm>part of database
 connection URL syntax</indexterm></indexterm></ph></i>   <p><i>subsubprotocol</i>,
 which is not typically specified, specifies where <ph conref="refconrefs.dita#prod/productshortname"></ph> looks
-for a database: in a directory, in a class path, or in a jar file. It is used
+for a database: in a directory, in a classpath, or in a jar file. It is used
 only in rare instances, usually for read-only databases. <i>subsubprotocol</i> is
 one of the following:</p><ul>
 <li>directory</li>
-<li>classpath: <indexterm>Class path<indexterm>accessing read-only databases
+<li>classpath: <indexterm>Classpath<indexterm>accessing read-only databases
 from</indexterm></indexterm>Databases are treated as read-only databases,
 and all <i>databaseNames</i> must begin with at least a slash, because you
-specify them "relative" to the class path directory or archive. (You do not
+specify them "relative" to the classpath directory or archive. (You do not
 have to specify classpath as the subsubprotocol; it is implied.)</li>
 <li>jar Databases are treated as read-only databases.</li>
 </ul><p>jar: requires an additional element immediately before the <i>databaseName</i>:

Modified: incubator/derby/docs/trunk/src/ref/rrefjdbc38274.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefjdbc38274.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefjdbc38274.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefjdbc38274.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,18 +16,39 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefjdbc38274" xml:lang="en-us">
 <title>java.sql.ResultSetMetaData </title>
 <prolog><metadata>
 <keywords><indexterm>java.sql.ResultSetMetaData</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <ul>
-<li><xref href="rrefsauadt3.dita#rrefsauadt3"></xref></li>
-</ul></section>
+<section><p><ph conref="refconrefs.dita#prod/productshortname"></ph> does
+not track the source or updatability of columns in <i>ResultSets</i>, and
+so always returns the following constants for the following methods:   <table
+expanse="column" frame="all">
+<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="40*"/>
+<colspec colname="2" colnum="2" colwidth="60*"/>
+<thead>
+<row>
+<entry align="left" colname="1" valign="bottom">Method Name</entry>
+<entry align="left" colname="2" valign="bottom">Value</entry>
+</row>
+</thead>
+<tbody>
+<row>
+<entry colname="1"><i>isDefinitelyWritable</i></entry>
+<entry colname="2">false</entry>
+</row>
+<row>
+<entry colname="1"><i>isReadOnly</i></entry>
+<entry colname="2">false</entry>
+</row>
+<row>
+<entry colname="1"><i>isWritable</i></entry>
+<entry colname="2">false</entry>
+</row>
+</tbody>
+</tgroup>
+</table></p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefjdbc40794.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefjdbc40794.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefjdbc40794.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefjdbc40794.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,19 +16,18 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefjdbc40794" xml:lang="en-us">
 <title>java.sql.Statement </title>
 <prolog><metadata>
 <keywords><indexterm>java.sql.Statement</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section> <ul>
-<li><xref href="rrefso2.dita#rrefso2"></xref></li>
-<li><xref href="rrefjssfns2.dita#rrefjssfns2"></xref></li>
-</ul></section>
+<section><p><ph conref="refconrefs.dita#prod/productshortname"></ph> does
+not implement the following JDBC 1.2 methods of <i>java.sql.Statement</i>:
+  <ul>
+<li><i>cancel</i></li>
+<li><i>setEscapeProcessing</i></li>
+<li><i>setQueryTimeout</i></li>
+</ul></p> </section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefjssfns2.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefjssfns2.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefjssfns2.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefjssfns2.dita Tue Jun 28 15:46:15 2005
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
-
-Licensed 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.
--->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
-<reference id="rrefjssfns2" xml:lang="en-us">
-<title>java.sql.Statement functionality not supported</title>
-<refbody>
-<section><p><ph conref="refconrefs.dita#prod/productshortname"></ph> does
-not implement the following JDBC 1.2 methods of <i>java.sql.Statement</i>:
-  <ul>
-<li><i>cancel</i></li>
-<li><i>setEscapeProcessing</i></li>
-<li><i>setQueryTimeout</i></li>
-</ul></p></section>
-</refbody>
-</reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefjta16677.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefjta16677.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefjta16677.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefjta16677.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,17 +16,61 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefjta16677" xml:lang="en-us">
 <title>J2EE Compliance: Java Transaction API and javax.sql Extensions</title>
+<prolog><metadata>
+<keywords><indexterm>Resource manager<indexterm>Derby as a J2EE system</indexterm><indexterm>JNDI</indexterm><indexterm>javax.sql.DataSource</indexterm
+></indexterm><indexterm>Connection pooling</indexterm><indexterm>javax.sql. ConnectionPoolDataSource</indexterm>
+<indexterm>javax.sql.PooledConnection</indexterm></keywords>
+</metadata></prolog>
 <refbody>
-<section> <ul>
-<li><xref href="rrefjta37588.dita#rrefjta37588"></xref></li>
-<li><xref href="rrefjta51021.dita#rrefjta51021"></xref></li>
-<li><xref href="rrefjta18596.dita#rrefjta18596"></xref></li>
-</ul></section>
+<section><p>J2EE, or the Java 2 Platform, Enterprise Edition, is a standard
+for development of enterprise applications; one example is Enterprise Java
+Beans (EJBs) with distributed capabilities.</p></section>
+<section><p><ph conref="refconrefs.dita#prod/productshortname"></ph> is a
+J2EE-conformant component in a distributed J2EE system. As such, it is one
+part of a larger system that includes, among other things, a JNDI server,
+a connection pool module, a transaction manager, a resource manager, and user
+applications. (<ph conref="refconrefs.dita#prod/productshortname"></ph> also
+supports the JTA API, which is not a current J2EE requirement, but this functionality
+provides another piece of the same system.) Within this system, <ph conref="refconrefs.dita#prod/productshortname"></ph> can
+serve as the resource manager.</p></section>
+<section><p>For more information on J2EE, see the J2EE specification available
+at <i><xref format="html" href="http://java.sun.com/j2ee/docs.html" scope="local">http://java.sun.com/j2ee/docs.html</xref></i>.</p></section>
+<section><p>In order to qualify as a resource manager in a J2EE system, J2EE
+requires these basic areas of support:   <ul>
+<li>JNDI support. <p>Allows calling applications to register names for databases
+and access them through those names instead of through database connection
+URLs. Implementation of one of the JDBC extensions, <i><xref href="rrefjta18596.dita#rrefjta18596/jta20722">javax.sql.DataSource</xref>,</i> provides
+this support.</p></li>
+<li>Connection pooling <p>A mechanism by which a connection pool server keeps
+a set of open connections to a resource manager (<ph conref="refconrefs.dita#prod/productshortname"></ph>).
+A user requesting a connection can get one of the available connections from
+the pool. Such a connection pool is useful in client/server environments because
+establishing a connection is relatively expensive. In an embedded environment,
+connections are much cheaper, making the performance advantage of a connection
+pool negligible. Implementation of two of the JDBC extensions, <i><xref href="rrefjta18596.dita#rrefjta18596/jta96573">javax.sql.ConnectionPoolDataSource
+and javax.sql.PooledConnection</xref></i>, provide this support.</p></li>
+<li>XA support.<indexterm>XA</indexterm><indexterm>Distributed transaction
+management</indexterm><indexterm>javax.sql.XAxxx interfaces</indexterm><indexterm>java.transaction.xa
+package</indexterm> <p>XA is one of several standards for distributed transaction
+management. It is based on two-phase commit. The <i>javax.sql.XAxxx</i> interfaces,
+along with <i>java.transaction.xa</i> package, are an abstract implementation
+of XA. For more information about XA, see <cite>X/Open CAE Specification-Distributed
+Transaction Processing: The XA Specification</cite>, X/Open Document No. XO/CAE/91/300
+or ISBN 1 872630 24 3. Implementation of the JTA API, the interfaces of the
+java.transaction.xa package (<i><xref href="rrefjta18596.dita#rrefjta18596/jta18170">javax.sql.XAConnection</xref>,</i> <i><xref
+href="rrefjta18596.dita#rrefjta18596/jta88962">javax.sql.XADataSource</xref>,</i> <i><xref
+href="rrefjta51021.dita#rrefjta51021/jta18387">javax.transaction.xa.XAResource</xref>,</i> <i><xref
+href="rrefjta51021.dita#rrefjta51021/jta75105">javax.transaction.xa.Xid</xref>,</i> and <i><xref
+href="rrefjta51021.dita#rrefjta51021/jta93666">javax.transaction.xa.XAException</xref></i>),
+provide this support.</p></li>
+</ul></p></section>
+<section><p>With the exception of the core JDBC interfaces, these interfaces
+are not visible to the end-user application; instead, they are used only by
+the other back-end components in the system.   <note>For information on the
+classes that implement these interfaces and how to use <ph conref="refconrefs.dita#prod/productshortname"></ph> as
+a resource manager, see Chapter 6, "Using <ph conref="refconrefs.dita#prod/productshortname"></ph> as
+a J2EE Resource Manager" in the <cite><ph conref="refconrefs.dita#pub/citdevelop"></ph></cite>.</note></p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefjta18596.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefjta18596.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefjta18596.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefjta18596.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,14 +16,17 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefjta18596" xml:lang="en-us">
 <title>javax.sql: JDBC Extensions </title>
 <prolog><metadata>
 <keywords><indexterm>javax.sql package</indexterm><indexterm>JDBC 2.0<indexterm>standard
-extensions</indexterm></indexterm></keywords>
+extensions</indexterm></indexterm>
+<indexterm>javax.sql.PooledConnection</indexterm><indexterm>Connection pooling</indexterm>
+<indexterm>javax.sql.DataSource</indexterm><indexterm>Data sources</indexterm>
+<indexterm>javax.sql.XAConnection</indexterm><indexterm>javax.sql.XADataSource</indexterm>
+<indexterm>Data sources<indexterm>creating a database for</indexterm></indexterm>
+<indexterm>Data sources<indexterm>shutting down a database for</indexterm></indexterm>
+</keywords>
 </metadata></prolog>
 <refbody>
 <section><p>This section documents the JDBC extensions that <ph conref="refconrefs.dita#prod/productshortname"></ph> implements
@@ -29,42 +34,36 @@
 href="http://java.sun.com/products/jdbc/jdbc20.stdext.javadoc/javax/sql/package-summary.html"
 scope="local"><i>http://java.sun.com/products/jdbc/jdbc20.stdext.javadoc/javax/sql/package-summary.html</i></xref>).
   <ul id="i1017905">
-<li><i id="jta20722"><ph><indexterm>javax.sql.DataSource</indexterm></ph>javax.sql.DataSource</i><indexterm>Data
-sources</indexterm> <p><ph conref="refconrefs.dita#prod/productshortname"></ph>'s
+<li><i id="jta20722">javax.sql.DataSource</i> <p><ph conref="refconrefs.dita#prod/productshortname"></ph>'s
 implementation of <i>DataSource</i> means that it supports JNDI; as a resource
 manager, it allows a database to be named and registered within a JNDI server.
 This allows the calling application to access the database by a name (as a
 data source) instead of through a database connection URL.</p></li>
-<li><i id="jta96573"><ph><indexterm>javax.sql.ConnectionPoolDataSource</indexterm></ph><ph><indexterm>javax.sql.PooledConnection</indexterm></ph><ph
-><indexterm>Connection pooling</indexterm></ph>javax.sql.ConnectionPoolDataSource
-and javax.sql.PooledConnection</i>   <p>Establishing a connection to the database
-can be a relatively expensive operation in client/server environments. Establishing
-the connection once and then using the same connection for multiple requests
-can dramatically improve the performance of a database.</p> <p>The <ph conref="refconrefs.dita#prod/productshortname"></ph> implementation
+<li><i id="jta96573">javax.sql.ConnectionPoolDataSource and javax.sql.PooledConnection</i> 
+ <p>Establishing a connection to the database can be a relatively expensive
+operation in client/server environments. Establishing the connection once
+and then using the same connection for multiple requests can dramatically
+improve the performance of a database.</p> <p>The <ph conref="refconrefs.dita#prod/productshortname"></ph> implementation
 of <codeph>ConnectionPoolDataSource</codeph> and <codeph>PooledConnection</codeph> allows
 a connection pool server to maintain a set of such connections to the resource
 manager (<ph conref="refconrefs.dita#prod/productshortname"></ph>). In an
 embedded environment, connections are much cheaper and connection pooling
 is not necessary.</p></li>
-<li id="i1018049"><i id="jta18170"><ph><indexterm>javax.sql.XAConnection</indexterm></ph>javax.sql.XAConnection</i> 
- <p>An <i>XAConnection</i> produces an <i>XAResource</i>, and, over its lifetime,
-many <i>Connections</i>. It allows for distributed transactions.</p></li>
-<li id="i1018057"><i id="jta88962"><ph><indexterm>javax.sql.XADataSource</indexterm></ph>javax.sql.XADataSource</i> 
- <p>An <i>XADataSource</i> is simply a <i>ConnectionPoolDataSource</i> that
-produces <i>XAConnections</i>.</p></li>
+<li id="i1018049"><i id="jta18170">javax.sql.XAConnection</i>   <p>An <i>XAConnection</i> produces
+an <i>XAResource</i>, and, over its lifetime, many <i>Connections</i>. It
+allows for distributed transactions.</p></li>
+<li id="i1018057"><i id="jta88962">javax.sql.XADataSource</i>   <p>An <i>XADataSource</i> is
+simply a <i>ConnectionPoolDataSource</i> that produces <i>XAConnections</i>.</p></li>
 </ul></p></section>
 <section><p>In addition, <ph conref="refconrefs.dita#prod/productshortname"></ph> provides
 three methods for <i>XADataSource, DataSource, and ConnectionPoolDataSource</i>. <ph
 conref="refconrefs.dita#prod/productshortname"></ph> supports a number of
 additional data source properties:   <ul>
-<li><i><ph><indexterm>Data sources<indexterm>creating a database for</indexterm></indexterm></ph>setCreateDatabase(String
-create)</i>   <p>Sets a property to create a database at the next connection.
-The string argument must be "create".</p></li>
-<li><i>setShutdownDatabase(String shutdown)<ph><indexterm>Data sources<indexterm>shutting
-down a database for</indexterm></indexterm></ph></i>   <p>Sets a property
-to shut down a database. Shuts down the database at the next connection. The
-string argument must be "shutdown".</p></li>
+<li><i><ph></ph>setCreateDatabase(String create)</i>   <p>Sets a property
+to create a database at the next connection. The string argument must be "create".</p></li>
+<li><i>setShutdownDatabase(String shutdown)</i>   <p>Sets a property to shut
+down a database. Shuts down the database at the next connection. The string
+argument must be "shutdown".</p></li>
 </ul> <note>Set these properties before getting the connection.</note></p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefjta37588.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefjta37588.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefjta37588.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefjta37588.dita Tue Jun 28 15:46:15 2005
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
-
-Licensed 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.
--->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
-<reference id="rrefjta37588" xml:lang="en-us">
-<title>J2EE Overview</title>
-<prolog><metadata>
-<keywords><indexterm>Resource manager<indexterm>Derby as a J2EE
-system</indexterm></indexterm></keywords>
-</metadata></prolog>
-<refbody>
-<section><p>J2EE, or the Java 2 Platform, Enterprise Edition, is a standard
-for development of enterprise applications; one example is Enterprise Java
-Beans (EJBs) with distributed capabilities.</p></section>
-<section><p><ph conref="refconrefs.dita#prod/productshortname"></ph> is a
-J2EE-conformant component in a distributed J2EE system. As such, it is one
-part of a larger system that includes, among other things, a JNDI server,
-a connection pool module, a transaction manager, a resource manager, and user
-applications. (<ph conref="refconrefs.dita#prod/productshortname"></ph> also
-supports the JTA API, which is not a current J2EE requirement, but this functionality
-provides another piece of the same system.) Within this system, <ph conref="refconrefs.dita#prod/productshortname"></ph> can
-serve as the resource manager.</p></section>
-<section><p>For more information on J2EE, see the J2EE specification available
-at <i><xref format="html" href="http://java.sun.com/j2ee/docs.html" scope="local">http://java.sun.com/j2ee/docs.html</xref></i>.</p></section>
-<section><p>In order to qualify as a resource manager in a J2EE system, J2EE
-requires these basic areas of support:   <ul>
-<li>JNDI support.<indexterm>JNDI</indexterm><indexterm>javax.sql.DataSource</indexterm> <p>Allows
-calling applications to register names for databases and access them through
-those names instead of through database connection URLs. Implementation of
-one of the JDBC extensions, <i><xref href="rrefjta18596.dita#rrefjta18596/jta20722">javax.sql.DataSource</xref>,</i> provides
-this support.</p></li>
-<li>Connection pooling<indexterm>Connection pooling</indexterm><indexterm>javax.sql.ConnectionPoolDataSource</indexterm><indexterm>javax.sql.PooledConnection</indexterm
-> <p>A mechanism by which a connection pool server keeps a set of open connections
-to a resource manager (<ph conref="refconrefs.dita#prod/productshortname"></ph>).
-A user requesting a connection can get one of the available connections from
-the pool. Such a connection pool is useful in client/server environments because
-establishing a connection is relatively expensive. In an embedded environment,
-connections are much cheaper, making the performance advantage of a connection
-pool negligible. Implementation of two of the JDBC extensions, <i><xref href="rrefjta18596.dita#rrefjta18596/jta96573">javax.sql.ConnectionPoolDataSource
-and javax.sql.PooledConnection</xref></i>, provide this support.</p></li>
-<li>XA support.<indexterm>XA</indexterm><indexterm>Distributed transaction
-management</indexterm><indexterm>javax.sql.XAxxx interfaces</indexterm><indexterm>java.transaction.xa
-package</indexterm> <p>XA is one of several standards for distributed transaction
-management. It is based on two-phase commit. The <i>javax.sql.XAxxx</i> interfaces,
-along with <i>java.transaction.xa</i> package, are an abstract implementation
-of XA. For more information about XA, see <cite>X/Open CAE Specification-Distributed
-Transaction Processing: The XA Specification</cite>, X/Open Document No. XO/CAE/91/300
-or ISBN 1 872630 24 3. Implementation of the JTA API, the interfaces of the
-java.transaction.xa package (<i><xref href="rrefjta18596.dita#rrefjta18596/jta18170">javax.sql.XAConnection</xref>,</i> <i><xref
-href="rrefjta18596.dita#rrefjta18596/jta88962">javax.sql.XADataSource</xref>,</i> <i><xref
-href="rrefjta51021.dita#rrefjta51021/jta18387">javax.transaction.xa.XAResource</xref>,</i> <i><xref
-href="rrefjta51021.dita#rrefjta51021/jta75105">javax.transaction.xa.Xid</xref>,</i> and <i><xref
-href="rrefjta51021.dita#rrefjta51021/jta93666">javax.transaction.xa.XAException</xref></i>),
-provide this support.</p></li>
-</ul></p></section>
-<section><p>With the exception of the core JDBC interfaces, these interfaces
-are not visible to the end-user application; instead, they are used only by
-the other back-end components in the system.   <note>For information on the
-classes that implement these interfaces and how to use <ph conref="refconrefs.dita#prod/productshortname"></ph> as
-a resource manager, see Chapter 6, "Using <ph conref="refconrefs.dita#prod/productshortname"></ph> as
-a J2EE Resource Manager" in the <cite><ph conref="refconrefs.dita#pub/citdevelop"></ph></cite>.</note></p></section>
-</refbody>
-</reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rreflimits.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rreflimits.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rreflimits.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rreflimits.dita Tue Jun 28 15:46:15 2005
@@ -20,14 +20,8 @@
 <reference id="rreflimits" xml:lang="en-us">
 <title>Derby limitations</title>
 <refbody>
-<section><p>The following tables list the limitations associated with <ph
-conref="refconrefs.dita#prod/productshortname"></ph>. They include: <ul>
-<li><xref href="rrefidlengthlimits.dita#rrefidlengthlimits"></xref></li>
-<li><xref href="rrefnumericlimits.dita#rrefnumericlimits"></xref></li>
-<li><xref href="rrefstringlimits.dita#rrefstringlimits"></xref></li>
-<li><xref href="rrefdttlimits.dita#rrefdttlimits"></xref></li>
-<li><xref href="rrefdbmlimits.dita#rrefdbmlimits"></xref></li>
-</ul></p></section>
+<section><p>The section lists the limitations associated with <ph
+conref="refconrefs.dita#prod/productshortname"></ph>.</p></section>
 </refbody>
 </reference>
 

Modified: incubator/derby/docs/trunk/src/ref/rrefnewtablename.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefnewtablename.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefnewtablename.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefnewtablename.dita Tue Jun 28 15:46:15 2005
@@ -22,7 +22,7 @@
 <refbody>
 <section><p>A <i>new-table-Name</i> represents a renamed table. You cannot
 qualify a <i>new-table-Name</i> with a <i>schema-Name</i>.</p></section>
-<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b></codeblock></section>
+<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
 <section><title>Example</title> <codeblock><b><ph>-- FlightBooks is a new-table-Name that does not include a schema-Name</ph>
 RENAME TABLE FLIGHTAVAILABILITY TO FLIGHTAVAILABLE</b></codeblock></section>
 </refbody>

Modified: incubator/derby/docs/trunk/src/ref/rrefproceduresinplacecompress.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefproceduresinplacecompress.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefproceduresinplacecompress.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefproceduresinplacecompress.dita Tue Jun 28 15:46:15 2005
@@ -1,108 +1,107 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
-<!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
-
-Licensed 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.
--->
-<reference id="rrefproceduresinplacecompress" xml:lang="en-us">
-<title>SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE</title>
-<prolog><metadata>
-<keywords><indexterm>Reclaiming unused space</indexterm><indexterm>System
-procedures<indexterm>SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE</indexterm></indexterm>
-<indexterm>SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE system procedure</indexterm>
-</keywords>
-</metadata></prolog>
-<refbody>
-<section><p>Use the <codeph>SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE</codeph> system
-procedure to reclaim unused, allocated space in a table and its indexes. Typically,
-unused allocated space exists when a large amount of data is deleted from
-a table and there has not been any subsequent inserts to use the space created
-by the deletes. By default, <ph conref="refconrefs.dita#prod/productshortname"></ph> does
-not return unused space to the operating system. For example, once a page
-has been allocated to a table or index, it is not automatically returned to
-the operating system until the table or index is destroyed. <codeph>SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE</codeph> allows
-you to return unused space to the operating system.</p><p>This system procedure
-can be used to force three levels of in-place compression of a SQL table: <codeph>PURGE_ROWS</codeph>, <codeph>DEFRAGMENT_ROWS</codeph>,
-and <codeph>TRUNCATE_END</codeph>. Unlike <codeph>SYSCS_UTIL.SYSCS_COMPRESS_TABLE()</codeph>,
-all work is done in place in the existing table/index.</p></section>
-<section><title>Syntax</title><codeblock><b>SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE(
-		IN SCHEMANAME VARCHAR(128),
-		IN TABLENAME VARCHAR(128),
-		IN PURGE_ROWS SMALLINT,
-		IN DEFRAGMENT_ROWS SMALLINT,
-		IN TRUNCATE_END SMALLINT )</b></codeblock> <dl><dlentry>
-<dt>SCHEMANAME</dt>
-<dd>An input argument of type VARCHAR(128) that specifies the schema of the
-table. Passing a null will result in an error. </dd>
-</dlentry><dlentry>
-<dt>TABLENAME</dt>
-<dd>An input argument of type VARCHAR(128) that specifies the table name of
-the table. The string must exactly match the case of the table name, and the
-argument of "Fred" will be passed to SQL as the delimited identifier 'Fred'.
- Passing a null will result in an error.</dd>
-</dlentry><dlentry>
-<dt>PURGE_ROWS</dt>
-<dd>If PURGE_ROWS is set to a non-zero value, then a single pass is made through
-the table which will purge committed deleted rows from the table. This space
-is then available for future inserted rows, but remains allocated to the table.
-As this option scans every page of the table, its performance is linearly
-related to the size of the table.</dd>
-</dlentry><dlentry>
-<dt>DEFRAGMENT_ROWS</dt>
-<dd>If DEFRAGMENT_ROWS is set to a non-zero value, then a single defragment
-pass is made which will move existing rows from the end of the table towards
-the front of the table. The goal of defragmentation is to empty a set of pages
-at the end of the table which can then be returned to the operating system
-by the TRUNCATE_END option. It is recommended to only run DEFRAGMENT_ROWS
-if also specifying the TRUNCATE_END option. The DEFRAGMENT_ROWS option scans
-the whole table and needs to update index entries for every base table row
-move, so the execution time is linearly related to the size of the table.</dd>
-</dlentry><dlentry>
-<dt>TRUNCATE_END</dt>
-<dd>If TRUNCATE_END is set to a non-zero value, then all contiguous pages
-at the end of the table will be returned to the operating system. Running
-the PURGE_ROWS and/or DEFRAGMENT_ROWS options may increase the number of pages
-affected. This option by itself performs no scans of the table. </dd>
-</dlentry></dl></section>
-<section><title>SQL example</title><p>To compress a table called CUSTOMER
-in a schema called US, using all available compress options:<codeblock><b>call SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE('US', 'CUSTOMER', 1, 1, 1);</b
-></codeblock></p><p>To return the empty free space at the end of the same
-table, the following call will run much quicker than running all options but
-will likely return much less space:<codeblock><b>call SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE('US', 'CUSTOMER', 0, 0, 1);</b></codeblock></p></section>
-<section><title>Java example</title><p>To compress a table called CUSTOMER
-in a schema called US, using all available compress options:<codeblock>CallableStatement cs = conn.prepareCall
-("CALL SYSCS_UTIL.SYSCS_COMPRESS_TABLE(?, ?, ?, ?, ?)");
-cs.setString(1, "US");
-cs.setString(2, "CUSTOMER");
-cs.setShort(3, (short) 1);
-cs.setShort(4, (short) 1);
-cs.setShort(5, (short) 1);
-cs.execute();</codeblock></p><p>To return the empty free space at the end
-of the same table, the following call will run much quicker than running all
-options but will likely return much less space:<codeblock>CallableStatement cs = conn.prepareCall
-("CALL SYSCS_UTIL.SYSCS_COMPRESS_TABLE(?, ?, ?, ?, ?)");
-cs.setString(1, "US");
-cs.setString(2, "CUSTOMER");
-cs.setShort(3, (short) 0);
-cs.setShort(4, (short) 0);
-cs.setShort(5, (short) 1);
-cs.execute();</codeblock></p></section>
-<section><p>It is recommended that the SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE
-procedure be issued in autocommit mode.<note>This procedure acquires an exclusive
-table lock on the table being compressed. All statement plans dependent on
-the table or its indexes are invalidated. For information on identifying unused
-space, see the <cite><ph conref="refconrefs.dita#pub/citadmin"></ph></cite>.</note></p></section>
-</refbody>
-</reference>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
+<!-- 
+Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+
+Licensed 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.
+-->
+<reference id="rrefproceduresinplacecompress" xml:lang="en-us">
+<title>SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE</title>
+<prolog><metadata>
+<keywords><indexterm>Reclaiming unused space</indexterm><indexterm>System
+procedures<indexterm>SYSCS_INPLAC E_COMPRESS_TABLE</indexterm></indexterm>
+</keywords>
+</metadata></prolog>
+<refbody>
+<section><p>Use the <codeph>SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE</codeph> system
+procedure to reclaim unused, allocated space in a table and its indexes. Typically,
+unused allocated space exists when a large amount of data is deleted from
+a table and there has not been any subsequent inserts to use the space created
+by the deletes. By default, <ph conref="refconrefs.dita#prod/productshortname"></ph> does
+not return unused space to the operating system. For example, once a page
+has been allocated to a table or index, it is not automatically returned to
+the operating system until the table or index is destroyed. <codeph>SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE</codeph> allows
+you to return unused space to the operating system.</p><p>This system procedure
+can be used to force three levels of in-place compression of a SQL table: <codeph>PURGE_ROWS</codeph>, <codeph>DEFRAGMENT_ROWS</codeph>,
+and <codeph>TRUNCATE_END</codeph>. Unlike <codeph>SYSCS_UTIL.SYSCS_COMPRESS_TABLE()</codeph>,
+all work is done in place in the existing table/index.</p></section>
+<section><title>Syntax</title><codeblock><b>SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE(
+		IN SCHEMANAME VARCHAR(128),
+		IN TABLENAME VARCHAR(128),
+		IN PURGE_ROWS SMALLINT,
+		IN DEFRAGMENT_ROWS SMALLINT,
+		IN TRUNCATE_END SMALLINT )</b></codeblock> <dl><dlentry>
+<dt>SCHEMANAME</dt>
+<dd>An input argument of type VARCHAR(128) that specifies the schema of the
+table. Passing a null will result in an error. </dd>
+</dlentry><dlentry>
+<dt>TABLENAME</dt>
+<dd>An input argument of type VARCHAR(128) that specifies the table name of
+the table. The string must exactly match the case of the table name, and the
+argument of "Fred" will be passed to SQL as the delimited identifier 'Fred'.
+ Passing a null will result in an error.</dd>
+</dlentry><dlentry>
+<dt>PURGE_ROWS</dt>
+<dd>If PURGE_ROWS is set to a non-zero value, then a single pass is made through
+the table which will purge committed deleted rows from the table. This space
+is then available for future inserted rows, but remains allocated to the table.
+As this option scans every page of the table, its performance is linearly
+related to the size of the table.</dd>
+</dlentry><dlentry>
+<dt>DEFRAGMENT_ROWS</dt>
+<dd>If DEFRAGMENT_ROWS is set to a non-zero value, then a single defragment
+pass is made which will move existing rows from the end of the table towards
+the front of the table. The goal of defragmentation is to empty a set of pages
+at the end of the table which can then be returned to the operating system
+by the TRUNCATE_END option. It is recommended to only run DEFRAGMENT_ROWS
+if also specifying the TRUNCATE_END option. The DEFRAGMENT_ROWS option scans
+the whole table and needs to update index entries for every base table row
+move, so the execution time is linearly related to the size of the table.</dd>
+</dlentry><dlentry>
+<dt>TRUNCATE_END</dt>
+<dd>If TRUNCATE_END is set to a non-zero value, then all contiguous pages
+at the end of the table will be returned to the operating system. Running
+the PURGE_ROWS and/or DEFRAGMENT_ROWS options may increase the number of pages
+affected. This option by itself performs no scans of the table. </dd>
+</dlentry></dl></section>
+<section><title>SQL example</title><p>To compress a table called CUSTOMER
+in a schema called US, using all available compress options:<codeblock><b>call SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE('US', 'CUSTOMER', 1, 1, 1);</b
+></codeblock></p><p>To return the empty free space at the end of the same
+table, the following call will run much quicker than running all options but
+will likely return much less space:<codeblock><b>call SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE('US', 'CUSTOMER', 0, 0, 1);</b></codeblock></p></section>
+<section><title>Java example</title><p>To compress a table called CUSTOMER
+in a schema called US, using all available compress options:<codeblock>CallableStatement cs = conn.prepareCall
+("CALL SYSCS_UTIL.SYSCS_COMPRESS_TABLE(?, ?, ?, ?, ?)");
+cs.setString(1, "US");
+cs.setString(2, "CUSTOMER");
+cs.setShort(3, (short) 1);
+cs.setShort(4, (short) 1);
+cs.setShort(5, (short) 1);
+cs.execute();</codeblock></p><p>To return the empty free space at the end
+of the same table, the following call will run much quicker than running all
+options but will likely return much less space:<codeblock>CallableStatement cs = conn.prepareCall
+("CALL SYSCS_UTIL.SYSCS_COMPRESS_TABLE(?, ?, ?, ?, ?)");
+cs.setString(1, "US");
+cs.setString(2, "CUSTOMER");
+cs.setShort(3, (short) 0);
+cs.setShort(4, (short) 0);
+cs.setShort(5, (short) 1);
+cs.execute();</codeblock></p></section>
+<section><p>It is recommended that the SYSCS_UTIL.SYSCS_INPLACE_COMPRESS_TABLE
+procedure be issued in autocommit mode.<note>This procedure acquires an exclusive
+table lock on the table being compressed. All statement plans dependent on
+the table or its indexes are invalidated. For information on identifying unused
+space, see the <cite><ph conref="refconrefs.dita#pub/citadmin"></ph></cite>.</note></p></section>
+</refbody>
+</reference>

Modified: incubator/derby/docs/trunk/src/ref/rrefrauthid.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefrauthid.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefrauthid.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefrauthid.dita Tue Jun 28 15:46:15 2005
@@ -28,7 +28,7 @@
 are always case-insensitive within <ph conref="refconrefs.dita#prod/productshortname"></ph>'s
 authorization system unless they are delimited. For more information, see
 the <cite><ph conref="refconrefs.dita#pub/citdevelop"></ph></cite>.</p></section>
-<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b></codeblock></section>
+<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
 <section><title>Example</title> <codeblock><b>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
     'derby.database.fullAccessUsers', 'Amber,FRED')</b></codeblock></section>
 </refbody>

Modified: incubator/derby/docs/trunk/src/ref/rrefsauadt3.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsauadt3.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsauadt3.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsauadt3.dita Tue Jun 28 15:46:15 2005
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
-
-Licensed 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.
--->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
-<reference id="rrefsauadt3" xml:lang="en-us">
-<title>Source and updatability (all data types)</title>
-<refbody>
-<section><p><ph conref="refconrefs.dita#prod/productshortname"></ph> does
-not track the source or updatability of columns in <i>ResultSets</i>, and
-so always returns the following constants for the following methods:   <table
-expanse="column" frame="all">
-<tgroup cols="2" colsep="1" rowsep="1"><colspec colname="1" colnum="1" colwidth="40*"/>
-<colspec colname="2" colnum="2" colwidth="60*"/>
-<thead>
-<row>
-<entry align="left" colname="1" valign="bottom">Method Name</entry>
-<entry align="left" colname="2" valign="bottom">Value</entry>
-</row>
-</thead>
-<tbody>
-<row>
-<entry colname="1"><i>isDefinitelyWritable</i></entry>
-<entry colname="2">false</entry>
-</row>
-<row>
-<entry colname="1"><i>isReadOnly</i></entry>
-<entry colname="2">false</entry>
-</row>
-<row>
-<entry colname="1"><i>isWritable</i></entry>
-<entry colname="2">false</entry>
-</row>
-</tbody>
-</tgroup>
-</table></p></section>
-</refbody>
-</reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefscalarsubquery.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefscalarsubquery.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefscalarsubquery.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefscalarsubquery.dita Tue Jun 28 15:46:15 2005
@@ -24,11 +24,11 @@
 </metadata></prolog>
 <refbody>
 <section> <p>You can place a <i>ScalarSubquery</i> anywhere an <i>Expression</i> is
-permitted. A <i>ScalarSubquery</i> turns a <i><xref href="rrefselectexpression.dita#rrefselectexpression"></xref></i> result
+permitted. A <i>ScalarSubquery</i> turns a <i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i> result
 into a scalar value because it returns only a single row and column value.</p> <p>The
 query must evaluate to a single row with a single column.</p> <p><indexterm>Expression
 subquery</indexterm>Sometimes also called an expression subquery.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>(<i><xref href="rrefsqlj21571.dita#rrefsqlj21571"></xref></i>)</b></codeblock> </refsyn>
+<refsyn><title>Syntax</title> <codeblock><b>(<i><xref href="rrefsqlj21571.dita#rrefsqlj21571">Query</xref></i>)</b></codeblock> </refsyn>
 <example> <codeblock><b><ph>-- avg always returns a single value, so the subquery is
 -- a ScalarSubquery</ph>
 SELECT NAME COMM

Modified: incubator/derby/docs/trunk/src/ref/rrefschemaname.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefschemaname.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefschemaname.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefschemaname.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,30 +16,26 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefschemaname" xml:lang="en-us">
-<title>schema-Name</title>
+<title>schemaName</title>
 <refbody>
-<section><p>A <i>schema-Name</i> represents a <i>schema</i>. Schemas contain
+<section><p>A <i>schemaName</i> represents a <i>schema</i>. Schemas contain
 other dictionary objects, such as tables and indexes. Schemas provide a way
 to name a subset of tables and other dictionary objects within a database.</p></section>
 <section><p>You can explicitly create or drop a schema. The default user schema
 is the <i>APP</i> schema (if no user name is specified at connection time).
 You are not allowed to create dictionary objects in the <i>SYS</i> schema.</p></section>
 <section><p>Thus, you can qualify references to tables with the schema name.
-When a schema-Name is not specified, the default schema name is implicitly
+When a schemaName is not specified, the default schema name is implicitly
 inserted. System tables are placed in the <i>SYS</i> schema. You must qualify
 all references to system tables with the <i>SYS</i> schema identifier. For
 more information about system tables, see <xref href="rrefsistabs38369.dita#rrefsistabs38369"></xref>.</p></section>
 <section><p>A schema is hierarchically the highest level of dictionary object,
-so you cannot qualify a schema-Name.</p></section>
-<section><title>Syntax</title> <codeblock><i>SQL92Identifier</i></codeblock></section>
-<section><title>Example</title> <codeblock><b><ph>-- SAMP.EMPLOYEE is a table-Name qualified by a schema-Name</ph>
+so you cannot qualify a schemaName.</p></section>
+<section><title>Syntax</title><codeblock><i>SQL92Identifier</i></codeblock></section>
+<section><title>Example</title><codeblock><b><ph>-- SAMP.EMPLOYEE is a table-Name qualified by a schemaName</ph>
 SELECT COUNT(*) FROM SAMP.EMPLOYEE
 <ph>-- You must qualify system catalog names with their schema, SYS</ph>
 SELECT COUNT(*) FROM SYS.SysColumns</b></codeblock></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefselectexpression.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefselectexpression.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefselectexpression.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefselectexpression.dita Tue Jun 28 15:46:15 2005
@@ -30,22 +30,22 @@
 other tables.</p></section>
 <refsyn><title>Syntax</title> <codeblock><b>SELECT [ DISTINCT | ALL ] <i>SelectItem</i> [ , <i>SelectItem </i>]*
 <i><xref href="rrefsqlj21583.dita#rrefsqlj21583"></xref></i>
-[ <i><xref href="rrefsqlj33602.dita#rrefsqlj33602"></xref> </i>]
-[ <i><xref href="rrefsqlj32654.dita#rrefsqlj32654"></xref></i> ]
-[ <i><xref href="rrefsqlj14854.dita#rrefsqlj14854"></xref></i> ]</b></codeblock> <p><b>SelectItem:</b></p> <codeblock><b>{
+[ <i><xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE clause</xref> </i>]
+[ <i><xref href="rrefsqlj32654.dita#rrefsqlj32654">GROUP BY clause</xref></i> ]
+[ <i><xref href="rrefsqlj14854.dita#rrefsqlj14854">HAVING clause</xref></i> ]</b></codeblock> <p><b>SelectItem:</b></p> <codeblock><b>{
     * |
-    { <i><xref href="rreftablename.dita#rreftablename"></xref></i> | <i><xref href="rrefcorrelationname.dita#rrefcorrelationname"></xref></i> } .* |
-    <i>Expression</i> [AS <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname"></xref> </i>]
+    { <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i> | <i><xref href="rrefcorrelationname.dita#rrefcorrelationname">correlation-Name</xref></i> } .* |
+    <i>Expression</i> [AS <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref> </i>]
 }</b></codeblock> <p>The SELECT clause contains a list of expressions and
-an optional quantifier that is applied to the results of the <xref href="rrefsqlj21583.dita#rrefsqlj21583"></xref> and
-the <xref href="rrefsqlj33602.dita#rrefsqlj33602"></xref>. If DISTINCT is specified,
+an optional quantifier that is applied to the results of the <xref href="rrefsqlj21583.dita#rrefsqlj21583">FROM clause</xref> and
+the <xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE clause</xref>. If DISTINCT is specified,
 only one copy of any row value is included in the result. Nulls are considered
 duplicates of one another for the purposes of DISTINCT. If no quantifier,
 or ALL, is specified, no rows are removed from the result in applying the
 SELECT clause (ALL is the default).</p> <p>A<i> SelectItem</i> projects one
 or more result column values for a table result being constructed in a <i>SelectExpression</i>.</p> <p>The
-result of the <xref href="rrefsqlj21583.dita#rrefsqlj21583"></xref> is the cross product
-of the FROM items. The <xref href="rrefsqlj33602.dita#rrefsqlj33602"></xref> can further
+result of the <xref href="rrefsqlj21583.dita#rrefsqlj21583">FROM clause</xref> is the cross product
+of the FROM items. The <xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE clause</xref> can further
 qualify this result.</p> <p>The WHERE clause causes rows to be filtered from
 the result based on a boolean expression. Only rows for which the expression
 evaluates to TRUE are returned in the result.</p> <p>The GROUP BY clause groups
@@ -80,10 +80,10 @@
 a query does not have a FROM clause (when you are constructing a value, not
 getting data out of a table), you use a VALUES statement, not a <i>SelectExpression</i>.
 For example:   <codeblock><b>VALUES CURRENT_TIMESTAMP</b></codeblock></p> <p>See <xref
-href="rrefsqlj11277.dita#rrefsqlj11277"></xref>.</p> </refsyn>
+href="rrefsqlj11277.dita#rrefsqlj11277">VALUES Expression</xref>.</p> </refsyn>
 <section id="sqlj38441"><title>The * wildcard</title> <p>* expands to all
-columns in the tables in the associated FROM clause.</p> <p><i><xref href="rreftablename.dita#rreftablename"></xref>.*</i> and <i><xref
-href="rrefcorrelationname.dita#rrefcorrelationname"></xref>.*</i> expand to
+columns in the tables in the associated FROM clause.</p> <p><i><xref href="rreftablename.dita#rreftablename">table-Name</xref>.*</i> and <i><xref
+href="rrefcorrelationname.dita#rrefcorrelationname">correlation-Name</xref>.*</i> expand to
 all columns in the identified table. That table must be listed in the associated
 FROM clause.</p> </section>
 <section><title>Naming columns</title> <p>You can name a <i>SelectItem</i> column

Modified: incubator/derby/docs/trunk/src/ref/rrefsetstatstimingproc.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsetstatstimingproc.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsetstatstimingproc.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsetstatstimingproc.dita Tue Jun 28 15:46:15 2005
@@ -31,8 +31,8 @@
 argument.</p></section>
 <section><p>When statistics timing is turned on, <ph conref="refconrefs.dita#prod/productshortname"></ph> tracks
 the timings of various aspects of the execution of a statement. This information
-is included in the information returned by the <xref href="rrefsyscsruntimestatsfunc.dita#rrefsyscsruntimestatsfunc"></xref> system
-function. When statistics timing is turned off, the <xref href="rrefsyscsruntimestatsfunc.dita#rrefsyscsruntimestatsfunc"></xref> system
+is included in the information returned by the <xref href="rrefsyscsruntimestatsfunc.dita#rrefsyscsruntimestatsfunc">SYSCS_UTIL.SYSCS_GET_RUNTIMESTATISTICS</xref> system
+function. When statistics timing is turned off, the <xref href="rrefsyscsruntimestatsfunc.dita#rrefsyscsruntimestatsfunc">SYSCS_UTIL.SYSCS_GET_RUNTIMESTATISTICS</xref> system
 function shows all timing values as zero.</p></section>
 <section><title>Syntax</title> <codeblock>SYSCS_UTIL.SYSCS_SET_STATISTICS_TIMING(IN SMALLINT ENABLE)</codeblock></section>
 <section><title>Example</title> <p>To turn the <codeph>runtimestatistics</codeph> attribute

Modified: incubator/derby/docs/trunk/src/ref/rrefsimplecolumnname.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsimplecolumnname.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsimplecolumnname.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsimplecolumnname.dita Tue Jun 28 15:46:15 2005
@@ -24,7 +24,7 @@
 it cannot be qualified by a <i>table-Name</i> or<i> correlation-Name</i>.
 This is the case when the qualification is fixed, as it is in a column definition
 within a CREATE TABLE statement, and in ORDER BY clauses.</p></section>
-<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834"></xref></i></b></codeblock></section>
+<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
 <section><title>Example</title> <codeblock><b><ph>-- country is a Simple-column-Name</ph>
 CREATE TABLE CONTINENT (COUNTRY VARCHAR(26) NOT NULL PRIMARY KEY,
 COUNTRY_ISO_CODE CHAR(2), REGION VARCHAR(26))</b></codeblock></section>

Modified: incubator/derby/docs/trunk/src/ref/rrefsistabs12813.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsistabs12813.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsistabs12813.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsistabs12813.dita Tue Jun 28 15:46:15 2005
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
+ "../dtd/reference.dtd">
 <!-- 
 Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
 
@@ -14,9 +16,6 @@
 See the License for the specific language governing permissions and  
 limitations under the License.
 -->
-
-<!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
 <reference id="rrefsistabs12813" xml:lang="en-us">
 <title>SYSDEPENDS</title>
 <refbody>
@@ -48,8 +47,8 @@
 </row>
 <row>
 <entry colname="1">DEPENDENTFINDER</entry>
-<entry colname="2">org.apache.derby.catalog.DependableFinder: This class is
-not part of the public API.</entry>
+<entry colname="2">org.apache.derby.catalog. DependableFinder: This class
+is not part of the public API.</entry>
 <entry colname="3">1</entry>
 <entry colname="4">false</entry>
 <entry colname="5">system type describing the publication or view</entry>
@@ -63,7 +62,7 @@
 </row>
 <row>
 <entry colname="1">PROVIDERFINDER</entry>
-<entry colname="2">org.apache.derby.catalog.DependableFinder This class is
+<entry colname="2">org.apache.derby.catalog. DependableFinder This class is
 not part of the public API.</entry>
 <entry colname="3">1</entry>
 <entry colname="4">false</entry>
@@ -75,4 +74,3 @@
 </table></p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefsistabs38369.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefsistabs38369.dita?rev=202296&r1=202295&r2=202296&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefsistabs38369.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefsistabs38369.dita Tue Jun 28 15:46:15 2005
@@ -20,24 +20,7 @@
 <reference id="rrefsistabs38369" xml:lang="en-us">
 <title>Derby System Tables</title>
 <refbody>
-<section><p><ph conref="refconrefs.dita#prod/productshortname"></ph> includes
-the following system tables:   <ul>
-<li><xref href="rrefsistabs28114.dita#rrefsistabs28114"></xref></li>
-<li><xref href="rrefsistabs26665.dita#rrefsistabs26665"></xref></li>
-<li><xref href="rrefsistabs22441.dita#rrefsistabs22441">SYSCOLUMNS</xref></li>
-<li><xref href="rrefsistabs39391.dita#rrefsistabs39391"></xref></li>
-<li><xref href="rrefsistabs23241.dita#rrefsistabs23241"></xref></li>
-<li><xref href="rrefsistabs12813.dita#rrefsistabs12813"></xref></li>
-<li><xref href="rrefsistabs40972.dita#rrefsistabs40972"></xref></li>
-<li><xref href="rrefsistabs13420.dita#rrefsistabs13420"></xref></li>
-<li><xref href="rrefsistabs33921.dita#rrefsistabs33921"></xref></li>
-<li><xref href="rrefsistabs12085.dita#rrefsistabs12085"></xref></li>
-<li><xref href="rrefsistabslilanguageitemsysstatistics.dita#rrefsistabslilanguageitemsysstatistics"></xref></li>
-<li><xref href="rrefsistabs33768.dita#rrefsistabs33768"></xref></li>
-<li><xref href="rrefsistabs24269.dita#rrefsistabs24269"></xref></li>
-<li><xref href="rrefsistabs79888.dita#rrefsistabs79888"></xref></li>
-<li><xref href="rrefsistabs24045.dita#rrefsistabs24045"></xref></li>
-</ul></p></section>
+<section><p><ph conref="refconrefs.dita#prod/productshortname"></ph> includes system tables.</p></section>
 <section><p>You can query system tables, but you cannot alter them.</p></section>
 <section><p>All system tables reside in the <i>SYS</i> schema. Because this
 is not the default schema, qualify all queries accessing the system tables



Mime
View raw message