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 ch...@apache.org on 2013/10/03 19:14:58 UTC
svn commit: r1528945 [1/2] - /db/derby/docs/trunk/src/ref/
Author: chaase3
Date: Thu Oct 3 17:14:57 2013
New Revision: 1528945
URL: http://svn.apache.org/r1528945
Log:
DERBY-6121 Regularize how we refer to object names in the Reference Manual
Modified 45 topics in Reference Manual -- functions, JDBC.
Patch: DERBY-6121-2.diff
Modified:
db/derby/docs/trunk/src/ref/rrefbuiltbigint.dita
db/derby/docs/trunk/src/ref/rrefbuiltchar.dita
db/derby/docs/trunk/src/ref/rrefbuiltdouble.dita
db/derby/docs/trunk/src/ref/rrefbuiltinteger.dita
db/derby/docs/trunk/src/ref/rrefbuiltsmallint.dita
db/derby/docs/trunk/src/ref/rrefbuiltvarchar.dita
db/derby/docs/trunk/src/ref/rrefcasenullif.dita
db/derby/docs/trunk/src/ref/rrefcrsrgpc1.dita
db/derby/docs/trunk/src/ref/rrefcurrentisolation.dita
db/derby/docs/trunk/src/ref/rrefdatefunc.dita
db/derby/docs/trunk/src/ref/rreffunccoalesce.dita
db/derby/docs/trunk/src/ref/rreffunccot.dita
db/derby/docs/trunk/src/ref/rreffuncpi.dita
db/derby/docs/trunk/src/ref/rreffuncrand.dita
db/derby/docs/trunk/src/ref/rreffuncrandom.dita
db/derby/docs/trunk/src/ref/rreffuncrownumber.dita
db/derby/docs/trunk/src/ref/rreffuncxmlexists.dita
db/derby/docs/trunk/src/ref/rreffuncxmlparse.dita
db/derby/docs/trunk/src/ref/rreffuncxmlquery.dita
db/derby/docs/trunk/src/ref/rreffuncxmlserialize.dita
db/derby/docs/trunk/src/ref/rrefidentityvallocal.dita
db/derby/docs/trunk/src/ref/rrefjdbc1020262.dita
db/derby/docs/trunk/src/ref/rrefjdbc12124.dita
db/derby/docs/trunk/src/ref/rrefjdbc28456.dita
db/derby/docs/trunk/src/ref/rrefjdbc37244.dita
db/derby/docs/trunk/src/ref/rrefjdbc41784.dita
db/derby/docs/trunk/src/ref/rrefjdbc70824.dita
db/derby/docs/trunk/src/ref/rrefjdbc88908.dita
db/derby/docs/trunk/src/ref/rrefjdbcescapedate.dita
db/derby/docs/trunk/src/ref/rrefpgc1.dita
db/derby/docs/trunk/src/ref/rrefsecondfunc.dita
db/derby/docs/trunk/src/ref/rrefsqlj16762.dita
db/derby/docs/trunk/src/ref/rrefsqlj29930.dita
db/derby/docs/trunk/src/ref/rrefsqlj32613.dita
db/derby/docs/trunk/src/ref/rrefsqlj32693.dita
db/derby/docs/trunk/src/ref/rrefsqlj33562.dita
db/derby/docs/trunk/src/ref/rrefsqlj38716.dita
db/derby/docs/trunk/src/ref/rrefsqlj40899.dita
db/derby/docs/trunk/src/ref/rrefsqlj42049.dita
db/derby/docs/trunk/src/ref/rrefsqlj61998.dita
db/derby/docs/trunk/src/ref/rrefsqlj73147.dita
db/derby/docs/trunk/src/ref/rrefsqlj93082.dita
db/derby/docs/trunk/src/ref/rrefsqlj97870.dita
db/derby/docs/trunk/src/ref/rrefsqlj98067.dita
db/derby/docs/trunk/src/ref/rrefsqljcurrentschema.dita
db/derby/docs/trunk/src/ref/rrefsqljmod.dita
db/derby/docs/trunk/src/ref/rrefsqljtfinvoke.dita
db/derby/docs/trunk/src/ref/rreftimestampfunc.dita
db/derby/docs/trunk/src/ref/rreftrimfunc.dita
Modified: db/derby/docs/trunk/src/ref/rrefbuiltbigint.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefbuiltbigint.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefbuiltbigint.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefbuiltbigint.dita Thu Oct 3 17:14:57 2013
@@ -26,19 +26,19 @@ limitations under the License.
<section>The BIGINT function returns a 64-bit integer representation of a number
or character string in the form of an integer constant.</section>
<refsyn><title>Syntax</title>
-<codeblock><b>BIGINT (<i>CharacterExpression</i> | <i>NumericExpression</i> ) </b></codeblock>
+<codeblock><b>BIGINT ( <i>characterExpression</i> | <i>numericExpression</i> )</b></codeblock>
<dl>
-<dlentry><dt>CharacterExpression</dt>
+<dlentry><dt><i>characterExpression</i></dt>
<dd>An expression that returns a character string value of length not greater
than the maximum length of a character constant. Leading and trailing blanks
are eliminated and the resulting string must conform to the rules for forming
an SQL integer constant. The character string cannot be a long string. If
-the argument is a CharacterExpression, the result is the same number that
+the argument is a <i>characterExpression</i>, the result is the same number that
would occur if the corresponding integer constant were assigned to a big integer
column or variable.</dd></dlentry>
-<dlentry><dt>NumericExpression</dt>
+<dlentry><dt><i>numericExpression</i></dt>
<dd>An expression that returns a value of any built-in numeric data type.
-If the argument is a NumericExpression, the result is the same number that
+If the argument is a <i>numericExpression</i>, the result is the same number that
would occur if the argument were assigned to a big integer column or variable.
If the whole part of the argument is not within the range of integers, an
error occurs. The decimal part of the argument is truncated if present.</dd></dlentry>
@@ -49,5 +49,5 @@ the result can be null; if the argument
<example><title>Example</title>
<p>Using the EMPLOYEE table, select the EMPNO column in big integer form for
further processing in the application:
-<codeblock><b>SELECT BIGINT</b> (EMPNO) <b>FROM</b> EMPLOYEE</codeblock></p>
+<codeblock><b>SELECT BIGINT (EMPNO) FROM EMPLOYEE</b></codeblock></p>
</example></refbody></reference>
Modified: db/derby/docs/trunk/src/ref/rrefbuiltchar.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefbuiltchar.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefbuiltchar.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefbuiltchar.dita Thu Oct 3 17:14:57 2013
@@ -38,69 +38,74 @@ be null, the result can be null. If the
is the null value. The first argument cannot be an XML value. To convert
an XML value to a CHAR of a specified length, you must use the SQL/XML serialization
operator XMLSERIALIZE.</section>
-<section><title>Character to character syntax</title> <codeblock><b>CHAR (<i>CharacterExpression</i> [, <i>integer</i>] ) </b></codeblock> <dl>
+<section><title>Character to character syntax</title>
+<codeblock><b>CHAR ( <i>characterExpression</i> [ , <i>integer</i> ] )</b></codeblock> <dl>
<dlentry>
-<dt>CharacterExpression</dt>
+<dt><i>characterExpression</i></dt>
<dd>An expression that returns a value that is CHAR, VARCHAR, LONG VARCHAR,
or CLOB data type.</dd>
</dlentry><dlentry>
-<dt>integer</dt>
+<dt><i>integer</i></dt>
<dd>The length attribute for the resulting fixed length character string.
The value must be between 0 and 254.</dd>
-</dlentry></dl> <p>If the length of the character-expression is less than
+</dlentry></dl> <p>If the length of the <i>characterExpression</i> is less than
the length attribute of the result, the result is padded with blanks up to
-the length of the result. If the length of the character-expression is greater
+the length of the result. If the length of the <i>characterExpression</i> is greater
than the length attribute of the result, truncation is performed. A warning
-is returned unless the truncated characters were all blanks and the character-expression
-was not a long string (LONG VARCHAR or CLOB).</p> </section>
-<section><title>Integer to character syntax</title> <codeblock><b>CHAR (<i>IntegerExpression</i> ) </b></codeblock> <dl>
+is returned unless the truncated characters were all blanks and the
+<i>characterExpression</i> was not a long string (LONG VARCHAR or CLOB).</p> </section>
+<section><title>Integer to character syntax</title>
+<codeblock><b>CHAR ( <i>integerExpression</i> ) </b></codeblock> <dl>
<dlentry>
-<dt>IntegerExpression</dt>
+<dt><i>integerExpression</i></dt>
<dd>An expression that returns a value that is an integer data type (either
-SMALLINT, INTEGER or BIGINT).</dd>
+SMALLINT, INTEGER, or BIGINT).</dd>
</dlentry></dl> <p>The result is the character string representation of the
-argument in the form of an SQL integer constant. The result consists of n
+argument in the form of an SQL integer constant. The result consists of <i>n</i>
characters that are the significant digits that represent the value of the
-argument with a preceding minus sign if the argument is negative. It is left
-justified.</p> <ul>
-<li>If the first argument is a small integer: The length of the result is
+argument with a preceding minus sign if the argument is negative. The result is
+left justified.</p> <ul>
+<li>If the first argument is a SMALLINT: The length of the result is
6. If the number of characters in the result is less than 6, then the result
is padded on the right with blanks to length 6.</li>
-<li>If the first argument is a large integer: The length of the result is
+<li>If the first argument is an INTEGER: The length of the result is
11. If the number of characters in the result is less than 11, then the result
is padded on the right with blanks to length 11.</li>
-<li>If the first argument is a big integer: The length of the result is 20.
+<li>If the first argument is a BIGINT: The length of the result is 20.
If the number of characters in the result is less than 20, then the result
is padded on the right with blanks to length 20.</li>
</ul> </section>
-<section><title>Datetime to character syntax</title> <codeblock><b>CHAR (<i>DatetimeExpression</i> ) </b></codeblock> <dl>
+<section><title>Datetime to character syntax</title>
+<codeblock><b>CHAR ( <i>datetimeExpression</i> ) </b></codeblock> <dl>
<dlentry>
-<dt>DatetimeExpression</dt>
+<dt><i>datetimeExpression</i></dt>
<dd>An expression that is one of the following three data types: <ul>
-<li><b>date</b>: The result is the character representation of the date. The
+<li>DATE: The result is the character representation of the date. The
length of the result is 10.</li>
-<li><b>time</b>: The result is the character representation of the time. The
+<li>TIME: The result is the character representation of the time. The
length of the result is 8.</li>
-<li><b>timestamp</b>: The result is the character string representation of
+<li>TIMESTAMP: The result is the character string representation of
the timestamp. The length of the result is 26.</li>
</ul></dd>
</dlentry></dl> </section>
-<section><title>Decimal to character</title> <codeblock><b>CHAR (<i>DecimalExpression</i> ) </b></codeblock> <dl>
+<section><title>Decimal to character</title>
+<codeblock><b>CHAR ( <i>decimalExpression</i> ) </b></codeblock> <dl>
<dlentry>
-<dt>DecimalExpression</dt>
+<dt><i>decimalExpression</i></dt>
<dd>An expression that returns a value that is a decimal data type. If a different
precision and scale is desired, the DECIMAL scalar function can be used first
to make the change.</dd>
</dlentry></dl> </section>
-<section><title>Floating point to character syntax</title> <codeblock><b>CHAR (<i>FloatingPointExpression</i> ) </b></codeblock> <dl>
+<section><title>Floating point to character syntax</title>
+<codeblock><b>CHAR ( <i>floatingPointExpression</i> ) </b></codeblock> <dl>
<dlentry>
-<dt>FloatingPointExpression</dt>
+<dt><i>floatingPointExpression</i></dt>
<dd>An expression that returns a value that is a floating-point data type
(DOUBLE or REAL).</dd>
</dlentry></dl> </section>
<example><title>Example</title>
<p>Use the CHAR function to return the values for EDLEVEL (defined
-as smallint) as a fixed length character string: <codeblock><b>SELECT CHAR</b>(EDLEVEL) <b>FROM</b> EMPLOYEE</codeblock>An
+as smallint) as a fixed length character string: <codeblock><b>SELECT CHAR(EDLEVEL) FROM EMPLOYEE</b></codeblock>An
EDLEVEL of 18 would be returned as the CHAR(6) value '18 ' (18 followed by
four blanks).</p> </example>
</refbody>
Modified: db/derby/docs/trunk/src/ref/rrefbuiltdouble.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefbuiltdouble.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefbuiltdouble.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefbuiltdouble.dita Thu Oct 3 17:14:57 2013
@@ -30,9 +30,11 @@ to a: <ul>
<li>character string representation of a number if the argument is a string
expression.</li>
</ul></section>
-<section><title>Numeric to double</title> <codeblock><b>DOUBLE [PRECISION] (<i>NumericExpression</i> ) </b></codeblock> <dl>
+<section><title>Numeric to double</title>
+<codeblock><b>DOUBLE [ PRECISION ] ( <i>numericExpression</i> )</b></codeblock>
+<dl>
<dlentry>
-<dt>NumericExpression</dt>
+<dt><i>numericExpression</i></dt>
<dd>The argument is an expression that returns a value of any built-in numeric
data type.</dd>
</dlentry></dl> <p>The result of the function is a double-precision floating-point
@@ -40,9 +42,10 @@ number. If the argument can be null, the
is null, the result is the null value. The result is the same number that
would occur if the argument were assigned to a double-precision floating-point
column or variable. </p> </section>
-<section><title>Character string to double</title> <codeblock><b>DOUBLE (<i>StringExpression</i> ) </b></codeblock> <dl>
+<section><title>Character string to double</title>
+<codeblock><b>DOUBLE ( <i>stringExpression</i> )</b></codeblock> <dl>
<dlentry>
-<dt>StringExpression</dt>
+<dt><i>stringExpression</i></dt>
<dd>The argument can be of type CHAR or VARCHAR in the form of a numeric constant.
Leading and trailing blanks in argument are ignored.</dd>
</dlentry></dl> <p>The result of the function is a double-precision floating-point
Modified: db/derby/docs/trunk/src/ref/rrefbuiltinteger.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefbuiltinteger.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefbuiltinteger.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefbuiltinteger.dita Thu Oct 3 17:14:57 2013
@@ -25,21 +25,22 @@ limitations under the License.
<refbody>
<section>The INTEGER function returns an integer representation of a number or
character string in the form of an integer constant.</section>
-<refsyn><title>Syntax</title> <codeblock><b>INT[EGER] (<i>NumericExpression</i> | <i>CharacterExpression</i> ) </b></codeblock> <dl>
+<refsyn><title>Syntax</title>
+<codeblock><b>INT[EGER] ( <i>numericExpression</i> | <i>characterExpression</i> ) </b></codeblock> <dl>
<dlentry>
-<dt>NumericExpression</dt>
+<dt><i>numericExpression</i></dt>
<dd>An expression that returns a value of any built-in numeric data type.
-If the argument is a numeric-expression, the result is the same number that
+If the argument is a <i>numericExpression</i>, the result is the same number that
would occur if the argument were assigned to a large integer column or variable.
If the whole part of the argument is not within the range of integers, an
error occurs. The decimal part of the argument is truncated if present.</dd>
</dlentry><dlentry>
-<dt>CharacterExpression</dt>
+<dt><i>characterExpression</i></dt>
<dd>An expression that returns a character string value of length not greater
than the maximum length of a character constant. Leading and trailing blanks
are eliminated and the resulting string must conform to the rules for forming
an SQL integer constant. The character string cannot be a long string. If
-the argument is a character-expression, the result is the same number that
+the argument is a <i>characterExpression</i>, the result is the same number that
would occur if the corresponding integer constant were assigned to a large
integer column or variable.</dd>
</dlentry></dl> <p>The result of the function is a large integer. If the argument
@@ -49,8 +50,9 @@ the null value.</p> </refsyn>
<p>Using the EMPLOYEE table, select a list containing salary (SALARY)
divided by education level (EDLEVEL). Truncate any decimal in the calculation.
The list should also contain the values used in the calculation and employee
-number (EMPNO). The list should be in descending order of the calculated value: <codeblock><b>SELECT INTEGER</b> (SALARY / EDLEVEL), SALARY, EDLEVEL, EMPNO
-<b>FROM</b> EMPLOYEE
-<b>ORDER BY</b> 1 <b>DESC</b></codeblock></p> </example>
+number (EMPNO). The list should be in descending order of the calculated value:
+<codeblock><b>SELECT INTEGER (SALARY / EDLEVEL), SALARY, EDLEVEL, EMPNO
+FROM EMPLOYEE
+ORDER BY 1 DESC</b></codeblock></p> </example>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/ref/rrefbuiltsmallint.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefbuiltsmallint.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefbuiltsmallint.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefbuiltsmallint.dita Thu Oct 3 17:14:57 2013
@@ -27,31 +27,35 @@ limitations under the License.
<refbody>
<section>The SMALLINT function returns a small integer representation of a
number or character string in the form of a small integer constant.</section>
-<refsyn><title>Syntax</title> <codeblock>SMALLINT ( <i>NumericExpression</i> | <i>CharacterExpression</i> )</codeblock> <dl>
+<refsyn><title>Syntax</title>
+<codeblock><b>SMALLINT ( <i>numericExpression</i> | <i>characterExpression</i> )</b></codeblock>
+<dl>
<dlentry>
-<dt>NumericExpression</dt>
+<dt><i>numericExpression</i></dt>
<dd>An expression that returns a value of any built-in numeric data type.
- If the argument is a NumericExpression, the result is the same number that
+If the argument is a <i>numericExpression</i>, the result is the same number that
would occur if the argument were assigned to a small integer column or variable.
If the whole part of the argument is not within the range of small integers,
an error occurs. The decimal part of the argument is truncated if present.</dd>
</dlentry><dlentry>
-<dt>CharacterExpression</dt>
+<dt><i>characterExpression</i></dt>
<dd>An expression that returns a character string value of length not greater
than the maximum length of a character constant. Leading and trailing blanks
are eliminated and the resulting string must conform to the rules for forming
an SQL integer constant. However, the value of the constant must be in the
range of small integers. The character string cannot be a long string. If
-the argument is a CharacterExpression, the result is the same number that
+the argument is a <i>characterExpression</i>, the result is the same number that
would occur if the corresponding integer constant were assigned to a small
integer column or variable.</dd>
</dlentry></dl> <p>The result of the function is a small integer. If the argument
can be null, the result can be null. If the argument is null, the result is
the null value.</p> </refsyn>
<example><title>Examples</title><p>To determine the small integer representation
-of the number 32767.99, use this clause:<codeblock>VALUES SMALLINT (32767.99)</codeblock>The
+of the number 32767.99, use this clause:
+<codeblock><b>VALUES SMALLINT (32767.99)</b></codeblock>The
result is 32767. </p><p>To determine the small integer representation of the
-number 1, use this clause: <codeblock>VALUES SMALLINT (1)</codeblock>The result
+number 1, use this clause:
+<codeblock><b>VALUES SMALLINT (1)</b></codeblock>The result
is 1. </p></example>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/ref/rrefbuiltvarchar.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefbuiltvarchar.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefbuiltvarchar.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefbuiltvarchar.dita Thu Oct 3 17:14:57 2013
@@ -26,17 +26,17 @@ limitations under the License.
<section>The VARCHAR function returns a varying-length character string representation
of a character string.</section>
<section><title>Character to varchar syntax</title>
-<codeblock><b>VARCHAR (<i>CharacterStringExpression</i> ) </b></codeblock>
+<codeblock><b>VARCHAR ( <i>characterStringExpression</i> )</b></codeblock>
<dl>
-<dlentry><dt>CharacterStringExpression</dt>
+<dlentry><dt><i>characterStringExpression</i></dt>
<dd>An expression whose value must be of a character-string data type with
a maximum length of 32,672 bytes.</dd></dlentry>
</dl>
</section>
<section><title>Datetime to varchar syntax</title>
-<codeblock><b>VARCHAR (<i>DatetimeExpression</i> ) </b></codeblock>
+<codeblock><b>VARCHAR ( <i>datetimeExpression</i> )</b></codeblock>
<dl>
-<dlentry><dt>DatetimeExpression</dt>
+<dlentry><dt><i>datetimeExpression</i></dt>
<dd>An expression whose value must be of a date, time, or timestamp data
type.</dd></dlentry>
</dl>
@@ -44,7 +44,7 @@ type.</dd></dlentry>
<example><title>Example</title>
<p>Using the EMPLOYEE table, select the job description (JOB defined as CHAR(8))
for Dolores Quintana as a VARCHAR equivelant:
-<codeblock><b>SELECT VARCHAR</b>(JOB)
-<b>FROM</b> EMPLOYEE
-<b>WHERE</b> LASTNAME = 'QUINTANA'</codeblock></p>
+<codeblock><b>SELECT VARCHAR(JOB)
+FROM EMPLOYEE
+WHERE LASTNAME = 'QUINTANA'</b></codeblock></p>
</example></refbody></reference>
Modified: db/derby/docs/trunk/src/ref/rrefcasenullif.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcasenullif.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcasenullif.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefcasenullif.dita Thu Oct 3 17:14:57 2013
@@ -26,7 +26,7 @@ limitations under the License.
</metadata></prolog>
<refbody>
<refsyn><title>Syntax</title>
-<codeblock><b>NULLIF ( L, R )</b></codeblock></refsyn>
+<codeblock><b>NULLIF ( <i>expression</i>, <i>expression</i> )</b></codeblock></refsyn>
<section><p>The NULLIF function is very similar to the CASE expression. It
returns NULL if the two arguments are equal, and it returns the first argument
if they are not equal. For example,</p>
Modified: db/derby/docs/trunk/src/ref/rrefcrsrgpc1.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcrsrgpc1.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcrsrgpc1.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefcrsrgpc1.dita Thu Oct 3 17:14:57 2013
@@ -18,37 +18,43 @@ See the License for the specific languag
limitations under the License.
-->
<reference id="rrefcrsrgpc1" xml:lang="en-us">
-<title>Columns in the ResultSet returned by <b><i>getProcedureColumns</i></b></title>
+<title>Columns in the ResultSet returned by getProcedureColumns</title>
<refbody>
<section><p>Columns in the <i>ResultSet</i> returned by <i>getProcedureColumns</i> are
as described by the API. Further details for some specific columns: <ul>
-<li>PROCEDURE_CAT <p>always "null" in <ph conref="../conrefs.dita#prod/productshortname"></ph></p></li>
-<li>PROCEDURE_SCHEM <p>schema for a Java procedure</p></li>
-<li>PROCEDURE_NAME <p>the name of the procedure</p></li>
-<li>COLUMN_NAME <p>the name of the parameter (see <xref href="rrefpgc1.dita#rrefpgc1/jdbc95532">column-Name-Pattern</xref>)</p></li>
-<li>COLUMN_TYPE <p>short indicating what the row describes. Always is <i>DatabaseMetaData.procedureColumnIn</i> for
+<li>PROCEDURE_CAT <p>Always "null" in
+<ph conref="../conrefs.dita#prod/productshortname"></ph>.</p></li>
+<li>PROCEDURE_SCHEM <p>Schema for a Java procedure.</p></li>
+<li>PROCEDURE_NAME <p>The name of the procedure.</p></li>
+<li>COLUMN_NAME <p>The name of the parameter (see
+<i><xref href="rrefpgc1.dita#rrefpgc1/i1024753">columnNamePattern</xref></i>).</p></li>
+<li>COLUMN_TYPE <p><i>short</i> indicating what the row describes. Always is
+<i>DatabaseMetaData.procedureColumnIn</i> for
method parameters, unless the parameter is an array. If so, it is <i>DatabaseMetaData.procedureColumnInOut</i>.
It always returns <i>DatabaseMetaData.procedureColumnReturn</i> for return
values.</p></li>
<li>TYPE_NAME <p><ph conref="../conrefs.dita#prod/productshortname"></ph>-specific
name for the type.</p></li>
-<li>NULLABLE <p>always returns <i>DatabaseMetaData.procedureNoNulls</i> for
+<li>NULLABLE <p>Always returns <i>DatabaseMetaData.procedureNoNulls</i> for
primitive parameters and <i>DatabaseMetaData.procedureNullable</i> for object
-parameters</p></li>
-<li>REMARKS <p>a String describing the java type of the method parameter</p></li>
-<li>COLUMN_DEF <p>a String describing the default value for the
-column (may be null)</p></li>
-<li>SQL_DATA_TYPE <p>reserved by JDBC spec for future use</p></li>
-<li>SQL_DATETIME_SUB <p>reserved by JDBC spec for future use</p></li>
-<li>CHAR_OCTET_LENGTH <p>the maximum length of binary and character
-based columns (or any other datatype the returned value is a NULL)</p></li>
-<li>ORDINAL_POSITION <p>the ordinal position, starting from 1, for the input and output parameters for a procedure.</p></li>
-<li>IS_NULLABLE <p>a String describing the parameter's nullability
-(YES means parameter can include NULLs, NO means it can't)</p></li>
-<li>SPECIFIC_NAME <p>the name which uniquely identifies this procedure within its schema</p></li>
-<li>METHOD_ID <p>a <ph conref="../conrefs.dita#prod/productshortname"></ph>-specific
+parameters.</p></li>
+<li>REMARKS <p>A <i>String</i> describing the Java type of the method
+parameter.</p></li>
+<li>COLUMN_DEF <p>A <i>String</i> describing the default value for the
+column (may be null).</p></li>
+<li>SQL_DATA_TYPE <p>Reserved by JDBC spec for future use.</p></li>
+<li>SQL_DATETIME_SUB <p>Reserved by JDBC spec for future use.</p></li>
+<li>CHAR_OCTET_LENGTH <p>The maximum length of binary and character
+based columns (or any other datatype the returned value is a NULL).</p></li>
+<li>ORDINAL_POSITION <p>The ordinal position, starting from 1, for the input
+and output parameters for a procedure.</p></li>
+<li>IS_NULLABLE <p>A <i>String</i> describing the parameter's nullability
+(YES means parameter can include NULLs, NO means it cannot).</p></li>
+<li>SPECIFIC_NAME <p>The name which uniquely identifies this procedure within
+its schema.</p></li>
+<li>METHOD_ID <p>A <ph conref="../conrefs.dita#prod/productshortname"></ph>-specific
column.</p></li>
-<li>PARAMETER_ID <p>a <ph conref="../conrefs.dita#prod/productshortname"></ph>-specific
+<li>PARAMETER_ID <p>A <ph conref="../conrefs.dita#prod/productshortname"></ph>-specific
column.</p></li>
</ul></p></section>
</refbody>
Modified: db/derby/docs/trunk/src/ref/rrefcurrentisolation.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcurrentisolation.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcurrentisolation.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefcurrentisolation.dita Thu Oct 3 17:14:57 2013
@@ -24,8 +24,8 @@ limitations under the License.
</metadata>
</prolog><refbody>
<section>
-<p>CURRENT ISOLATION returns the current isolation level as a char(2)
-value of either ""(blank), "UR", "CS", "RS",
+<p>CURRENT ISOLATION returns the current isolation level as a CHAR(2)
+value of either "" (blank), "UR", "CS", "RS",
or "RR".</p></section>
<refsyn><title>Syntax</title>
<codeblock><b>CURRENT ISOLATION</b></codeblock>
Modified: db/derby/docs/trunk/src/ref/rrefdatefunc.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefdatefunc.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefdatefunc.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefdatefunc.dita Thu Oct 3 17:14:57 2013
@@ -29,15 +29,16 @@ limitations under the License.
than or equal to 2,932,897, a valid string representation of a date or timestamp,
or a string of length 7 that is not a CLOB, LONG VARCHAR, or XML value. If
the argument is a string of length 7, it must represent a valid date in the
-form yyyynnn, where yyyy are digits denoting a year, and nnn are digits between
+form <i>yyyynnn</i>, where <i>yyyy</i> are digits denoting a year, and
+<i>nnn</i> are digits between
001 and 366, denoting a day of that year. The result of the function is a
date. If the argument can be null, the result can be null; if the argument
is null, the result is the null value. </p> <p>The other rules depend on the
data type of the argument specified: <ul>
<li>If the argument is a date, timestamp, or valid string representation of
a date or timestamp: The result is the date part of the value.</li>
-<li>If the argument is a number: The result is the date that is n-1 days after
-January 1, 1970, where n is the integral part of the number.</li>
+<li>If the argument is a number: The result is the date that is <i>n</i>-1 days
+after January 1, 1970, where <i>n</i> is the integral part of the number.</li>
<li>If the argument is a string with a length of 7: The result is the date
represented by the string.</li>
</ul></p></section>
Modified: db/derby/docs/trunk/src/ref/rreffunccoalesce.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreffunccoalesce.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreffunccoalesce.dita (original)
+++ db/derby/docs/trunk/src/ref/rreffunccoalesce.dita Thu Oct 3 17:14:57 2013
@@ -34,7 +34,7 @@ returns the first argument that is not n
<ph conref="../conrefs.dita#prod/productshortname"></ph> but is not
recognized by the SQL standard.</note></section>
<refsyn><title>Syntax</title>
-<codeblock><b>COALESCE ( <varname>expression</varname>, <varname>expression</varname> [, <varname>expression</varname>]* )</b></codeblock>
+<codeblock><b>COALESCE ( <varname>expression</varname>, <varname>expression</varname> [ , <varname>expression</varname> ]* )</b></codeblock>
<p>The function must have at least two arguments.</p>
</refsyn>
<example><title>Example</title>
Modified: db/derby/docs/trunk/src/ref/rreffunccot.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreffunccot.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreffunccot.dita (original)
+++ db/derby/docs/trunk/src/ref/rreffunccot.dita Thu Oct 3 17:14:57 2013
@@ -20,13 +20,13 @@ limitations under the License.
-->
<reference id="rreffunccot" xml:lang="en-us">
<title>COT function</title>
-<shortdesc>The COT function returns the cotangens of a specified number.</shortdesc>
+<shortdesc>The COT function returns the cotangent of a specified number.</shortdesc>
<prolog><metadata>
<keywords><indexterm>COT function</indexterm><indexterm>functions<indexterm>COT</indexterm></indexterm>
</keywords>
</metadata></prolog>
<refbody>
-<section> <p> The specified number is the angle, in radians, that you want the cotangens for. The specified number must be a <xref href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision">DOUBLE PRECISION</xref> number.
+<section> <p> The specified number is the angle, in radians, that you want the cotangent for. The specified number must be a <xref href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision">DOUBLE PRECISION</xref> number.
<ul>
<li>If the specified number is NULL, the result of this function is NULL. </li>
</ul></p> </section>
Modified: db/derby/docs/trunk/src/ref/rreffuncpi.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreffuncpi.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreffuncpi.dita (original)
+++ db/derby/docs/trunk/src/ref/rreffuncpi.dita Thu Oct 3 17:14:57 2013
@@ -31,6 +31,6 @@ to <term>pi</term>.</shortdesc>
of a circle to the diameter of a circle.</p><p>The data type of the returned
value is a <xref href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision">DOUBLE
PRECISION</xref> number. </p> </section>
-<refsyn><title>Syntax</title><codeblock><b>PI ( )</b></codeblock> </refsyn>
+<refsyn><title>Syntax</title><codeblock><b>PI ( )</b></codeblock> </refsyn>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/ref/rreffuncrand.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreffuncrand.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreffuncrand.dita (original)
+++ db/derby/docs/trunk/src/ref/rreffuncrand.dita Thu Oct 3 17:14:57 2013
@@ -29,7 +29,7 @@ limitations under the License.
<section> <p>The RAND function returns a <xref href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision">DOUBLE PRECISION</xref> number with positive sign, greater than or equal to zero (0), and less than one (1.0), given an <xref href="rrefsqlj10696.dita#rrefsqlj10696">INTEGER</xref> seed number. </p>
</section>
<refsyn><title>Syntax</title>
-<codeblock><b>RAND( <varname>seed</varname> )</b></codeblock>
+<codeblock><b>RAND ( <varname>seed</varname> )</b></codeblock>
</refsyn>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/ref/rreffuncrandom.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreffuncrandom.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreffuncrandom.dita (original)
+++ db/derby/docs/trunk/src/ref/rreffuncrandom.dita Thu Oct 3 17:14:57 2013
@@ -29,7 +29,7 @@ limitations under the License.
<section> <p>The RANDOM function returns a <xref href="rrefsqljdoubleprecision.dita#rrefsqljdoubleprecision">DOUBLE PRECISION</xref> number with positive sign, greater than or equal to zero (0), and less than one (1.0).</p>
</section>
<refsyn><title>Syntax</title>
-<codeblock><b>RANDOM()</b></codeblock>
+<codeblock><b>RANDOM ( )</b></codeblock>
</refsyn>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/ref/rreffuncrownumber.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreffuncrownumber.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreffuncrownumber.dita (original)
+++ db/derby/docs/trunk/src/ref/rreffuncrownumber.dita Thu Oct 3 17:14:57 2013
@@ -34,33 +34,30 @@ first clause</xref> can be a more effici
<p>The data type of the returned value is BIGINT.</p>
</section>
<refsyn><title>Syntax</title>
-<codeblock><b>ROW_NUMBER() OVER [ <i>WindowSpecification</i> | <i>WindowName</i> ]</b></codeblock>
-<p>Currently, the only valid <i>WindowSpecification</i> is an empty pair of
+<codeblock><b>ROW_NUMBER ( ) OVER [ <i>windowSpecification</i> | <i>windowName</i> ]</b></codeblock>
+<p>Currently, the only valid <i>windowSpecification</i> is an empty pair of
parentheses (<codeph>()</codeph>), which indicates that the function is
evaluated over the entire result set.</p>
<p>If you choose to use a
<xref href="rrefsqljwindow.dita#rrefsqljwindow">WINDOW clause</xref> in a
-<i><xref href="rrefselectexpression.dita#rrefselectexpression">SelectExpression</xref></i>
-to specify a window, you must specify a <i>WindowName</i> to refer to it.</p>
+<i><xref href="rrefselectexpression.dita#rrefselectexpression">selectExpression</xref></i>
+to specify a window, you must specify a <i>windowName</i> to refer to it.</p>
</refsyn>
-<example><title>Examples</title><p>To limit the number of rows returned from a query to the 10 first rows of table <codeph>T</codeph>, use the following query:</p>
-<codeblock>
-SELECT * FROM (
+<example><title>Examples</title><p>To limit the number of rows returned from a
+query to the first 10 rows of table <codeph>T</codeph>, use the following query:</p>
+<codeblock><b>SELECT * FROM (
SELECT
ROW_NUMBER() OVER () AS R,
T.*
FROM T
) AS TR
- WHERE R <= 10;
-</codeblock>
+ WHERE R <= 10;</b></codeblock>
<p>To display the result of a query using a window name in a WINDOW clause:
</p>
-<codeblock>
-SELECT ROW_NUMBER() OVER R,
+<codeblock><b>SELECT ROW_NUMBER() OVER R,
B,
SUM(A)
-FROM T5 GROUP BY B WINDOW R AS ()
-</codeblock>
+FROM T5 GROUP BY B WINDOW R AS ()</b></codeblock>
</example>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/ref/rreffuncxmlexists.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreffuncxmlexists.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreffuncxmlexists.dita (original)
+++ db/derby/docs/trunk/src/ref/rreffuncxmlexists.dita Thu Oct 3 17:14:57 2013
@@ -29,14 +29,15 @@ values in SQL.</shortdesc>
<refbody>
<section> <p>The XMLEXISTS operator has two arguments, an XML query expression
and a <ph conref="../conrefs.dita#prod/productshortname"></ph> XML value.</p> </section>
-<refsyn><title>Syntax</title><codeblock><b>XMLEXISTS ( <varname>xquery-string-literal</varname>
- PASSING BY REF <varname>xml-value-expression</varname> [ BY REF ] )
+<refsyn><title>Syntax</title>
+<codeblock><b>XMLEXISTS ( <varname>xqueryStringLiteral</varname>
+ PASSING BY REF <varname>xmlValueExpression</varname> [ BY REF ] )
</b></codeblock><dl><dlentry>
-<dt><codeph>xquery-string-literal</codeph></dt>
+<dt><varname>xqueryStringLiteral</varname></dt>
<dd>Must be specified as a string literal. If this argument is specified as
a parameter, an expression that is not a literal, or a literal that is not
a string (for example an integer), <ph conref="../conrefs.dita#prod/productshortname"></ph> throws
-an error. The <codeph>xquery-string-literal</codeph> argument must also be
+an error. The <varname>xqueryStringLiteral</varname> argument must also be
an XPath expression that is supported by Apache Xalan. <ph conref="../conrefs.dita#prod/productshortname"></ph> uses
Apache Xalan to evaluate all XML query expressions. Because Xalan does not
support full XQuery, neither does <ph conref="../conrefs.dita#prod/productshortname"></ph>.
@@ -46,9 +47,9 @@ For more on XPath and XQuery expressions
href="http://www.w3.org/TR/xpath">http://www.w3.org/TR/xpath</xref> and <xref
format="html" href="http://www.w3.org/TR/xquery/">http://www.w3.org/TR/xquery/</xref>.</dd>
</dlentry><dlentry>
-<dt><codeph>xml-value-expression</codeph></dt>
+<dt><varname>xmlValueExpression</varname></dt>
<dd>Must be an XML data value and must constitute a well-formed SQL/XML document.
-The <codeph>xml-value-expression</codeph> argument cannot be a parameter.
+The <varname>xmlValueExpression</varname> argument cannot be a parameter.
<ph conref="../conrefs.dita#prod/productshortname"></ph> does not perform
implicit parsing nor casting of XML values, so use of strings or any other
data type results in an error. If the argument is a sequence that is returned
@@ -66,19 +67,19 @@ mechanisms, see the SQL/XML specificatio
</dlentry></dl></refsyn>
<section><title>Operator results and combining with other operators</title><p>The
result of the XMLEXISTS operator is a SQL boolean value that is based on the
-results from evaluating the <codeph>xquery-string-literal</codeph> against
-the <codeph>xml-value-expression</codeph>. The XMLEXISTS operator returns:<dl>
+results from evaluating the <varname>xqueryStringLiteral</varname> against
+the <varname>xmlValueExpression</varname>. The XMLEXISTS operator returns:<dl>
<dlentry>
<dt>UNKNOWN</dt>
-<dd>When the <codeph>xml-value-expression</codeph> is null.</dd>
+<dd>When the <varname>xmlValueExpression</varname> is null.</dd>
</dlentry><dlentry>
<dt>TRUE</dt>
<dd>When the evaluation of the specified query expression against the specified
-xml-value returns a non-empty sequence of nodes or values.</dd>
+<varname>xmlValueExpression</varname> returns a non-empty sequence of nodes or values.</dd>
</dlentry><dlentry>
<dt>FALSE</dt>
<dd>When evaluation of the specified query expression against the specified
-xml-value returns an empty sequence.</dd>
+<varname>xmlValueExpression</varname> returns an empty sequence.</dd>
</dlentry></dl></p><p>The XMLEXISTS operator does not return the actual results
from the evaluation of the query. You must use the XMLQUERY operator to retrieve
the actual results.</p><p>Since the result of the XMLEXISTS operator is an
@@ -88,17 +89,20 @@ check constraint in a table declaration
<section><title>Examples</title><p>In the <codeph>x_table</codeph> table,
to determine if the <codeph>xcol</codeph> XML column for each row has an element
called <codeph>student</codeph> with an <codeph>age</codeph> attribute equal
-to 20, use this statement:<codeblock>SELECT id, XMLEXISTS('<varname>//student[@age=20]</varname>' PASSING BY REF <varname>xcol</varname>)
- FROM <varname>x_table</varname></codeblock></p><p>In the <codeph>x_table</codeph> table,
+to 20, use this statement:
+<codeblock><b>SELECT id, XMLEXISTS('//student[@age=20]' PASSING BY REF xcol)
+ FROM x_table</b></codeblock></p><p>In the <codeph>x_table</codeph> table,
to return the ID for every row whose <codeph>xcol</codeph> XML column is non-null
-and contains the element <codeph>/roster/student</codeph>, use this statement:<codeblock>SELECT id FROM <varname>x_table</varname> WHERE XMLEXISTS('<varname
->/roster/student</varname>' PASSING BY REF <varname>xcol</varname>)</codeblock></p><p>You
+and contains the element <codeph>/roster/student</codeph>, use this statement:
+<codeblock><b>SELECT id FROM x_table WHERE XMLEXISTS('/roster/student' PASSING BY REF xcol)</b></codeblock></p><p>You
can create the <codeph>x_table</codeph> table with a check constraint that
limits which XML values can be inserted into the <codeph>xcol</codeph> XML
column. In this example, the constraint is that the column has at least one <codeph>student</codeph> element
with an <codeph>age</codeph> attribute with a value that is less than 25.
-To create the table, use this statement:<codeblock>CREATE TABLE <varname>x_table</varname> ( id INT, <varname>xcol</varname> XML CHECK (XMLEXISTS ('<varname
->//student[@age < 25]</varname>' PASSING BY REF <varname>xcol</varname>)) )</codeblock></p></section>
+To create the table, use this statement:
+<codeblock><b>CREATE TABLE x_table ( id INT, xcol XML
+ CHECK (XMLEXISTS ('//student[@age < 25]' PASSING BY REF xcol)) )</b></codeblock></p>
+</section>
<section><title>Usage note</title><p><ph conref="../conrefs.dita#prod/productshortname"></ph> requires
that a JAXP parser (such as Apache Xerces) and Apache Xalan are listed
in the Java classpath for the XML functions to work. If either the JAXP parser
Modified: db/derby/docs/trunk/src/ref/rreffuncxmlparse.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreffuncxmlparse.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreffuncxmlparse.dita (original)
+++ db/derby/docs/trunk/src/ref/rreffuncxmlparse.dita Thu Oct 3 17:14:57 2013
@@ -34,21 +34,23 @@ columns. Whether temporary or permanent
input to the other <ph conref="../conrefs.dita#prod/productshortname"></ph> XML
operators, such as <xref href="rreffuncxmlexists.dita#rreffuncxmlexists">XMLEXISTS</xref> and <xref
href="rreffuncxmlquery.dita#rreffuncxmlquery">XMLQUERY</xref>.</p> </section>
-<refsyn><title>Syntax</title><codeblock><b>XMLPARSE (DOCUMENT <varname>string-value-expression</varname> PRESERVE WHITESPACE)</b></codeblock><dl>
+<refsyn><title>Syntax</title>
+<codeblock><b>XMLPARSE ( DOCUMENT <varname>stringValueExpression</varname> PRESERVE WHITESPACE )</b></codeblock><dl>
<dlentry>
<dt>DOCUMENT </dt>
-<dd> <p>Required keyword that describes the type of XML input that <ph conref="../conrefs.dita#prod/productshortname"></ph> can
+<dd>Required keyword that describes the type of XML input that <ph conref="../conrefs.dita#prod/productshortname"></ph> can
parse. <ph conref="../conrefs.dita#prod/productshortname"></ph> can only
parse string expressions that constitute well-formed XML documents. This
is because <ph conref="../conrefs.dita#prod/productshortname"></ph> uses a
-JAXP parser to parse all string values. The JAXP parser expects the string-value-expression
+JAXP parser to parse all string values. The JAXP parser expects the
+<varname>stringValueExpression</varname>
to constitute a well-formed XML document. If the string does not constitute
a well-formed document, JAXP throws an error. <ph conref="../conrefs.dita#prod/productshortname"></ph> catches
-the error and throws the error as a SQLException.</p></dd>
+the error and throws the error as a SQLException.</dd>
</dlentry><dlentry>
-<dt><codeph>string-value-expression</codeph></dt>
+<dt><varname>stringValueExpression</varname></dt>
<dd>Any expression that evaluates to a SQL character type, such as CHAR, VARCHAR,
-LONG VARCHAR, or CLOB. The <codeph>string-value-expression</codeph> argument
+LONG VARCHAR, or CLOB. The <varname>stringValueExpression</varname> argument
can also be a parameter. You must use the CAST function when you specify the
parameter to indicate the type of value that is bound into the parameter. <ph
conref="../conrefs.dita#prod/productshortname"></ph> must verify that the
@@ -63,29 +65,30 @@ whitespace between consecutive XML nodes
are used, <ph conref="../conrefs.dita#prod/productshortname"></ph> preserves
whitespace as dictated by the SQL/XML rules for preserving whitespace.</dd>
</dlentry></dl><p>For more information on what constitutes a well-formed XML
-document, see the following specification: <xref format="html" href="http://www.w3.org/TR/REC-xml/#sec-well-formed">http://www.w3.org/TR/REC-xml/#sec-well-formed </xref
->.</p><p><note type="restriction">The SQL/XML standard dictates that the argument
+document, see the following specification:
+<xref format="html" href="http://www.w3.org/TR/REC-xml/#sec-well-formed">http://www.w3.org/TR/REC-xml/#sec-well-formed</xref>.</p>
+<p><note type="restriction">The SQL/XML standard dictates that the argument
to the XMLPARSE operator can also be a binary string. However, <ph conref="../conrefs.dita#prod/productshortname"></ph> only
supports character string input for the XMLPARSE operator.</note></p></refsyn>
<section><title>Examples</title><p>To insert a simple XML document into the <codeph>xcol</codeph> XML
-column in the <codeph>x_table</codeph> table, use the following statement: <codeblock>INSERT INTO <varname>x_table</varname> VALUES
- (<varname>1</varname>,
- XMLPARSE(DOCUMENT '
+column in the <codeph>x_table</codeph> table, use the following statement:
+<codeblock><b>INSERT INTO x_table VALUES (1, XMLPARSE(DOCUMENT '
<roster>
<student age="18">AB</student>
<student age="23">BC</student>
<student>NOAGE</student>
</roster>'
PRESERVE WHITESPACE)
- )
-</codeblock></p><p>To insert a large XML document into the <codeph>xcol</codeph> XML
+ )</b></codeblock></p>
+<p>To insert a large XML document into the <codeph>xcol</codeph> XML
column in the <codeph>x_table</codeph> table, from JDBC use the following
-statement: <codeblock>INSERT INTO <varname>x_table</varname> VALUES
- (<varname>2</varname>,
- XMLPARSE (DOCUMENT CAST (? AS CLOB) PRESERVE WHITESPACE)
- )
-</codeblock>You should bind into the statement using the setCharacterStream()
-method, or any other JDBC setXXX method that works for the CAST target type.</p></section>
+statement:
+<codeblock><b>INSERT INTO x_table VALUES(2, XMLPARSE (DOCUMENT
+ CAST (? AS CLOB)
+ PRESERVE WHITESPACE)
+ )</b></codeblock>
+You should bind into the statement using the <i>setCharacterStream()</i>
+method, or any other JDBC <i>setXXX</i> method that works for the CAST target type.</p></section>
<section><title>Usage note</title><p><ph conref="../conrefs.dita#prod/productshortname"></ph> requires
that a JAXP parser (such as Apache Xerces) and Apache Xalan are listed
in the Java classpath for the XML functions to work. If either the JAXP parser
Modified: db/derby/docs/trunk/src/ref/rreffuncxmlquery.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreffuncxmlquery.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreffuncxmlquery.dita (original)
+++ db/derby/docs/trunk/src/ref/rreffuncxmlquery.dita Thu Oct 3 17:14:57 2013
@@ -29,16 +29,18 @@ in SQL.</shortdesc>
<refbody>
<section> <p>The XMLQUERY operator has two arguments, an XML query expression
and a <ph conref="../conrefs.dita#prod/productshortname"></ph> XML value.</p></section>
-<refsyn><title>Syntax</title><codeblock><b>XMLQUERY ( <varname>xquery-string-literal</varname>
- PASSING BY REF <varname>xml-value-expression</varname>
+<refsyn><title>Syntax</title>
+<codeblock><b>XMLQUERY ( <varname>xqueryStringLiteral</varname>
+ PASSING BY REF <varname>xmlValueExpression</varname>
[ RETURNING SEQUENCE [ BY REF ] ]
EMPTY ON EMPTY
)</b></codeblock><dl><dlentry>
-<dt><codeph>xquery-string-literal</codeph></dt>
+<dt><varname>xqueryStringLiteral</varname></dt>
<dd>Must be specified as a string literal. If this argument is specified as
a parameter, an expression that is not a literal, or a literal that is not
-a string (for example an integer),<ph conref="../conrefs.dita#prod/productshortname"></ph> throws
-an error. The <codeph>xquery-string-literal</codeph> argument must also be
+a string (for example an integer),
+<ph conref="../conrefs.dita#prod/productshortname"></ph> throws
+an error. The <varname>xqueryStringLiteral</varname> argument must also be
an XPath expression that is supported by Apache Xalan. <ph conref="../conrefs.dita#prod/productshortname"></ph> uses
Apache Xalan to evaluate all XML query expressions. Because Xalan does not
support full XQuery, neither does <ph conref="../conrefs.dita#prod/productshortname"></ph>.
@@ -48,9 +50,9 @@ For more on XPath and XQuery expressions
href="http://www.w3.org/TR/xpath">http://www.w3.org/TR/xpath</xref> and <xref
format="html" href="http://www.w3.org/TR/xquery/">http://www.w3.org/TR/xquery/</xref>.</dd>
</dlentry><dlentry>
-<dt><codeph>xml-value-expression</codeph></dt>
+<dt><varname>xmlValueExpression</varname></dt>
<dd>Must be an XML data value and must constitute a well-formed SQL/XML document.
-The <codeph>xml-value-expression</codeph> argument cannot be a parameter.
+The <varname>xmlValueExpression</varname> argument cannot be a parameter.
<ph conref="../conrefs.dita#prod/productshortname"></ph> does not perform
implicit parsing nor casting of XML values, so use of strings or any other
data type results in an error. If the argument is a sequence that is returned
@@ -91,23 +93,24 @@ node. The result can be viewed only in s
the <xref href="rreffuncxmlserialize.dita#rreffuncxmlserialize"></xref>. </p></refsyn>
<section><title>Examples</title><p>In the <codeph>x_table</codeph> table,
to search the XML column <codeph>xcol</codeph> and return the students that
-have an age attribute that is greater than 20, use the following statement:<codeblock>SELECT ID,
+have an age attribute that is greater than 20, use the following statement:
+<codeblock><b>SELECT ID,
XMLSERIALIZE(
- XMLQUERY('<va...@age>20]</varname>' PASSING BY REF <varname>xcol</varname> EMPTY ON EMPTY)
+ XMLQUERY('//student[@age>20]' PASSING BY REF xcol EMPTY ON EMPTY)
AS VARCHAR(50))
-FROM <varname>x_table</varname>
-
-</codeblock>The result set for this query contains a row for every row in <codeph>x_table</codeph>,
+FROM x_table</b></codeblock>
+The result set for this query contains a row for every row in <codeph>x_table</codeph>,
regardless of whether or not the XMLQUERY operator actually returns results.</p><p>In
the <codeph>x_table</codeph> table, to search the XML column <codeph>xcol</codeph> and
-return the ages for any students named BC, use the following statement:<codeblock>SELECT ID,
+return the ages for any students named BC, use the following statement:
+<codeblock><b>SELECT ID,
XMLSERIALIZE(
- XMLQUERY('<varname>string(//student[text() = "BC"]/@age</varname>)' PASSING BY REF <varname>xcol</varname> EMPTY ON EMPTY)
+ XMLQUERY('string(//student[text() = "BC"]/@age)' PASSING BY REF xcol EMPTY ON EMPTY)
AS VARCHAR(50))
-FROM <varname>x_table</varname>
+FROM x_table
WHERE
- XMLEXISTS('<varname>//student[text() = "BC"]</varname>' PASSING BY REF <varname>xcol</varname>)
-</codeblock> The result set for this query contains a row for only the rows
+ XMLEXISTS('//student[text() = "BC"]' PASSING BY REF xcol)</b></codeblock>
+The result set for this query contains a row for only the rows
in <codeph>x_table</codeph> that have a student whose name is BC.</p></section>
<section><title>Usage note</title><p><ph conref="../conrefs.dita#prod/productshortname"></ph> requires
that a JAXP parser (such as Apache Xerces) and Apache Xalan are listed
Modified: db/derby/docs/trunk/src/ref/rreffuncxmlserialize.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreffuncxmlserialize.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreffuncxmlserialize.dita (original)
+++ db/derby/docs/trunk/src/ref/rreffuncxmlserialize.dita Thu Oct 3 17:14:57 2013
@@ -33,13 +33,13 @@ serialization rules. These rules, combin
only a subset of the XMLSERIALIZE syntax, dictate that the results of an XMLSERIALIZE
operation are not guaranteed to be in-tact copies of the original XML text.
For example, assume that <codeph>[xString]</codeph> is a textual representation
-of a well-formed XML document. You issue the following statements:<codeblock>INSERT INTO <varname>x_table</varname> (<varname>id</varname>, <varname
->xcol</varname>)
- VALUES (3, XMLPARSE(DOCUMENT '<varname>[xString]</varname>' PRESERVE WHITESPACE));
+of a well-formed XML document. You issue the following statements:
+<codeblock><b>INSERT INTO x_table (id, xcol)
+ VALUES (3, XMLPARSE(DOCUMENT '[xString]' PRESERVE WHITESPACE));
-SELECT id, XMLSERIALIZE(<varname>xcol</varname> AS VARCHAR(100))
- FROM <varname>x_table</varname> WHERE id = 3;
-</codeblock><p>There is no guarantee that the result of the XMLSERIALIZE operator
+SELECT id, XMLSERIALIZE(xcol AS VARCHAR(100))
+ FROM x_table WHERE id = 3;</b></codeblock>
+<p>There is no guarantee that the result of the XMLSERIALIZE operator
will be identical to the original <codeph>[xString]</codeph> representation.
Certain transformations can occur as part of XMLSERIALIZE processing, and
those transformations are defined in the SQL/XML specification. In some cases
@@ -47,36 +47,39 @@ the result of XMLSERIALIZE might actuall
representation, but that is not guaranteed. </p><p>When an XMLSERIALIZE operator
is specified as part of the top-level result set for a query, the result can
be accessed from JDBC by using whatever JDBC getXXX methods are allowed on
-the <codeph>string-data-type</codeph> argument that is included in the XMLSERIALIZE
+the <varname>stringDataType</varname> argument that is included in the XMLSERIALIZE
syntax. If you attempt to select the contents of an XML value from a top-level
result set without using the XMLSERIALIZE operator, <ph conref="../conrefs.dita#prod/productshortname"></ph> throws
an error. <ph conref="../conrefs.dita#prod/productshortname"></ph> does not
implicitly serialize XML values.</p></note></section>
-<refsyn><title>Syntax</title><codeblock><b>XMLSERIALIZE ( <varname>xml-value-expression</varname> AS <varname>string-data-type</varname> )</b></codeblock
-><dl><dlentry>
-<dt><codeph>xml-value-expression</codeph></dt>
-<dd>Can be any Derby XML value, including an XML result sequence generated
-by the XMLQUERY operator. The <codeph>xml-value-expression</codeph> argument
+<refsyn><title>Syntax</title>
+<codeblock><b>XMLSERIALIZE ( <varname>xmlValueExpression</varname> AS <varname>stringDataType</varname> )</b></codeblock>
+<dl><dlentry>
+<dt><varname>xmlValueExpression</varname></dt>
+<dd>Can be any <ph conref="../conrefs.dita#prod/productshortname"></ph> XML value, including an XML result sequence generated
+by the XMLQUERY operator. The <varname>xmlValueExpression</varname> argument
cannot be a parameter. <p></p></dd>
</dlentry><dlentry>
-<dt><codeph>string-data-type</codeph></dt>
+<dt><varname>stringDataType</varname></dt>
<dd>Must be a SQL character string type, such as CHAR, VARCHAR, LONG VARCHAR,
or CLOB. If you specify a type that is not a valid character string type, <ph
conref="../conrefs.dita#prod/productshortname"></ph> throws an error.</dd>
</dlentry></dl></refsyn>
<section><title>Examples</title><p>In the <codeph>x_table</codeph> table,
to display the contents of the <codeph>xcol</codeph> XML column, use this
-statement:<codeblock>SELECT ID,
+statement:
+<codeblock><b>SELECT ID,
+ XMLSERIALIZE(xcol AS CLOB)
+FROM x_table</b></codeblock>
+To retrieve the results from JDBC, you can use the JDBC
+<i>getCharacterStream()</i> or <i>getString()</i> method.</p><p>To
+display the results of an XMLQUERY operation, use the following statement:
+<codeblock><b>SELECT ID,
XMLSERIALIZE(
- <varname>xcol</varname> AS CLOB)
-FROM <varname>x_table</varname></codeblock>To retrieve the results from JDBC,
-you can use the JDBC getCharacterStream() or getString() method.</p><p>To
-display the results of an XMLQUERY operation, use the following statement:<codeblock>SELECT ID,
- XMLSERIALIZE(
- XMLQUERY('<va...@age>20]</varname>'
- PASSING BY REF <varname>xcol</varname> EMPTY ON EMPTY)
+ XMLQUERY('//student[@age>20]'
+ PASSING BY REF xcol EMPTY ON EMPTY)
AS VARCHAR(50))
-FROM <varname>x_table</varname></codeblock></p></section>
+FROM x_table</b></codeblock></p></section>
<section><title>Usage note</title><p><ph conref="../conrefs.dita#prod/productshortname"></ph> requires
that a JAXP parser (such as Apache Xerces) and Apache Xalan are listed
in the Java classpath for the XML functions to work. If either the JAXP parser
Modified: db/derby/docs/trunk/src/ref/rrefidentityvallocal.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefidentityvallocal.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefidentityvallocal.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefidentityvallocal.dita Thu Oct 3 17:14:57 2013
@@ -23,7 +23,7 @@ limitations under the License.
<section><p><ph conref="../conrefs.dita#prod/productshortname"></ph> supports
the IDENTITY_VAL_LOCAL function. </p></section>
<refsyn><title>Syntax:</title>
-<codeblock> IDENTITY_VAL_LOCAL ( )</codeblock>
+<codeblock><b>IDENTITY_VAL_LOCAL ( )</b></codeblock>
<p>The IDENTITY_VAL_LOCAL function is a non-deterministic function
that returns the most recently assigned value of an identity column for a
connection, where the assignment occurred as a result of a single row INSERT
@@ -44,11 +44,11 @@ a VALUES clause has not been issued for
<li>A multiple row INSERT statement with a VALUES clause</li>
<li>An INSERT statement with a fullselect</li>
</ul></p>If a table with an identity column has an INSERT trigger defined
-that inserts into another table with another identity column, then the IDENTITY_VAL_LOCAL()
+that inserts into another table with another identity column, then the IDENTITY_VAL_LOCAL
function will return the generated value for the statement table, and not
for the table modified by the trigger.</refsyn>
<example><title>Examples</title>
-<codeblock>ij> create table t1(c1 int generated always as identity, c2 int);
+<codeblock><b>ij> create table t1(c1 int generated always as identity, c2 int);
0 rows inserted/updated/deleted
ij> insert into t1(c2) values (8);
1 row inserted/updated/deleted
@@ -110,6 +110,6 @@ C1 |C2
6 |2
7 |3
8 |4
-8 rows selected </codeblock></example>
+8 rows selected</b></codeblock></example>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/ref/rrefjdbc1020262.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc1020262.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc1020262.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc1020262.dita Thu Oct 3 17:14:57 2013
@@ -32,7 +32,7 @@ vendor, scans for any escape syntax and
particular database understands. This makes escape syntax DBMS-independent.</p></section>
<section><p>A JDBC escape clause begins and ends with curly braces. A keyword
always follows the opening curly brace:</p></section>
-<example> <codeblock><b>{<b><i>keyword</i></b> }</b></codeblock></example>
+<example> <codeblock><b>{ <b><i>keyword</i></b> }</b></codeblock></example>
<section><p><ph conref="../conrefs.dita#prod/productshortname"></ph> supports
the following JDBC escape keywords, which are case-insensitive: <ul>
<li><i><xref href="rrefjdbc70824.dita#rrefjdbc70824"></xref></i> <p>The escape keyword
Modified: db/derby/docs/trunk/src/ref/rrefjdbc12124.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc12124.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc12124.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc12124.dita Thu Oct 3 17:14:57 2013
@@ -29,8 +29,9 @@ formats</indexterm></keywords>
the JDBC escape syntax for time as equivalent to the correct SQL syntax for
times. <ph conref="../conrefs.dita#prod/productshortname"></ph> also supports
the ISO format of 8 characters (6 digits, and 2 decimal points).</p></section>
-<refsyn><title>Syntax</title><codeblock><b>{t 'hh:mm:ss'}</b></codeblock> </refsyn>
-<section><title>Equivalent to</title><codeblock><b>TIME('hh:mm:ss')</b></codeblock> </section>
+<refsyn><title>Syntax</title>
+<codeblock><b>{ t '<i>hh</i>:<i>mm</i>:<i>ss</i>' }</b></codeblock> </refsyn>
+<section><title>Equivalent to</title><codeblock><b>TIME('<i>hh</i>:<i>mm</i>:<i>ss</i>')</b></codeblock> </section>
<example> <title>Example</title><codeblock><b>VALUES {t '20:00:03'}</b></codeblock> </example>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/ref/rrefjdbc28456.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc28456.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc28456.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc28456.dita Thu Oct 3 17:14:57 2013
@@ -25,20 +25,24 @@ limitations under the License.
character for LIKE clauses</indexterm></keywords>
</metadata></prolog>
<refbody>
-<section> <p>The percent sign <i>%</i> and underscore <i>_</i> are metacharacters
+<section> <p>The percent sign (<codeph>%</codeph>) and underscore
+(<codeph>_</codeph>) are metacharacters
within SQL LIKE clauses. JDBC provides syntax to force these characters to
be interpreted literally. The JDBC clause immediately following a LIKE expression
allows you to specify an escape character:</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>WHERE <i>CharacterExpression</i> [ NOT ] LIKE
-<i> CharacterExpressionWithWildCard</i>
+<refsyn><title>Syntax</title>
+<codeblock><b>WHERE <i>characterExpression</i> [ NOT ] LIKE
+ <i>characterExpressionWithWildCard</i>
{ ESCAPE '<i>escapeCharacter</i>' }</b></codeblock> </refsyn>
<example><title>Examples</title>
<codeblock><b><ph>-- find all rows in which a begins with the character "%"</ph>
SELECT a FROM tabA WHERE a LIKE '$%%' {escape '$'}
<ph>-- find all rows in which a ends with the character "_"</ph>
-SELECT a FROM tabA WHERE a LIKE '%=_' {escape '='}</b></codeblock> <note>?
+SELECT a FROM tabA WHERE a LIKE '%=_' {escape '='}</b></codeblock>
+<note><codeph>?</codeph>
is not permitted as an escape character if the LIKE pattern is also a dynamic
-parameter (?).</note> <p>In some languages, a single character consists of
+parameter (<codeph>?</codeph>).</note>
+<p>In some languages, a single character consists of
more than one collation unit (a 16-bit character). The <i>escapeCharacter</i> used
in the escape clause must be a single collation unit in order to work properly.</p> <p>You
can also use the escape character sequence for LIKE without using JDBC's curly
Modified: db/derby/docs/trunk/src/ref/rrefjdbc37244.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc37244.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc37244.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc37244.dita Thu Oct 3 17:14:57 2013
@@ -30,10 +30,12 @@ for</indexterm></indexterm></keywords>
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">JOIN operations</xref></i> [<i><xref
+<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>
+<section><title>Equivalent to</title>
+<codeblock><b><i><xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operations</xref></i> [ <i><xref
+href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operations</xref></i> ]*</b></codeblock> </section>
<example><title>Examples</title>
<codeblock><b><ph>-- outer join</ph>
SELECT *
Modified: db/derby/docs/trunk/src/ref/rrefjdbc41784.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc41784.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc41784.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc41784.dita Thu Oct 3 17:14:57 2013
@@ -31,9 +31,11 @@ the JDBC escape syntax for timestamp as
for timestamps. <ph conref="../conrefs.dita#prod/productshortname"></ph> also
supports the ISO format of 23 characters (17 digits, 3 dashes, and 3 decimal
points).</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>{ts 'yyyy-mm-dd hh:mm:ss.f...'}</b></codeblock> </refsyn>
-<section><title>Equivalent to</title> <codeblock><b>TIMESTAMP('yyyy-mm-dd hh:mm:ss.f...')</b></codeblock> <p>The
-fractional portion of timestamp constants (.f...) can be omitted.</p> </section>
+<refsyn><title>Syntax</title>
+<codeblock><b>{ ts '<i>yyyy</i>-<i>mm</i>-<i>dd</i> <i>hh</i>:<i>mm</i>:<i>ss</i>.<i>f</i>...' }</b></codeblock> </refsyn>
+<section><title>Equivalent to</title> <codeblock><b>TIMESTAMP('<i>yyyy</i>-<i>mm</i>-<i>dd</i> <i>hh</i>:<i>mm</i>:<i>ss</i>.<i>f</i>...')</b></codeblock> <p>The
+fractional portion of timestamp constants (<codeph>.<i>f</i>...</codeph>) can be
+omitted.</p> </section>
<example><title>Example</title>
<codeblock id="i1020504"><b>VALUES {ts '1999-01-09 20:11:11.123455'}</b></codeblock> </example>
</refbody>
Modified: db/derby/docs/trunk/src/ref/rrefjdbc70824.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc70824.dita?rev=1528945&r1=1528944&r2=1528945&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc70824.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc70824.dita Thu Oct 3 17:14:57 2013
@@ -27,10 +27,11 @@ limitations under the License.
<refbody>
<section> <p>This syntax is supported for a <i>java.sql.Statement</i> and
a <i>java.sql.PreparedStatement </i>in addition to a <i>CallableStatement</i>.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>{<i>call</i> statement }</b></codeblock> </refsyn>
+<refsyn><title>Syntax</title>
+<codeblock><b>{ call <i>statement</i> }</b></codeblock> </refsyn>
<example><title>Example</title>
-<codeblock>-- Call a Java procedure
-<b>{ call TOURS.BOOK_TOUR(?, ?) }</b></codeblock> </example>
+<codeblock><b>-- Call a Java procedure
+{ call TOURS.BOOK_TOUR(?, ?) }</b></codeblock> </example>
</refbody>
</reference>