You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by fu...@apache.org on 2005/07/01 02:14:52 UTC

svn commit: r208698 [2/6] - /incubator/derby/docs/trunk/src/ref/

Modified: incubator/derby/docs/trunk/src/ref/rrefcreatefunctionstatement.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcreatefunctionstatement.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcreatefunctionstatement.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcreatefunctionstatement.dita Thu Jun 30 17:14:39 2005
@@ -1,6 +1,8 @@
 <?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.  
+Copyright 1997, 2005 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.  
@@ -14,19 +16,88 @@
 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="rrefcreatefunctionstatement" xml:lang="en-us">
 <title>CREATE FUNCTION statement</title>
+<shortdesc>The CREATE FUNCTION statement allows you to create Java functions,
+which you can then use in an expression.</shortdesc>
 <prolog><metadata>
-<keywords></keywords>
+<keywords><indexterm>CREATE FUNCTION statement</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><p>The CREATE FUNCTION statement allows you to create Java functions,
-which you can then use in an expression.</p></section>
-<section><title>Syntax</title> <codeblock><b>CREATE FUNCTION <i><xref href="rrefcrprofunctionname.dita#rrefcrprofunctionname">function-name</xref></i> ( [ <xref href="rrefcrprofunctionparameter.dita#rrefcrprofunctionparameter">FunctionParameter</xref> 
-   [, <xref href="rrefcrprofunctionparameter.dita#rrefcrprofunctionparameter">FunctionParameter</xref>] ] * ) RETURNS DataType [ <xref href="rrefcrprofunctionelement.dita#rrefcrprofunctionelement">FunctionElement</xref> ] *</b></codeblock></section>
+<section><title>Syntax</title> <codeblock><b>CREATE FUNCTION <i><xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionname"
+>function-name</xref></i> ( [ <xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionparameter">FunctionParameter</xref
+> 
+   [, <xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionparameter">FunctionParameter</xref>] ] * ) RETURNS DataType [ <xref
+href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement/rrefcrprofunctionelement">FunctionElement</xref> ] *</b></codeblock></section>
+<example id="rrefcrprofunctionname"><title>function-Name</title><codeblock><b>[ <i><xref
+href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock><p>If
+schema-Name is not provided, the current schema is the default schema. If
+a qualified procedure name is specified, the schema name cannot begin with
+SYS.</p></example>
+<example id="rrefcrprofunctionparameter"><title>FunctionParameter</title><codeblock><b>[ parameter-Name ] <i>DataType</i></b></codeblock></example>
+<section><p>PararameterName must be unique within a function.</p><p>The syntax
+of <i>DataType</i> is described in <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p><note>Long
+data-types such as LONG VARCHAR, LONG VARCHAR FOR BIT DATA, CLOB, and BLOB
+are not allowed as parameters in a CREATE FUNCTION statement.</note></section>
+<example id="rrefcrprofunctionelement"> <title>FunctionElement</title><codeblock><b> {
+| LANGUAGE { JAVA }
+| EXTERNAL NAME <i>string</i>
+| PARAMETER STYLE JAVA
+| { NO SQL | CONTAINS SQL | READS SQL DATA }
+| { RETURNS NULL ON NULL INPUT | CALLED ON NULL INPUT }
+ }</b></codeblock></example>
+<section><title>LANGUAGE</title><p><b>JAVA</b>- the database manager will
+call the function as a public static method in a Java class.</p></section>
+<section><title>EXTERNAL NAME <i>string</i></title><p><i>String</i> describes
+the Java method to be called when the function is executed, and takes the
+following form: <codeblock>class_name.method_name</codeblock>The External
+Name cannot have any extraneous spaces.</p></section>
+<section><title>PARAMETER STYLE</title><p><b>JAVA</b> - The function will
+use a parameter-passing convention that conforms to the Java language and
+SQL Routines specification. INOUT and OUT parameters will be passed as single
+entry arrays to facilitate returning values. Result sets are returned through
+additional parameters to the Java method of type java.sql.ResultSet[] that
+are passed single entry arrays.</p><p><ph conref="refconrefs.dita#prod/productshortname"></ph> does
+not support long column types (for example Long Varchar, BLOB, and so on).
+An error will occur if you try to use one of these long column types. </p></section>
+<section><title>NO SQL, CONTAINS SQL, READS SQL DATA</title> <p>Indicates
+whether the function issues any SQL statements and, if so, what type.</p> <dl>
+<dlentry>
+<dt>CONTAINS SQL</dt>
+<dd>Indicates that SQL statements that neither read nor modify SQL data can
+be executed by the function. Statements that are not supported in any function
+return a different error.</dd>
+</dlentry><dlentry>
+<dt>NO SQL</dt>
+<dd>Indicates that the function cannot execute any SQL statements</dd>
+</dlentry><dlentry>
+<dt>READS SQL DATA </dt>
+<dd>Indicates that some SQL statements that do not modify SQL data can be
+included in the function. Statements that are not supported in any stored
+function return a different error. This is the default value.</dd>
+</dlentry></dl></section>
+<section><title>RETURNS NULL ON NULL INPUT or CALLED ON NULL INPUT</title><p>Specifies
+whether the function is called if any of the input arguments is null. The
+result is the null value. <dl><dlentry>
+<dt>RETURNS NULL ON NULL INPUT</dt>
+<dd>Specifies that the function is not invoked if any of the input arguments
+is null. The result is the null value.</dd>
+</dlentry><dlentry>
+<dt>CALLED ON NULL INPUT</dt>
+<dd>Specifies that the function is invoked if any or all input arguments are
+null. This specification means that the function must be coded to test for
+null argument values. The function can return a null or non-null value. This
+is the default setting.</dd>
+</dlentry></dl></p></section>
+<section><p>The function elements may appear in any order, but each type of
+element can only appear once. A function definition must contain these elements: <ul>
+<li><b>LANGUAGE</b></li>
+<li><b>PARAMETER STYLE</b></li>
+<li><b>EXTERNAL NAME</b></li>
+</ul></p></section>
+<section><title>Example</title><codeblock><b>CREATE FUNCTION TO_DEGREES(RADIANS DOUBLE) RETURNS DOUBLE
+PARAMETER STYLE JAVA NO SQL LANGUAGE JAVA
+EXTERNAL NAME 'java.lang.Math.toDegrees'</b></codeblock></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefcreateprocedurestatement.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcreateprocedurestatement.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcreateprocedurestatement.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcreateprocedurestatement.dita Thu Jun 30 17:14:39 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 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.  
@@ -21,8 +21,81 @@
 <refbody>
 <section><p>The CREATE PROCEDURE statement allows you to create Java stored
 procedures, which you can then call using the CALL PROCEDURE statement.</p></section>
-<section><title>Syntax</title> <codeblock><b>CREATE PROCEDURE <i><xref href="rrefcrproprocedurename.dita#rrefcrproprocedurename">procedure-Name</xref></i> ( [ <xref href="rrefcrproprocedureparameter.dita#rrefcrproprocedureparameter">ProcedureParameter</xref>
-   [, <xref href="rrefcrproprocedureparameter.dita#rrefcrproprocedureparameter">ProcedureParameter</xref>] ] * )
-[ <xref href="rrefcrproprocedureelement.dita#rrefcrproprocedureelement">ProcedureElement</xref> ] *</b></codeblock></section>
+<section><title>Syntax</title><codeblock><b>CREATE PROCEDURE <i><xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedurename"
+>procedure-Name</xref></i> ( [ <xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedureparameter">ProcedureParameter</xref
+>
+   [, <xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedureparameter">ProcedureParameter</xref>] ] * )
+[ <xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedureelement">ProcedureElement</xref> ] *</b></codeblock
+></section>
+<example id="rrefcrproprocedurename"><title>procedure-Name</title><codeblock><b>[ <i><xref
+href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></example>
+<section><p>If schema-Name is not provided, the current schema is the default
+schema. If a qualified procedure name is specified, the schema name cannot
+begin with SYS.</p></section>
+<example id="rrefcrproprocedureparameter"> <title>ProcedureParameter</title><codeblock><b>[ { IN | OUT | INOUT } ] [ parameter-Name ] <i>DataType</i
+></b></codeblock></example>
+<section><p>The default value for a parameter is IN. ParameterName must be
+unique within a procedure.</p><p>The syntax of <i>DataType</i> is described
+in <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p><note>Long data-types
+such as LONG VARCHAR, LONG VARCHAR FOR BIT DATA, CLOB, and BLOB are not allowed
+as parameters in a CREATE PROCEDURE statement.</note></section>
+<example id="rrefcrproprocedureelement"> <title>ProcedureElement</title><codeblock><b> { 
+| [ DYNAMIC ] RESULT SETS <i><xref href="rrefsqlj10696.dita#rrefsqlj10696">INTEGER</xref></i>
+| LANGUAGE { JAVA }
+| EXTERNAL NAME <i>string</i>
+| PARAMETER STYLE JAVA
+| { NO SQL | MODIFIES SQL DATA | CONTAINS SQL | READS SQL DATA }
+ }
+</b></codeblock></example>
+<section><title>DYNAMIC RESULT SETS <i>integer</i></title> <p>Indicates the
+estimated upper bound of returned result sets for the procedure. Default is
+no (zero) dynamic result sets.</p></section>
+<section><title>LANGUAGE</title> <p><b>JAVA</b>- the database manager will
+call the procedure as a public static method in a Java class.</p></section>
+<section><title>EXTERNAL NAME <i>string</i></title> <p><i>String</i> describes
+the Java method to be called when the procedure is executed, and takes the
+following form: <codeblock>class_name.method_name</codeblock>The External
+Name cannot have any extraneous spaces.</p></section>
+<section><title>PARAMETER STYLE</title> <p><b>JAVA</b> - The procedure will
+use a parameter-passing convention that conforms to the Java language and
+SQL Routines specification. INOUT and OUT parameters will be passed as single
+entry arrays to facilitate returning values. Result sets are returned through
+additional parameters to the Java method of type java.sql.ResultSet [] that
+are passed single entry arrays.</p> <p><ph conref="refconrefs.dita#prod/productshortname"></ph> does
+not support long column types (for example Long Varchar, BLOB, and so on).
+An error will occur if you try to use one of these long column types. </p></section>
+<section><title>NO SQL, CONTAINS SQL, READS SQL DATA, MODIFIES SQL DATA </title> <p>Indicates
+whether the stored procedure issues any SQL statements and, if so, what type.</p> <dl>
+<dlentry>
+<dt>CONTAINS SQL</dt>
+<dd>Indicates that SQL statements that neither read nor modify SQL data can
+be executed by the stored procedure. Statements that are not supported in
+any stored procedure return a different error. MODIFIES SQL DATA is the default
+value.</dd>
+</dlentry><dlentry>
+<dt>NO SQL</dt>
+<dd>Indicates that the stored procedure cannot execute any SQL statements</dd>
+</dlentry><dlentry>
+<dt>READS SQL DATA </dt>
+<dd>Indicates that some SQL statements that do not modify SQL data can be
+included in the stored procedure. Statements that are not supported in any
+stored procedure return a different error.</dd>
+</dlentry><dlentry>
+<dt>MODIFIES SQL DATA</dt>
+<dd>Indicates that the stored procedure can execute any SQL statement except
+statements that are not supported in stored procedures.</dd>
+</dlentry></dl></section>
+<section><p>The procedure elements may appear in any order, but each type
+of element can only appear once. A procedure definition must contain these
+elements: <ul>
+<li><b>LANGUAGE</b></li>
+<li><b>PARAMETER STYLE</b></li>
+<li><b>EXTERNAL NAME</b></li>
+</ul></p></section>
+<section><title>Example</title> <codeblock><b>CREATE PROCEDURE SALES.TOTAL_REVENUE(IN S_MONTH INTEGER,
+IN S_YEAR INTEGER, OUT TOTAL DECIMAL(10,2))
+PARAMETER STYLE JAVA READS SQL DATA LANGUAGE JAVA EXTERNAL NAME 
+'com.acme.sales.calculateRevenueByMonth'</b></codeblock></section>
 </refbody>
 </reference>

Modified: incubator/derby/docs/trunk/src/ref/rrefcrprofunctionelement.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcrprofunctionelement.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcrprofunctionelement.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcrprofunctionelement.dita Thu Jun 30 17:14:39 2005
@@ -1,86 +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="rrefcrprofunctionelement" xml:lang="en-us">
-<title>FunctionElement</title>
-<refbody>
-<example> <codeblock><b> { 
-<b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b>
-| LANGUAGE { JAVA }
-| EXTERNAL NAME <i>string</i>
-| PARAMETER STYLE JAVA
-| { NO SQL | CONTAINS SQL | READS SQL DATA }
-| { RETURNS NULL ON NULL INPUT | CALLED ON NULL INPUT }
- }</b></codeblock></example>
-<section><title>LANGUAGE</title> <p><b>JAVA</b>- the database manager will
-call the function as a public static method in a Java class.</p></section>
-<section><title>EXTERNAL NAME <i>string</i></title> <p><i>String</i> describes
-the Java method to be called when the function is executed, and takes the
-following form: <codeblock>class_name.method_name</codeblock>The External
-Name cannot have any extraneous spaces.</p></section>
-<section><title>PARAMETER STYLE</title> <p><b>JAVA</b> - The function will
-use a parameter-passing convention that conforms to the Java language and
-SQL Routines specification. INOUT and OUT parameters will be passed as single
-entry arrays to facilitate returning values. Result sets are returned through
-additional parameters to the Java method of type java.sql.ResultSet[] that
-are passed single entry arrays.</p> <p><ph conref="refconrefs.dita#prod/productshortname"></ph> does
-not support long column types (for example Long Varchar, BLOB, and so on).
-An error will occur if you try to use one of these long column types. </p></section>
-<section><title>NO SQL, CONTAINS SQL, READS SQL DATA</title> <p>Indicates
-whether the function issues any SQL statements and, if so, what type.</p> <dl>
-<dlentry>
-<dt>CONTAINS SQL</dt>
-<dd>Indicates that SQL statements that neither read nor modify SQL data can
-be executed by the function. Statements that are not supported in any function
-return a different error.</dd>
-</dlentry><dlentry>
-<dt>NO SQL</dt>
-<dd>Indicates that the function cannot execute any SQL statements</dd>
-</dlentry><dlentry>
-<dt>READS SQL DATA </dt>
-<dd>Indicates that some SQL statements that do not modify SQL data can be
-included in the function. Statements that are not supported in any stored
-function return a different error. This is the default value.</dd>
-</dlentry></dl></section>
-<section><title>RETURNS NULL ON NULL INPUT or CALLED ON NULL INPUT</title> <p>Specifies
-whether the function is called if any of the input arguments is null. The
-result is the null value. <dl><dlentry>
-<dt>RETURNS NULL ON NULL INPUT</dt>
-<dd>Specifies that the function is not invoked if any of the input arguments
-is null. The result is the null value.</dd>
-</dlentry><dlentry>
-<dt>CALLED ON NULL INPUT</dt>
-<dd>Specifies that the function is invoked if any or all input arguments are
-null. This specification means that the function must be coded to test for
-null argument values. The function can return a null or non-null value. This
-is the default setting.</dd>
-</dlentry></dl></p></section>
-<section><p>The function elements may appear in any order, but each type of
-element can only appear once. A function definition must contain these elements: <ul>
-<li><b>LANGUAGE</b></li>
-<li><b>PARAMETER STYLE</b></li>
-<li><b>EXTERNAL NAME</b></li>
-</ul></p></section>
-<section><title>Example</title> <codeblock><b>CREATE FUNCTION TO_DEGREES(RADIANS DOUBLE) RETURNS DOUBLE
-PARAMETER STYLE JAVA NO SQL LANGUAGE JAVA
-EXTERNAL NAME 'java.lang.Math.toDegrees'</b></codeblock></section>
-</refbody>
-</reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefcrprofunctionname.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcrprofunctionname.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcrprofunctionname.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcrprofunctionname.dita Thu Jun 30 17:14:39 2005
@@ -1,30 +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="rrefcrprofunctionname" xml:lang="en-us">
-<title>function-Name</title>
-<refbody>
-<example> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></example>
-<section><p>If schema-Name is not provided, the current schema is the default
-schema. If a qualified procedure name is specified, the schema name cannot
-begin with SYS.</p></section>
-</refbody>
-</reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefcrprofunctionparameter.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcrprofunctionparameter.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcrprofunctionparameter.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcrprofunctionparameter.dita Thu Jun 30 17:14:39 2005
@@ -1,30 +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="rrefcrprofunctionparameter" xml:lang="en-us">
-<title>FunctionParameter</title>
-<refbody>
-<example> <codeblock><b>[ parameter-Name ] <i>DataType</i></b></codeblock></example>
-<section><p>PararameterName must be unique within a function.</p></section>
-<section><p>The syntax of <i>DataType</i> is described in <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p></section>
-<section> <note>Long data-types such as LONG VARCHAR, LONG VARCHAR FOR BIT
-DATA, CLOB, and BLOB are not allowed as parameters in a CREATE FUNCTION statement.</note></section>
-</refbody>
-</reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefcrproprocedureelement.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcrproprocedureelement.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcrproprocedureelement.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcrproprocedureelement.dita Thu Jun 30 17:14:39 2005
@@ -1,84 +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="rrefcrproprocedureelement" xml:lang="en-us">
-<title>ProcedureElement</title>
-<refbody>
-<example> <codeblock><b> { 
-<b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b>
-| [ DYNAMIC ] RESULT SETS <i><xref href="rrefsqlj10696.dita#rrefsqlj10696">INTEGER</xref></i>
-| LANGUAGE { JAVA }
-| EXTERNAL NAME <i>string</i>
-| PARAMETER STYLE JAVA
-| { NO SQL | MODIFIES SQL DATA | CONTAINS SQL | READS SQL DATA }
- }
-</b></codeblock></example>
-<section><title>DYNAMIC RESULT SETS <i>integer</i></title> <p>Indicates the
-estimated upper bound of returned result sets for the procedure. Default is
-no (zero) dynamic result sets.</p></section>
-<section><title>LANGUAGE</title> <p><b>JAVA</b>- the database manager will
-call the procedure as a public static method in a Java class.</p></section>
-<section><title>EXTERNAL NAME <i>string</i></title> <p><i>String</i> describes
-the Java method to be called when the procedure is executed, and takes the
-following form: <codeblock>class_name.method_name</codeblock>The External
-Name cannot have any extraneous spaces.</p></section>
-<section><title>PARAMETER STYLE</title> <p><b>JAVA</b> - The procedure will
-use a parameter-passing convention that conforms to the Java language and
-SQL Routines specification. INOUT and OUT parameters will be passed as single
-entry arrays to facilitate returning values. Result sets are returned through
-additional parameters to the Java method of type java.sql.ResultSet [] that
-are passed single entry arrays.</p> <p><ph conref="refconrefs.dita#prod/productshortname"></ph> does
-not support long column types (for example Long Varchar, BLOB, and so on).
-An error will occur if you try to use one of these long column types. </p></section>
-<section><title>NO SQL, CONTAINS SQL, READS SQL DATA, MODIFIES SQL DATA </title> <p>Indicates
-whether the stored procedure issues any SQL statements and, if so, what type.</p> <dl>
-<dlentry>
-<dt>CONTAINS SQL</dt>
-<dd>Indicates that SQL statements that neither read nor modify SQL data can
-be executed by the stored procedure. Statements that are not supported in
-any stored procedure return a different error. MODIFIES SQL DATA is the default
-value.</dd>
-</dlentry><dlentry>
-<dt>NO SQL</dt>
-<dd>Indicates that the stored procedure cannot execute any SQL statements</dd>
-</dlentry><dlentry>
-<dt>READS SQL DATA </dt>
-<dd>Indicates that some SQL statements that do not modify SQL data can be
-included in the stored procedure. Statements that are not supported in any
-stored procedure return a different error.</dd>
-</dlentry><dlentry>
-<dt>MODIFIES SQL DATA</dt>
-<dd>Indicates that the stored procedure can execute any SQL statement except
-statements that are not supported in stored procedures.</dd>
-</dlentry></dl></section>
-<section><p>The procedure elements may appear in any order, but each type
-of element can only appear once. A procedure definition must contain these
-elements: <ul>
-<li><b>LANGUAGE</b></li>
-<li><b>PARAMETER STYLE</b></li>
-<li><b>EXTERNAL NAME</b></li>
-</ul></p></section>
-<section><title>Example</title> <codeblock><b>CREATE PROCEDURE SALES.TOTAL_REVENUE(IN S_MONTH INTEGER,
-IN S_YEAR INTEGER, OUT TOTAL DECIMAL(10,2))
-PARAMETER STYLE JAVA READS SQL DATA LANGUAGE JAVA EXTERNAL NAME 
-'com.acme.sales.calculateRevenueByMonth'</b></codeblock></section>
-</refbody>
-</reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefcrproprocedurename.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcrproprocedurename.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcrproprocedurename.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcrproprocedurename.dita Thu Jun 30 17:14:39 2005
@@ -1,30 +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="rrefcrproprocedurename" xml:lang="en-us">
-<title>procedure-Name</title>
-<refbody>
-<example> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></example>
-<section><p>If schema-Name is not provided, the current schema is the default
-schema. If a qualified procedure name is specified, the schema name cannot
-begin with SYS.</p></section>
-</refbody>
-</reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefcrproprocedureparameter.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcrproprocedureparameter.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcrproprocedureparameter.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcrproprocedureparameter.dita Thu Jun 30 17:14:39 2005
@@ -1,31 +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="rrefcrproprocedureparameter" xml:lang="en-us">
-<title>ProcedureParameter</title>
-<refbody>
-<example> <codeblock><b>[ { IN | OUT | INOUT } ] [ parameter-Name ] <i>DataType</i></b></codeblock></example>
-<section><p>The default value for a parameter is IN. ParameterName must be
-unique within a procedure.</p></section>
-<section><p>The syntax of <i>DataType</i> is described in <xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p></section>
-<section> <note>Long data-types such as LONG VARCHAR, LONG VARCHAR FOR BIT
-DATA, CLOB, and BLOB are not allowed as parameters in a CREATE PROCEDURE statement.</note></section>
-</refbody>
-</reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefcrsrgpc1.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcrsrgpc1.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcrsrgpc1.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcrsrgpc1.dita Thu Jun 30 17:14:39 2005
@@ -1,6 +1,8 @@
 <?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.  
+Copyright 1997, 2005 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.  
@@ -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="rrefcrsrgpc1" xml:lang="en-us">
 <title>Columns in the ResultSet returned by <b><i>getProcedureColumns</i></b></title>
 <refbody>
@@ -38,7 +37,8 @@
 <li>REMARKS   <p>a String describing the java type of the method parameter</p></li>
 <li>METHOD_ID   <p>a <ph conref="refconrefs.dita#prod/productshortname"></ph>-specific
 column.</p></li>
+<li>PARAMETER_ID  <p>a <ph conref="refconrefs.dita#prod/productshortname"></ph>-specific
+column.</p></li>
 </ul></p></section>
 </refbody>
 </reference>
-

Modified: incubator/derby/docs/trunk/src/ref/rrefcurrentisolation.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcurrentisolation.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcurrentisolation.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcurrentisolation.dita Thu Jun 30 17:14:39 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 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.  

Modified: incubator/derby/docs/trunk/src/ref/rrefcursorname.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefcursorname.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefcursorname.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefcursorname.dita Thu Jun 30 17:14:39 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 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.  
@@ -28,7 +28,7 @@
 statements.</p></section>
 <section><p>You cannot qualify a <i>cursor-Name</i>.</p></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>stmt.executeUpdate("UPDATE SAMP.STAFF SET COMM = "
+<section><title>Example</title> <codeblock><b>stmt.executeUpdate("UPDATE SAMP.STAFF SET COMM = " +
 "COMM + 20 " + "WHERE CURRENT OF " + ResultSet.getCursorName());</b></codeblock></section>
 </refbody>
 </reference>

Modified: incubator/derby/docs/trunk/src/ref/rrefdatefunc.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefdatefunc.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefdatefunc.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefdatefunc.dita Thu Jun 30 17:14:39 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 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.  

Modified: incubator/derby/docs/trunk/src/ref/rrefdayfunc.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefdayfunc.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefdayfunc.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefdayfunc.dita Thu Jun 30 17:14:39 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 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.  
@@ -42,6 +42,6 @@
 <codeblock><b>DAY ( <i>expression</i> )</b></codeblock>
 </refsyn>
 <example>
-<codeblock><b>values day('2004-08-02');</b></codeblock>
+<codeblock><b>values day('2005-08-02');</b></codeblock>
 <p>The resulting value is 2.</p>
 </example></refbody></reference>

Modified: incubator/derby/docs/trunk/src/ref/rrefdbmlimits.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefdbmlimits.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefdbmlimits.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefdbmlimits.dita Thu Jun 30 17:14:39 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 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.  
@@ -21,7 +21,7 @@
 <title>Limitations for database manager values</title>
 <refbody>
 <table frame="all"><title>Database manager limitations</title><desc>The following
-table contains limitations on various Database Manager values in <ph conref="refconrefs.dita#prod/productshortname"></ph>.</desc>
+table lists limitations on various Database Manager values in <ph conref="refconrefs.dita#prod/productshortname"></ph>.</desc>
 <tgroup cols="2" colsep="1" rowsep="1"><colspec colname="colspec0" colwidth="228*"/>
 <colspec colname="colspec1" colwidth="228*"/>
 <thead>
@@ -32,11 +32,11 @@
 </thead>
 <tbody>
 <row>
-<entry colname="colspec0">Most columns in a table</entry>
+<entry colname="colspec0">Maximum columns in a table</entry>
 <entry colname="colspec1">1,012</entry>
 </row>
 <row>
-<entry colname="colspec0">Most columns in a view</entry>
+<entry colname="colspec0">Maximum columns in a view</entry>
 <entry colname="colspec1">5,000</entry>
 </row>
 <row>
@@ -44,20 +44,20 @@
 <entry colname="colspec1">90</entry>
 </row>
 <row>
-<entry colname="colspec0">Most indexes on a table</entry>
+<entry colname="colspec0">Maximum indexes on a table</entry>
 <entry colname="colspec1">32,767 or storage capacity</entry>
 </row>
 <row>
-<entry colname="colspec0">Most tables referenced in an SQL statement or a
+<entry colname="colspec0">Maximum tables referenced in an SQL statement or a
 view</entry>
 <entry colname="colspec1">storage capacity</entry>
 </row>
 <row>
-<entry colname="colspec0">Most elements in a select list</entry>
+<entry colname="colspec0">Maximum elements in a select list</entry>
 <entry colname="colspec1">1,012</entry>
 </row>
 <row>
-<entry colname="colspec0">Most predicates in a WHERE or HAVING clause</entry>
+<entry colname="colspec0">Maximum predicates in a WHERE or HAVING clause</entry>
 <entry colname="colspec1">storage capacity</entry>
 </row>
 <row>
@@ -73,7 +73,7 @@
 <entry colname="colspec1">storage capacity</entry>
 </row>
 <row>
-<entry colname="colspec0">Most declared cursors in a program</entry>
+<entry colname="colspec0">Maximum declared cursors in a program</entry>
 <entry colname="colspec1">storage capacity</entry>
 </row>
 <row>
@@ -97,7 +97,7 @@
 <entry colname="colspec1">storage capacity</entry>
 </row>
 <row>
-<entry colname="colspec0">Most constants in a statement</entry>
+<entry colname="colspec0">Maximum constants in a statement</entry>
 <entry colname="colspec1">storage capacity</entry>
 </row>
 <row>

Modified: incubator/derby/docs/trunk/src/ref/rrefdeclaretemptable.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefdeclaretemptable.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefdeclaretemptable.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefdeclaretemptable.dita Thu Jun 30 17:14:39 2005
@@ -1,6 +1,8 @@
 <?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.  
+Copyright 1997, 2005 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.  
@@ -14,52 +16,82 @@
 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 xml:lang="en-us" id="rrefdeclaretemptable">
+<reference id="rrefdeclaretemptable" xml:lang="en-us">
 <title>DECLARE GLOBAL TEMPORARY TABLE statement</title>
 <prolog><metadata>
-<keywords>
-<indexterm>DECLARE GLOBAL TEMPORARY TABLE statement</indexterm>
-<indexterm>Tables<indexterm>Temporary</indexterm></indexterm>
-</keywords>
-</metadata>
-</prolog>
+<keywords><indexterm>DECLARE GLOBAL TEMPORARY TABLE statement</indexterm>
+<indexterm>Tables<indexterm>Temporary</indexterm></indexterm></keywords>
+</metadata></prolog>
 <refbody>
-<section><p>The DECLARE GLOBAL TEMPORARY TABLE statement defines a temporary table
-for the current connection. These tables do not reside in the system catalogs
-and are not persistent. Temporary tables exist only during the connection
+<section><p>The DECLARE GLOBAL TEMPORARY TABLE statement defines a temporary
+table for the current connection. These tables do not reside in the system
+catalogs and are not persistent. Temporary tables exist only during the connection
 that declared them and cannot be referenced outside of that connection. When
 the connection closes, the rows of the table are deleted, and the in-memory
 description of the temporary table is dropped.</p></section>
-<section><p>Temporary tables are useful when:
-<ul>
+<section><p>Temporary tables are useful when: <ul>
 <li>the table structure is not known before using an application.</li>
 <li>other users do not need the same table structure.</li>
 <li>data in the temporary table is needed while using the application.</li>
 <li>the table can be declared and dropped without holding the locks on the
 system catalog.</li>
 </ul></p></section>
-<section><title>Syntax</title>
-<codeblock><b>DECLARE GLOBAL TEMPORARY TABLE <i><xref href="rrefdeclaretemptable.dita#rrefdeclaretemptable/tempcoltablename">table-Name</xref></i>
+<section><title>Syntax</title> <codeblock><b>DECLARE GLOBAL TEMPORARY TABLE <i><xref
+href="rrefdeclaretemptable.dita#rrefdeclaretemptable/tempcoltablename">table-Name</xref></i>
     { column-definition [ , column-definition ] * }
 [ ON COMMIT {DELETE | PRESERVE} ROWS ]  
 NOT LOGGED [ON ROLLBACK DELETE ROWS]
  </b></codeblock></section>
-<section id="tempcoltablename"><title>table-Name</title>
-<p>Names the temporary table. If a schema-Name other than SESSION is
-specified, an error will occur (SQLSTATE 428EK). If the schema-Name
-is not specified, SESSION is assigned. Multiple connections can define declared
-global temporary tables with the same name because each connection has its
-own unique table descriptor for it.</p>
-<p>Using SESSION as the schema name of a physical table will not cause an
-error, but is discouraged. The SESSION schema name should be reserved for
+<section id="tempcoltablename"><title>table-Name</title><p>Names the temporary
+table. If a schema-Name other than SESSION is specified, an error will occur
+(SQLSTATE 428EK). If the schema-Name is not specified, SESSION is assigned.
+Multiple connections can define declared global temporary tables with the
+same name because each connection has its own unique table descriptor for
+it.</p><p>Using SESSION as the schema name of a physical table will not cause
+an error, but is discouraged. The SESSION schema name should be reserved for
 the temporary table schema.</p></section>
-<section id="tempcolcolumndef"><title>column-definition</title>
-<p>See <xref href="rrefsqlj30540.dita#rrefsqlj30540"/> for <codeph>CREATE TABLE</codeph> for
+<section id="tempcolcolumndef"><title>column-definition</title><p>See <xref
+href="rrefsqlj30540.dita#rrefsqlj30540"></xref> for <codeph>CREATE TABLE</codeph> for
 more information on <codeph>column-definition</codeph>. <codeph>DECLARE GLOBAL
-TEMPORARY TABLE</codeph> does not allow <codeph>generated-column-spec</codeph> in the <codeph>column-definition</codeph>.</p></section>
-<section><title>Examples</title>
-<codeblock><b>set schema myapp;
+TEMPORARY TABLE</codeph> does not allow <codeph>generated-column-spec</codeph> in
+the <codeph>column-definition</codeph>.</p></section>
+<section id="rreftemptabledatatype"><title>Data-type</title><p>Supported data-types
+are: <ul>
+<li>BIGINT</li>
+<li>CHAR</li>
+<li>DATE</li>
+<li>DECIMAL</li>
+<li>DOUBLE PRECISION</li>
+<li>FLOAT</li>
+<li>INTEGER</li>
+<li>NUMERIC</li>
+<li>REAL</li>
+<li>SMALLINT</li>
+<li>TIME</li>
+<li>TIMESTAMP</li>
+<li>VARCHAR</li>
+</ul></p></section>
+<section id="rreftemptableoncommit"><title>ON COMMIT</title><p>Specifies the
+action taken on the global temporary table when a COMMIT operation is performed.</p></section>
+<section><title>DELETE ROWS</title><p>All rows of the table will be deleted
+if no hold-able cursor is open on the table. This is the default value for
+ON COMMIT. If you specify ON ROLLBACK DELETE ROWS, this will delete all the
+rows in the table only if the temporary table was used. ON COMMIT DELETE ROWS
+will delete the rows in the table even if the table was not used (if the table
+does not have hold-able cursors open on it). </p></section>
+<section><title>PRESERVE ROWS</title><p>The rows of the table will be preserved.</p></section>
+<section id="rreftemptablenotlogged"><title>NOT LOGGED</title><p>Specifies
+the action taken on the global temporary table when a rollback operation is
+performed. When a ROLLBACK (or ROLLBACK TO SAVEPOINT) operation is performed,
+if the table was created in the unit of work (or savepoint), the table will
+be dropped. If the table was dropped in the unit of work (or savepoint), the
+table will be restored with no rows.</p></section>
+<section><title>ON ROLLBACK DELETE ROWS</title> <p>This is the default value
+for NOT LOGGED. NOT LOGGED [ON ROLLBACK DELETE ROWS ]] specifies the action
+that is to be taken on the global temporary table when a ROLLBACK or (ROLLBACK
+TO SAVEPOINT) operation is performed. If the table data has been changed,
+all the rows will be deleted.</p></section>
+<section><title>Examples</title><codeblock><b>set schema myapp;
 
 create table t1(c11 int, c12 date);
 
@@ -79,12 +111,10 @@
 -- This select statement is referencing the "myapp.t1" physical 
 -- table since the table was not qualified by SESSION.
 
-</codeblock>
-<p>Note that temporary tables can only be declared in the SESSION schema.
-You should never declare a physical schema with the SESSION name.</p>
-<p>The following is a list of DB2 UDB DECLARE GLOBAL TEMPORARY TABLE functions
-that are not supported by <ph conref="refconrefs.dita#prod/productshortname"></ph>:
-<ul>
+</codeblock> <p>Note that temporary tables can only be declared in the SESSION
+schema. You should never declare a physical schema with the SESSION name.</p> <p>The
+following is a list of DB2 UDB DECLARE GLOBAL TEMPORARY TABLE functions that
+are not supported by <ph conref="refconrefs.dita#prod/productshortname"></ph>: <ul>
 <li>IDENTITY column-options </li>
 <li>IDENTITY attribute in copy-options</li>
 <li>AS (fullselect) DEFINITION ONLY</li>
@@ -93,39 +123,33 @@
 <li>PARTITIONING KEY</li>
 <li>WITH REPLACE </li>
 </ul> </p></section>
-<section><title>Restrictions on Declared Global Temporary Tables</title>
-<p>Temporary tables cannot be specified in the following statements:
-<ul>
+<section><title>Restrictions on Declared Global Temporary Tables</title> <p>Temporary
+tables cannot be specified in the following statements: <ul>
 <li>ALTER TABLE </li>
 <li>CREATE SYNONYM</li>
 <li>CREATE TRIGGER</li>
 <li>CREATE VIEW</li>
 <li>LOCK</li>
 <li>RENAME</li>
-</ul></p>
-<p>Temporary tables cannot be specified in referential constraints.</p>
-<p>There is no check constraints support for columns.</p>
-<p>The following data types cannot be used with Declared Global Temporary
-Tables:
-<ul>
+</ul></p> <p>Temporary tables cannot be specified in referential constraints.</p> <p>There
+is no check constraints support for columns.</p> <p>The following data types
+cannot be used with Declared Global Temporary Tables: <ul>
 <li>BLOB</li>
 <li>CLOB</li>
 <li>LONG VARCHAR</li>
-</ul></p>
-<p>Temporary tables cannot be referenced in a triggered-SQL-statement.</p>
-<p>If a statement performing an insert, update, or delete to the temporary
-table encounters an error, all the rows of the table are deleted.</p></section>
-<section><title>Restrictions Specific to Derby</title>
-<p><ph conref="refconrefs.dita#prod/productshortname"></ph> does not support the following on temporary tables:</p>
-<ul>
+</ul></p> <p>Temporary tables cannot be referenced in a triggered-SQL-statement.</p> <p>If
+a statement performing an insert, update, or delete to the temporary table
+encounters an error, all the rows of the table are deleted.</p></section>
+<section><title>Restrictions Specific to Derby</title> <p><ph conref="refconrefs.dita#prod/productshortname"></ph> does
+not support the following on temporary tables:</p> <ul>
 <li>index support</li>
-<li>synonyms, triggers and views on SESSION schema tables (including physical tables
-and temporary tables)</li>
+<li>synonyms, triggers and views on SESSION schema tables (including physical
+tables and temporary tables)</li>
 <li>LOCK TABLE</li>
 <li>constraints and primary keys</li>
 <li>generated-column-spec</li>
 <li>importing into temporary tables</li>
-</ul>
-<p>Any statements referencing SESSION schema tables and views will not be
-cached.</p></section>
-</refbody></reference>
+</ul> <p>Any statements referencing SESSION schema tables and views will not
+be cached.</p></section>
+</refbody>
+</reference>

Modified: incubator/derby/docs/trunk/src/ref/rrefdmdfns1.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefdmdfns1.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefdmdfns1.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefdmdfns1.dita Thu Jun 30 17:14:39 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 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.  

Modified: incubator/derby/docs/trunk/src/ref/rrefdmrs.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefdmrs.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefdmrs.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefdmrs.dita Thu Jun 30 17:14:39 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 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.  

Modified: incubator/derby/docs/trunk/src/ref/rrefdropfunctionstatement.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefdropfunctionstatement.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefdropfunctionstatement.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefdropfunctionstatement.dita Thu Jun 30 17:14:39 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 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.  

Modified: incubator/derby/docs/trunk/src/ref/rrefdropprocedurestatement.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefdropprocedurestatement.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefdropprocedurestatement.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefdropprocedurestatement.dita Thu Jun 30 17:14:39 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 The Apache Software Foundation or its licensors, as applicable.  
 
 Licensed under the Apache License, Version 2.0 (the "License");  
 See the License for the specific language governing permissions and  
@@ -20,7 +20,7 @@
 <reference id="rrefdropprocedurestatement" xml:lang="en-us">
 <title>DROP PROCEDURE statement</title>
 <refbody>
-<section><title>Syntax</title> <codeblock><b>DROP PROCEDURE <i>procedure-name</i></b></codeblock> <p>Identifies
+<section><title>Syntax</title> <codeblock><b>DROP PROCEDURE <i><xref href="rrefcreateprocedurestatement.dita#rrefcreateprocedurestatement/rrefcrproprocedurename">procedure-Name</xref></i></b></codeblock> <p>Identifies
 the particular procedure to be dropped, and is valid only if there is exactly
 one procedure instance with the <i>procedure-name</i> in the schema. The identified
 procedure can have any number of parameters defined for it. If no procedure

Modified: incubator/derby/docs/trunk/src/ref/rrefdttlimits.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefdttlimits.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefdttlimits.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefdttlimits.dita Thu Jun 30 17:14:39 2005
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 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.  
@@ -21,7 +21,7 @@
 <title>DATE, TIME, and TIMESTAMP limitations</title>
 <refbody>
 <table frame="all"><title>DATE, TIME, and TIMESTAMP limitations</title><desc>The
-following table contains limitations on date, time, and timestamp values in <ph
+following table lists limitations on date, time, and timestamp values in <ph
 conref="refconrefs.dita#prod/productshortname"></ph>.</desc>
 <tgroup cols="2" colsep="1" rowsep="1"><colspec colname="colspec0" colwidth="228*"/>
 <colspec colname="colspec1" colwidth="228*"/>

Modified: incubator/derby/docs/trunk/src/ref/rrefexcept16677.dita
URL: http://svn.apache.org/viewcvs/incubator/derby/docs/trunk/src/ref/rrefexcept16677.dita?rev=208698&r1=208697&r2=208698&view=diff
==============================================================================
--- incubator/derby/docs/trunk/src/ref/rrefexcept16677.dita (original)
+++ incubator/derby/docs/trunk/src/ref/rrefexcept16677.dita Thu Jun 30 17:14:39 2005
@@ -2,7 +2,7 @@
 <!DOCTYPE reference PUBLIC "-//IBM//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
-Copyright 1997, 2004 The Apache Software Foundation or its licensors, as applicable.  
+Copyright 1997, 2005 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.  
@@ -29,21 +29,6 @@
 </keywords>
 </metadata></prolog>
 <refbody>
-<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>
@@ -52,8 +37,7 @@
 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>
+<section><p>For information on processing <i>SQLExceptions</i>, see the <cite><ph
+conref="refconrefs.dita#pub/citdevelop"></ph></cite>.</p></section>
 </refbody>
 </reference>