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 2014/06/27 19:07:07 UTC
svn commit: r1606149 - in /db/derby/docs/trunk/src: devguide/ ref/
Author: chaase3
Date: Fri Jun 27 17:07:06 2014
New Revision: 1606149
URL: http://svn.apache.org/r1606149
Log:
DERBY-6609 Documentation for SQL features should reflect current standard
Modified 45 Reference Manual topics and the map file, as well as 4 Developer's Guide topics.
Patch: DERBY-6609-4.diff
Modified:
db/derby/docs/trunk/src/devguide/cdevconcepts41275.dita
db/derby/docs/trunk/src/devguide/cdevdeploy23812.dita
db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita
db/derby/docs/trunk/src/devguide/cdevtricks807337.dita
db/derby/docs/trunk/src/ref/crefmpref23947.dita
db/derby/docs/trunk/src/ref/crefsqlj1003454.dita
db/derby/docs/trunk/src/ref/crefsqlj1004091.dita
db/derby/docs/trunk/src/ref/crefsqlj18919.dita
db/derby/docs/trunk/src/ref/crefsqlj21305.dita
db/derby/docs/trunk/src/ref/crefsqlj23296.dita
db/derby/docs/trunk/src/ref/crefsqlj34834.dita
db/derby/docs/trunk/src/ref/crefstorejardb.dita
db/derby/docs/trunk/src/ref/refderby.ditamap
db/derby/docs/trunk/src/ref/rrefaggregatename.dita
db/derby/docs/trunk/src/ref/rrefcolumnname.dita
db/derby/docs/trunk/src/ref/rrefconstraintname.dita
db/derby/docs/trunk/src/ref/rrefcorrelationname.dita
db/derby/docs/trunk/src/ref/rrefcreatefunctionstatement.dita
db/derby/docs/trunk/src/ref/rrefcursorname.dita
db/derby/docs/trunk/src/ref/rrefexcept16677.dita
db/derby/docs/trunk/src/ref/rreffunctionname.dita
db/derby/docs/trunk/src/ref/rrefindexname.dita
db/derby/docs/trunk/src/ref/rrefjdbc16643.dita
db/derby/docs/trunk/src/ref/rrefkeywords29722.dita
db/derby/docs/trunk/src/ref/rrefnewtablename.dita
db/derby/docs/trunk/src/ref/rrefprocedurename.dita
db/derby/docs/trunk/src/ref/rrefproper25025.dita
db/derby/docs/trunk/src/ref/rrefproper27355.dita
db/derby/docs/trunk/src/ref/rrefproper39325.dita
db/derby/docs/trunk/src/ref/rrefrauthid.dita
db/derby/docs/trunk/src/ref/rrefrolename.dita
db/derby/docs/trunk/src/ref/rrefschemaname.dita
db/derby/docs/trunk/src/ref/rrefsequencename.dita
db/derby/docs/trunk/src/ref/rrefsimplecolumnname.dita
db/derby/docs/trunk/src/ref/rrefsqlj13590.dita
db/derby/docs/trunk/src/ref/rrefsqlj28468.dita
db/derby/docs/trunk/src/ref/rrefsqlj29026.dita
db/derby/docs/trunk/src/ref/rrefsqlj32693.dita
db/derby/docs/trunk/src/ref/rrefsqlj33562.dita
db/derby/docs/trunk/src/ref/rrefsqlj33923.dita
db/derby/docs/trunk/src/ref/rrefsqlj57924.dita
db/derby/docs/trunk/src/ref/rrefsqljcreateaggregate.dita
db/derby/docs/trunk/src/ref/rrefsqljcreatesequence.dita
db/derby/docs/trunk/src/ref/rrefsqljcreatetype.dita
db/derby/docs/trunk/src/ref/rrefsqljwindow.dita
db/derby/docs/trunk/src/ref/rrefsynonymname.dita
db/derby/docs/trunk/src/ref/rreftablename.dita
db/derby/docs/trunk/src/ref/rreftriggername.dita
db/derby/docs/trunk/src/ref/rreftypename.dita
db/derby/docs/trunk/src/ref/rrefviewname.dita
Modified: db/derby/docs/trunk/src/devguide/cdevconcepts41275.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevconcepts41275.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevconcepts41275.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevconcepts41275.dita Fri Jun 27 17:07:06 2014
@@ -34,8 +34,8 @@ In <ph conref="../conrefs.dita#prod/prod
SELECT statement generates a cursor which can be controlled by a
<codeph><i>java.sql.ResultSet</i></codeph> object.
<ph conref="../conrefs.dita#prod/productshortname"></ph> does not
-support SQL-92's DECLARE CURSOR language construct to create cursors,
-however <ph conref="../conrefs.dita#prod/productshortname"></ph>
+support SQL's DECLARE CURSOR language construct to create cursors.
+However, <ph conref="../conrefs.dita#prod/productshortname"></ph>
supports positioned deletes and positioned updates of updatable
cursors.
</p>
Modified: db/derby/docs/trunk/src/devguide/cdevdeploy23812.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdeploy23812.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdeploy23812.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdeploy23812.dita Fri Jun 27 17:07:06 2014
@@ -23,7 +23,7 @@ limitations under the License.
<shortdesc>Use a set of procedures to install, replace, and remove jar files
in a database. When you install a jar file in a database, you give it a <ph
conref="../conrefs.dita#prod/productshortname"></ph> jar name, which is an
-<codeph>SQL92Identifier</codeph>.</shortdesc>
+<i>SQLIdentifier</i>.</shortdesc>
<prolog><metadata>
<keywords><indexterm>jar files<indexterm>installing, removing, and replacing</indexterm></indexterm>
</keywords>
Modified: db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevdvlp14839.dita Fri Jun 27 17:07:06 2014
@@ -38,7 +38,7 @@ how to program with the JDBC API.</p>
<p>This section covers the details of application programming that are specific
to <ph conref="../conrefs.dita#prod/productshortname"></ph> applications.
For example, all JDBC applications typically start their DBMS's JDBC driver
-and use a connection URL to connect to a database. This chapter gives you
+and use a connection URL to connect to a database. This section gives you
the details of how to start <ph conref="../conrefs.dita#prod/productshortname"></ph>'s
JDBC driver and how to work with <ph conref="../conrefs.dita#prod/productshortname"></ph>'s
connection URL to accomplish various tasks. It also covers essential <ph conref="../conrefs.dita#prod/productshortname"></ph> concepts
@@ -50,13 +50,16 @@ will need to learn SQL. <i>SQL</i> is th
relational databases and is not tied to a particular programming language.
No matter how a particular RDBMS has been implemented, the user can design
databases and insert, modify, and retrieve data using the standard SQL statements
-and well-defined data types. SQL-92 is the version of SQL standardized by
-ANSI and ISO in 1992; <ph conref="../conrefs.dita#prod/productshortname"></ph> supports
-entry-level SQL-92 as well as some higher-level features. Entry-level SQL-92
-is a subset of full SQL-92 specified by ANSI and ISO that is supported by
-nearly all major DBMSs today. This chapter does not teach you SQL. You will
-find reference information about the particulars of <ph conref="../conrefs.dita#prod/productshortname"></ph>'s
-implementation of SQL in the <cite><ph conref="../conrefs.dita#pub/citref"></ph></cite>.</p>
+and well-defined data types.</p>
+<p>SQL is standardized by ANSI and ISO;
+<ph conref="../conrefs.dita#prod/productshortname"></ph> supports entry-level
+SQL as well as some higher-level features. Entry-level SQL is a subset of the
+full SQL specified by ANSI and ISO that is supported by nearly all major DBMSs
+today.</p>
+<p>This section does not teach you SQL. You will find reference information
+about the particulars of
+<ph conref="../conrefs.dita#prod/productshortname"></ph>'s implementation of SQL
+in the <ph conref="../conrefs.dita#pub/citref"></ph>.</p>
<p><ph conref="../conrefs.dita#prod/productshortname"></ph> implements the JDBC
API so as to allow <ph conref="../conrefs.dita#prod/productshortname"></ph> to
serve as a resource manager in a Java EE compliant system.</p>
Modified: db/derby/docs/trunk/src/devguide/cdevtricks807337.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/devguide/cdevtricks807337.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/devguide/cdevtricks807337.dita (original)
+++ db/derby/docs/trunk/src/devguide/cdevtricks807337.dita Fri Jun 27 17:07:06 2014
@@ -21,7 +21,7 @@ limitations under the License.
<concept id="cdevtricks807337" xml:lang="en-us">
<title>Multiple rows</title>
<shortdesc><ph conref="../conrefs.dita#prod/productshortname"></ph> supports
-the complete SQL-92 VALUES clause; this is very handy in several cases.</shortdesc>
+the complete SQL VALUES clause; this is very handy in several cases.</shortdesc>
<prolog><metadata>
<keywords><indexterm>Multiple rows VALUES clause</indexterm></keywords>
</metadata></prolog>
Modified: db/derby/docs/trunk/src/ref/crefmpref23947.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefmpref23947.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefmpref23947.dita (original)
+++ db/derby/docs/trunk/src/ref/crefmpref23947.dita Fri Jun 27 17:07:06 2014
@@ -31,7 +31,7 @@ including manual pages for statements, f
<p>Information about argument matching in Java functions and
procedures.</p></li>
<li><i><xref href="rrefkeywords29722.dita"></xref></i>
-<p>SQL keywords beyond the standard SQL-92 keywords.</p></li>
+<p>SQL keywords beyond the standard keywords.</p></li>
<li><i><xref href="rrefsqlstandard.dita"/></i>
<p>Lists of SQL:2011 features that
<ph conref="../conrefs.dita#prod/productshortname"></ph> does and does not
Modified: db/derby/docs/trunk/src/ref/crefsqlj1003454.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefsqlj1003454.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefsqlj1003454.dita (original)
+++ db/derby/docs/trunk/src/ref/crefsqlj1003454.dita Fri Jun 27 17:07:06 2014
@@ -19,12 +19,12 @@ limitations under the License.
<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
"../dtd/concept.dtd">
<concept id="crefsqlj1003454" xml:lang="en-us">
-<title>Rules for SQL92 identifiers</title>
+<title>Rules for SQL identifiers</title>
<shortdesc>Ordinary identifiers are identifiers not surrounded by double
quotation marks. Delimited identifiers are identifiers surrounded by double
quotation marks.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>SQL92Identifiers<indexterm>rules for</indexterm></indexterm>
+<keywords><indexterm>SQLIdentifiers<indexterm>rules for</indexterm></indexterm>
</keywords>
</metadata></prolog>
<conbody>
Modified: db/derby/docs/trunk/src/ref/crefsqlj1004091.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefsqlj1004091.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefsqlj1004091.dita (original)
+++ db/derby/docs/trunk/src/ref/crefsqlj1004091.dita Fri Jun 27 17:07:06 2014
@@ -23,8 +23,7 @@ limitations under the License.
<conbody>
<p>Since some dictionary objects can be contained within other objects, you
can qualify those dictionary object names. Each component is separated from
-the next by a period. An <i>SQL92Identifier</i> is "dot-separated." You qualify
+the next by a period. An <i>SQLIdentifier</i> is "dot-separated." You qualify
a dictionary object name in order to avoid ambiguity.</p>
</conbody>
</concept>
-
Modified: db/derby/docs/trunk/src/ref/crefsqlj18919.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefsqlj18919.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefsqlj18919.dita (original)
+++ db/derby/docs/trunk/src/ref/crefsqlj18919.dita Fri Jun 27 17:07:06 2014
@@ -28,7 +28,7 @@ commands.</shortdesc>
<indexterm>SQL identifiers<indexterm>definition</indexterm></indexterm>
<indexterm>identifiers<indexterm>definition</indexterm></indexterm>
<indexterm>dictionary objects<indexterm>definition</indexterm></indexterm>
-<indexterm>SQL92Identifiers<indexterm>definition</indexterm></indexterm>
+<indexterm>SQLIdentifiers<indexterm>definition</indexterm></indexterm>
</keywords>
</metadata></prolog>
<conbody>
@@ -39,8 +39,8 @@ are called dictionary objects because <p
information about them in the system tables, sometimes known as a data dictionary.
SQL also defines ways to alias these objects within certain statements.</p>
<p>Each kind of identifier must conform to a different set of rules. Identifiers
-representing dictionary objects must conform to SQL-92 identifier rules and
-are thus called <i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref>s</i>.</p>
+representing dictionary objects must conform to SQL identifier rules and
+are thus called <i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i>s.</p>
</conbody>
</concept>
Modified: db/derby/docs/trunk/src/ref/crefsqlj21305.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefsqlj21305.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefsqlj21305.dita (original)
+++ db/derby/docs/trunk/src/ref/crefsqlj21305.dita Fri Jun 27 17:07:06 2014
@@ -26,7 +26,7 @@ determine the runtime type of an express
implementation of the compile-time type.</shortdesc>
<prolog><metadata>
<keywords><indexterm>NULL<indexterm>not a data type</indexterm></indexterm>
-<indexterm>SQL-92 data types<indexterm>supported by Derby</indexterm></indexterm>
+<indexterm>SQL data types<indexterm>supported by Derby</indexterm></indexterm>
</keywords>
</metadata></prolog>
<conbody>
Modified: db/derby/docs/trunk/src/ref/crefsqlj23296.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefsqlj23296.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefsqlj23296.dita (original)
+++ db/derby/docs/trunk/src/ref/crefsqlj23296.dita Fri Jun 27 17:07:06 2014
@@ -21,8 +21,8 @@ limitations under the License.
<concept id="crefsqlj23296" xml:lang="en-us">
<title>SQL language reference</title>
<conbody>
-<p><ph conref="../conrefs.dita#prod/productshortname"></ph> implements an
-SQL-92 core subset, as well as some SQL-99 features.</p>
+<p><ph conref="../conrefs.dita#prod/productshortname"></ph> implements a
+subset of the SQL standard.</p>
<p>This section provides an overview of the current SQL language by describing
the statements, built-in functions, data types, expressions, and special characters
it contains.</p>
Modified: db/derby/docs/trunk/src/ref/crefsqlj34834.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefsqlj34834.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefsqlj34834.dita (original)
+++ db/derby/docs/trunk/src/ref/crefsqlj34834.dita Fri Jun 27 17:07:06 2014
@@ -19,24 +19,25 @@ limitations under the License.
<!DOCTYPE concept PUBLIC "-//OASIS//DTD DITA Concept//EN"
"../dtd/concept.dtd">
<concept id="crefsqlj34834" xml:lang="en-us">
-<title>SQL92Identifier</title>
+<title>SQLIdentifier</title>
<conbody>
-<p>An <i>SQL92Identifier</i> is a dictionary object identifier that conforms
-to the rules of SQL-92. SQL-92 states that identifiers for dictionary objects
+<p>An <i>SQLIdentifier</i> is a dictionary object identifier that conforms
+to the rules of SQL. SQL states that identifiers for dictionary objects
are limited to 128 characters and are case-insensitive (unless delimited by
double quotes), because they are automatically translated into uppercase by
the system. You cannot use reserved words as identifiers for dictionary objects
unless they are delimited. If you attempt to use a name longer than 128 characters, <i>SQLException</i> X0X11
is raised.</p>
<p><ph conref="../conrefs.dita#prod/productshortname"></ph> defines keywords
-beyond those specified by the SQL-92 standard (see <xref href="rrefkeywords29722.dita#rrefkeywords29722"></xref>).</p>
+beyond those specified by the SQL standard (see
+<xref href="rrefkeywords29722.dita"/>).</p>
<section><title>Example</title> <codeblock><b><ph>-- the view name is stored in the
-- system catalogs as ANIDENTIFIER</ph>
CREATE VIEW AnIdentifier (RECEIVED) AS VALUES 1
<ph>-- the view name is stored in the system
-- catalogs with case intact</ph>
CREATE VIEW "ACaseSensitiveIdentifier" (RECEIVED) AS VALUES 1</b></codeblock></section>
-<section><p>This section describes the rules for using <i>SQL92Identifiers</i> to
+<section><p>This section describes the rules for using <i>SQLIdentifiers</i> to
represent the following dictionary objects.</p></section>
</conbody>
</concept>
Modified: db/derby/docs/trunk/src/ref/crefstorejardb.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/crefstorejardb.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/crefstorejardb.dita (original)
+++ db/derby/docs/trunk/src/ref/crefstorejardb.dita Fri Jun 27 17:07:06 2014
@@ -29,7 +29,7 @@ that allow you to store jar files in a d
<ph conref="../conrefs.dita#prod/productshortname"></ph> identifier you give it
when you load it into a particular schema). The
<ph conref="../conrefs.dita#prod/productshortname"></ph> name, an
-<i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i>, can
+<i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i>, can
be delimited and must be unique within a schema.</li>
</ul>
<p>A single schema can store more than one jar file.</p>
Modified: db/derby/docs/trunk/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/refderby.ditamap?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ref/refderby.ditamap Fri Jun 27 17:07:06 2014
@@ -583,9 +583,9 @@ limitations under the License.
<topicref href="rrefsqlj28468.dita" navtitle="Capitalization and special characters">
</topicref>
<topicref href="crefsqlj18919.dita" navtitle="SQL identifiers ">
-<topicref href="crefsqlj1003454.dita" navtitle="Rules for SQL92 identifiers">
+<topicref href="crefsqlj1003454.dita" navtitle="Rules for SQL identifiers">
</topicref>
-<topicref href="crefsqlj34834.dita" navtitle="SQL92Identifier">
+<topicref href="crefsqlj34834.dita" navtitle="SQLIdentifier">
<topicref href="crefsqlj1004091.dita" navtitle="Qualifying dictionary objects">
</topicref>
</topicref>
Modified: db/derby/docs/trunk/src/ref/rrefaggregatename.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefaggregatename.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefaggregatename.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefaggregatename.dita Fri Jun 27 17:07:06 2014
@@ -27,8 +27,8 @@ create a UDA, use the
<xref href="rrefsqljcreateaggregate.dita#rrefsqljcreateaggregate"></xref>.</p>
</section>
<section><title>Syntax</title>
-<codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock>
+<codeblock><b>[ <i><xref href="rrefschemaname.dita">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
<p>You can qualify an aggregate name with a <i>schemaName</i>. If a qualified
aggregate name is specified, the schema name cannot begin with SYS.</p>
</section>
Modified: db/derby/docs/trunk/src/ref/rrefcolumnname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcolumnname.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcolumnname.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefcolumnname.dita Fri Jun 27 17:07:06 2014
@@ -43,9 +43,9 @@ In this example, the <i>correlationName<
not permitted because <codeph>c11</codeph> is listed in the FOR UPDATE list
of columns. You can use the <i>correlationName</i> <codeph>FOR c12</codeph>
because it is not in the FOR UPDATE list.</p></section>
-<section><title>Syntax</title> <codeblock><b>[ { <i><xref href="rreftablename.dita#rreftablename">tableName</xref></i> | <i><xref
-href="rrefcorrelationname.dita#rrefcorrelationname">correlationName</xref></i> } . ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
+<section><title>Syntax</title> <codeblock><b>[ { <i><xref href="rreftablename.dita">tableName</xref></i> | <i><xref
+href="rrefcorrelationname.dita">correlationName</xref></i> } . ] <i><xref
+href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock></section>
<section><title>Example</title>
<codeblock><b><ph>-- C.Country is a columnName qualified with a correlationName.</ph>
SELECT C.Country
Modified: db/derby/docs/trunk/src/ref/rrefconstraintname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefconstraintname.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefconstraintname.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefconstraintname.dita Fri Jun 27 17:07:06 2014
@@ -25,8 +25,8 @@ limitations under the License.
<xref href="rrefsqlj13590.dita#rrefsqlj13590">CONSTRAINT clause</xref>).</p>
</section>
<section><title>Syntax</title>
-<codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock>
+<codeblock><b>[ <i><xref href="rrefschemaname.dita">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
<p>You can qualify a <i>constraintName</i> with a <i>schemaName</i>, but the
<i>schemaName</i> of the constraint must be the same as the <i>schemaName</i> of
the table on which the constraint is placed.</p>
Modified: db/derby/docs/trunk/src/ref/rrefcorrelationname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcorrelationname.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcorrelationname.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefcorrelationname.dita Fri Jun 27 17:07:06 2014
@@ -33,7 +33,8 @@ In this example, the <i>correlationName<
not permitted because <codeph>c11</codeph> is listed in the FOR UPDATE list
of columns. You can use the <i>correlationName</i> <codeph>FOR c12</codeph>
because it is not in the FOR UPDATE list.</p></section>
-<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
+<section><title>Syntax</title>
+<codeblock><b><i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock></section>
<section><title>Example</title> <codeblock><b><ph>-- C is a correlationName
</ph>SELECT C.NAME
FROM SAMP.STAFF C</b></codeblock></section>
Modified: db/derby/docs/trunk/src/ref/rrefcreatefunctionstatement.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcreatefunctionstatement.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcreatefunctionstatement.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefcreatefunctionstatement.dita Fri Jun 27 17:07:06 2014
@@ -90,7 +90,8 @@ length.
</section>
<example id="rrefcrfunctioncolelement"><title>columnElement</title>
-<codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i> <i>dataType</i></b></codeblock></example>
+<codeblock><b><i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i> <i>dataType</i></b></codeblock>
+</example>
<section><p>The syntax of <i>dataType</i> is described in
<xref href="crefsqlj31068.dita#crefsqlj31068"></xref>.</p><note>XML is not
allowed as the type of a column in the dataset returned by a table function.</note></section>
Modified: db/derby/docs/trunk/src/ref/rrefcursorname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcursorname.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcursorname.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefcursorname.dita Fri Jun 27 17:07:06 2014
@@ -28,7 +28,9 @@ information, see the <cite><ph conref=".
If you assign a name to a cursor, you can refer to that name from within SQL
statements.</p></section>
<section><p>You cannot qualify a <i>cursorName</i>.</p></section>
-<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
+<section><title>Syntax</title>
+<codeblock><b><i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
+</section>
<section><title>Example</title> <codeblock><b>stmt.executeUpdate("UPDATE SAMP.STAFF SET COMM = " +
"COMM + 20 " + "WHERE CURRENT OF " + ResultSet.getCursorName());</b></codeblock></section>
</refbody>
Modified: db/derby/docs/trunk/src/ref/rrefexcept16677.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefexcept16677.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefexcept16677.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefexcept16677.dita Fri Jun 27 17:07:06 2014
@@ -37,8 +37,9 @@ These unimplemented parts are for featur
<section><p><ph conref="../conrefs.dita#prod/productshortname"></ph> supplies
values for the message and <i>SQLState</i> fields. In addition, <ph conref="../conrefs.dita#prod/productshortname"></ph> sometimes
returns multiple <i>SQLExceptions</i> using the <i>nextException</i> chain.
-The first exception is always the most severe exception, with SQL-92 Standard
-exceptions preceding those that are specific to <ph conref="../conrefs.dita#prod/productshortname"></ph>.</p></section>
+The first exception is always the most severe exception, with SQL Standard
+exceptions preceding those that are specific to
+<ph conref="../conrefs.dita#prod/productshortname"></ph>.</p></section>
<section><p>For information on processing <i>SQLExceptions</i>, see the <cite><ph
conref="../conrefs.dita#pub/citdevelop"></ph></cite>.</p></section>
</refbody>
Modified: db/derby/docs/trunk/src/ref/rreffunctionname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreffunctionname.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreffunctionname.dita (original)
+++ db/derby/docs/trunk/src/ref/rreffunctionname.dita Fri Jun 27 17:07:06 2014
@@ -28,8 +28,8 @@ href="rrefcreatefunctionstatement.dita#r
</p>
</section>
<section><title>Syntax</title>
-<codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock>
+<codeblock><b>[ <i><xref href="rrefschemaname.dita">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
<p>You can qualify a function name with a <i>schemaName</i>. If a qualified
function name is specified, the schema name cannot begin with SYS.</p>
</section>
Modified: db/derby/docs/trunk/src/ref/rrefindexname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefindexname.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefindexname.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefindexname.dita Fri Jun 27 17:07:06 2014
@@ -25,8 +25,9 @@ limitations under the License.
the <xref
href="rrefsqlj20937.dita#rrefsqlj20937">CREATE INDEX statement</xref>.
</p></section>
-<section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> . ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock>
+<section><title>Syntax</title>
+<codeblock><b>[ <i><xref href="rrefschemaname.dita">schemaName</xref></i> . ] <i><xref
+href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
<p>You can qualify an index name with a <i>schemaName</i>. If a qualified
index name is specified, the schema name cannot begin with SYS.</p>
</section>
Modified: db/derby/docs/trunk/src/ref/rrefjdbc16643.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefjdbc16643.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefjdbc16643.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefjdbc16643.dita Fri Jun 27 17:07:06 2014
@@ -31,7 +31,7 @@ calls of <i>SQLException</i>.</shortdesc
<section><p>In addition,
<ph conref="../conrefs.dita#prod/productshortname"></ph> sometimes returns
multiple <i>SQLExceptions</i> using the <i>nextException</i> chain. The first
-exception is always the most severe exception, with SQL-92 Standard exceptions
+exception is always the most severe exception, with SQL Standard exceptions
preceding those that are specific to
<ph conref="../conrefs.dita#prod/productshortname"></ph>.</p>
<p>For information on processing <i>SQLExceptions</i>, see "Working with
Modified: db/derby/docs/trunk/src/ref/rrefkeywords29722.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefkeywords29722.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefkeywords29722.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefkeywords29722.dita Fri Jun 27 17:07:06 2014
@@ -22,7 +22,7 @@ limitations under the License.
<title>SQL reserved words</title>
<shortdesc>This section lists all the
<ph conref="../conrefs.dita#prod/productshortname"></ph> reserved words,
-including those in the SQL-92 standard.</shortdesc>
+including those in the SQL standard.</shortdesc>
<prolog><metadata>
<keywords><indexterm>reserved words</indexterm><indexterm>keywords</indexterm>
</keywords>
Modified: db/derby/docs/trunk/src/ref/rrefnewtablename.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefnewtablename.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefnewtablename.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefnewtablename.dita Fri Jun 27 17:07:06 2014
@@ -26,7 +26,9 @@ limitations under the License.
href="rrefsqljrenametablestatement.dita#rrefsqljrenametablestatement"></xref>).
You cannot qualify a <i>newTableName</i> with a <i>schemaName</i>.</p>
</section>
-<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
+<section><title>Syntax</title>
+<codeblock><b><i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
+</section>
<section><title>Example</title>
<codeblock><b><ph>-- FLIGHTAVAILABLE is a newTableName</ph>
RENAME TABLE FLIGHTAVAILABILITY TO FLIGHTAVAILABLE</b></codeblock></section>
Modified: db/derby/docs/trunk/src/ref/rrefprocedurename.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefprocedurename.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefprocedurename.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefprocedurename.dita Fri Jun 27 17:07:06 2014
@@ -28,8 +28,8 @@ href="rrefcreateprocedurestatement.dita#
</p>
</section>
<section><title>Syntax</title>
-<codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock>
+<codeblock><b>[ <i><xref href="rrefschemaname.dita">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
<p>You can qualify a procedure name with a <i>schemaName</i>. If a qualified
procedure name is specified, the schema name cannot begin with SYS.</p>
</section>
Modified: db/derby/docs/trunk/src/ref/rrefproper25025.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefproper25025.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefproper25025.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefproper25025.dita Fri Jun 27 17:07:06 2014
@@ -35,9 +35,9 @@ access to all the databases in the syste
<p>A malformed list of user names raises an exception. Do not specify a user
both with this property and in
<i><xref href="rrefproper39325.dita">derby.database.readOnlyAccessUsers</xref></i>.</p>
-<note>User names, called authorization identifiers,
-follow the rules of <i>SQL92Identifiers</i> and can be delimited.
-Specifying a user name that does not follow these rules raises an
+<note>User names, called authorization identifiers, follow the rules of
+<i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i>s and can be
+delimited. Specifying a user name that does not follow these rules raises an
exception.</note>
<p>For more information about user authorization, see "Configuring user
authorization" in the <ph conref="../conrefs.dita#pub/citsec"></ph>.</p>
Modified: db/derby/docs/trunk/src/ref/rrefproper27355.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefproper27355.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefproper27355.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefproper27355.dita Fri Jun 27 17:07:06 2014
@@ -42,7 +42,7 @@ LDAP search for that user's DN before au
DNs defined with this property,
<ph conref="../conrefs.dita#prod/productshortname"></ph> performs a search using
the default value of <i>derby.authentication.ldap.searchFilter</i>.</p>
-<p>User names are <i><xref href="crefsqlj34834.dita">SQL92Identifier</xref></i>s
+<p>User names are <i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i>s
and can be delimited.</p>
</section>
<refsyn><title>Syntax</title>
Modified: db/derby/docs/trunk/src/ref/rrefproper39325.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefproper39325.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefproper39325.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefproper39325.dita Fri Jun 27 17:07:06 2014
@@ -36,8 +36,9 @@ access to all the databases in the syste
both in this property and in
<i><xref href="rrefproper25025.dita">derby.database.fullAccessUsers</xref></i>.</p>
<note>User names, called authorization identifiers, follow the rules of
-<i>SQL92Identifiers</i> and can be delimited. Specifying a user name that does
-not follow these rules raises an exception.</note>
+<i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i>s and can be
+delimited. Specifying a user name that does not follow these rules raises an
+exception.</note>
</section>
<refsyn><title>Syntax</title>
<codeblock><b><b>-- database-level property</b>
Modified: db/derby/docs/trunk/src/ref/rrefrauthid.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefrauthid.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefrauthid.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefrauthid.dita Fri Jun 27 17:07:06 2014
@@ -30,7 +30,9 @@ are always case-insensitive within <ph c
authorization system unless they are delimited. For more information, see
"Users and authorization identifiers" in the
<ph conref="../conrefs.dita#pub/citsec"></ph>.</p></section>
-<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
+<section><title>Syntax</title>
+<codeblock><b><i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
+</section>
<section><title>Example</title> <codeblock><b>CALL SYSCS_UTIL.SYSCS_SET_DATABASE_PROPERTY(
'derby.database.fullAccessUsers', 'Amber,FRED')</b></codeblock></section>
</refbody>
Modified: db/derby/docs/trunk/src/ref/rrefrolename.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefrolename.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefrolename.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefrolename.dita Fri Jun 27 17:07:06 2014
@@ -25,16 +25,14 @@ limitations under the License.
identified by its role name.</p>
</section>
<refsyn><title>Syntax</title>
-<codeblock>
-<b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i>
-</b></codeblock>
+<codeblock><b><i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
</refsyn>
<section>
<p>In terms of SQL, a role name is also technically an
-<i><xref href="rrefrauthid.dita#rrefrauthid">authorizationIdentifier</xref></i>,
-but that term is often used for user names in
-<ph conref="../conrefs.dita#prod/productshortname"></ph> for historical reasons.
-</p>
+<i><xref href="rrefrauthid.dita">authorizationIdentifier</xref></i>, but that
+term is often used for user names in
+<ph conref="../conrefs.dita#prod/productshortname"></ph> for historical
+reasons.</p>
</section>
<example><title>Example</title>
<codeblock><b>DROP ROLE reader</b></codeblock>
Modified: db/derby/docs/trunk/src/ref/rrefschemaname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefschemaname.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefschemaname.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefschemaname.dita Fri Jun 27 17:07:06 2014
@@ -34,9 +34,7 @@ more information about system tables, se
<section><p>A schema is hierarchically the highest level of dictionary object,
so you cannot qualify a <i>schemaName</i>.</p></section>
<section><title>Syntax</title>
-<codeblock>
-<b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b>
-</codeblock>
+<codeblock><b><i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
</section>
<section><title>Example</title>
<codeblock><b>-- SAMP.EMPLOYEE is a tableName qualified by a schemaName
Modified: db/derby/docs/trunk/src/ref/rrefsequencename.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsequencename.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsequencename.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsequencename.dita Fri Jun 27 17:07:06 2014
@@ -27,8 +27,8 @@ generator, use the
<xref href="rrefsqljcreatesequence.dita#rrefsqljcreatesequence"></xref>.</p>
</section>
<section><title>Syntax</title>
-<codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock>
+<codeblock><b>[ <i><xref href="rrefschemaname.dita">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
<p>You can qualify a sequence name with a <i>schemaName</i>. If a qualified
sequence name is specified, the schema name cannot begin with SYS.</p>
</section>
Modified: db/derby/docs/trunk/src/ref/rrefsimplecolumnname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsimplecolumnname.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsimplecolumnname.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsimplecolumnname.dita Fri Jun 27 17:07:06 2014
@@ -25,7 +25,9 @@ limitations under the License.
it cannot be qualified by a <i>tableName</i> orb<i>correlationName</i>.
This is the case when the qualification is fixed, as it is in a column definition
within a CREATE TABLE statement.</p></section>
-<section><title>Syntax</title> <codeblock><b><i><xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock></section>
+<section><title>Syntax</title>
+<codeblock><b><i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
+</section>
<section><title>Example</title> <codeblock><b><ph>-- country is a simpleColumnName</ph>
CREATE TABLE CONTINENT (COUNTRY VARCHAR(26) NOT NULL PRIMARY KEY,
COUNTRY_ISO_CODE CHAR(2), REGION VARCHAR(26))</b></codeblock></section>
Modified: db/derby/docs/trunk/src/ref/rrefsqlj13590.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj13590.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj13590.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj13590.dita Fri Jun 27 17:07:06 2014
@@ -168,7 +168,7 @@ or primary key column. If the foreign ke
foreign key value is considered NULL if any of its columns contains a NULL.
<note>It is possible for a foreign key consisting of multiple columns to
allow one of the columns to contain a value for which there is no matching
-value in the referenced columns, per the SQL-92 standard. To avoid this situation,
+value in the referenced columns, per the SQL standard. To avoid this situation,
create NOT NULL constraints on all of the foreign key's columns.</note></p> </section>
<section><title>Foreign key constraints and DML</title> <p>When you insert
into or update a table with an enabled foreign key constraint, <ph conref="../conrefs.dita#prod/productshortname"></ph> checks
Modified: db/derby/docs/trunk/src/ref/rrefsqlj28468.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj28468.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj28468.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj28468.dita Fri Jun 27 17:07:06 2014
@@ -40,7 +40,7 @@ delimiters within SQL)</indexterm></keyw
</metadata></prolog>
<refbody>
<section><p>Within these strings, the following rules apply: <ul>
-<li>Double quotation marks delimit special identifiers referred to in SQL-92
+<li>Double quotation marks delimit special identifiers referred to in SQL
as <i>delimited identifiers</i>. </li>
<li>Single quotation marks delimit character strings.</li>
<li>Within a character string, to represent a single quotation mark or apostrophe,
@@ -59,8 +59,8 @@ n = stmt.executeUpdate(
"UPDATE aTable setStringcol = 'He said, \"hello!\"'");</b></codeblock></li>
<li>SQL keywords are case-insensitive. For example, you can type the keyword
SELECT as SELECT, Select, select, or sELECT.</li>
-<li>SQL-92-style identifiers are case-insensitive (see <i><xref href="crefsqlj34834.dita#crefsqlj34834"></xref></i>),
-unless they are delimited.</li>
+<li>SQL-style identifiers are case-insensitive (see
+<i><xref href="crefsqlj34834.dita"/></i>), unless they are delimited.</li>
<li>Java-style identifiers are always case-sensitive.</li>
<li>* is a wildcard within a <i><xref href="rrefselectexpression.dita#rrefselectexpression">selectExpression</xref>.</i> See <xref
href="rrefselectexpression.dita#rrefselectexpression/sqlj38441"></xref>. It
@@ -69,9 +69,9 @@ metasymbol that flags items you can repe
<li>% and _ are character wildcards when used within character strings following
a LIKE operator (except when escaped with an escape character). See <xref
href="rrefsqlj23075.dita#rrefsqlj23075"></xref>.</li>
-<li>Comments can be either single- or multiline as per the SQL-92 standard. Singleline
+<li>Comments can be either single-line or multiline as per the SQL standard. Single-line
comments start with two dashes (--) and end with the newline character. Multiline
-comments are bracketed and start with forward slash star (/*), and end with star
+comments are bracketed, start with forward slash star (/*), and end with star
forward slash (*/). Note that bracketed comments may be nested. Any text between
the starting and ending comment character sequence is ignored.</li>
</ul></p></section>
Modified: db/derby/docs/trunk/src/ref/rrefsqlj29026.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj29026.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj29026.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj29026.dita Fri Jun 27 17:07:06 2014
@@ -23,9 +23,9 @@ limitations under the License.
special operator executes some operation.</shortdesc>
<refbody>
<section><p>Built-in functions use keywords or special built-in operators.
-Built-ins are SQL92Identifiers and are case-insensitive. Note that escaped
-functions like TIMESTAMPADD and TIMESTAMPDIFF are only accessible using the
-JDBC escape function syntax, and can be found in
-<xref href="rrefjdbc1020262.dita#rrefjdbc1020262"></xref>.</p></section>
+Built-ins are <i><xref href="crefsqlj34834.dita">SQLIdentifier</xref>s</i> and
+are case-insensitive. Note that escaped functions like TIMESTAMPADD and
+TIMESTAMPDIFF are only accessible using the JDBC escape function syntax, and can
+be found in <xref href="rrefjdbc1020262.dita"/>.</p></section>
</refbody>
</reference>
Modified: db/derby/docs/trunk/src/ref/rrefsqlj32693.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj32693.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj32693.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj32693.dita Fri Jun 27 17:07:06 2014
@@ -40,8 +40,8 @@ col).</p> <p>Only one DISTINCT aggregate
allowed. For example, the following query is not valid: <codeblock><b>SELECT AVG (DISTINCT flying_time), SUM (DISTINCT miles)
FROM Flights</b></codeblock></p> <p>The expression can contain multiple column
references or expressions, but it cannot contain another aggregate or subquery.
-It must evaluate to an SQL-92 numeric data type. You can therefore call methods
-that evaluate to SQL-92 data types. If an expression evaluates to NULL, the
+It must evaluate to an SQL numeric data type. You can therefore call methods
+that evaluate to SQL data types. If an expression evaluates to NULL, the
aggregate skips that value.</p> <p>The resulting data type is the same as
the expression on which it operates (it will never overflow). The following
query, for example, returns the INTEGER <i>1</i>, which might not be what
Modified: db/derby/docs/trunk/src/ref/rrefsqlj33562.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj33562.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj33562.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj33562.dita Fri Jun 27 17:07:06 2014
@@ -23,7 +23,7 @@ limitations under the License.
<shortdesc>The CAST function converts a value from one data type to another
and provides a data type to a dynamic parameter (?) or a NULL value.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>CAST function</indexterm><indexterm>conversions<indexterm>SQL-92
+<keywords><indexterm>CAST function</indexterm><indexterm>conversions<indexterm>SQL
data types using CAST</indexterm></indexterm><indexterm>conversions<indexterm>CAST
function (explicit)</indexterm></indexterm></keywords>
</metadata></prolog>
@@ -33,7 +33,7 @@ function (explicit)</indexterm></indexte
AS <i>dataType</i> )</b></codeblock> <p>The data type to which you are
casting an expression is the <i>target type</i>. The data type of the expression
from which you are casting is the <i>source type</i>.</p> </refsyn>
-<section><title>CAST conversions among SQL-92 data types</title> <p>The following
+<section><title>CAST conversions among SQL data types</title> <p>The following
table shows valid explicit conversions between source types and target types
for SQL data types. This table shows which explicit conversions between data
types are valid. The first column on the table lists the source data types.
@@ -701,8 +701,10 @@ L</lines></entry>
</tgroup>
</table><p>If a conversion is valid, CASTs are allowed. Size incompatibilities
between the source and target types might cause runtime errors.</p> </section>
-<section><title>Notes</title> <p>In this discussion, the <ph conref="../conrefs.dita#prod/productshortname"></ph> SQL-92
-data types are categorized as follows: <ul>
+<section><title>Notes</title>
+<p>In this discussion, the
+<ph conref="../conrefs.dita#prod/productshortname"></ph> SQL data types are
+categorized as follows: <ul>
<li><i>logical</i>
<ul>
<li><xref href="rrefsqljBoolean.dita#rrefsqljBoolean">BOOLEAN</xref></li>
Modified: db/derby/docs/trunk/src/ref/rrefsqlj33923.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj33923.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj33923.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj33923.dita Fri Jun 27 17:07:06 2014
@@ -21,7 +21,7 @@ limitations under the License.
<reference id="rrefsqlj33923" xml:lang="en-us">
<title>Aggregates (set functions)</title>
<shortdesc>This section describes aggregates (also described as
-<i>set functions</i> in ANSI SQL-92 and as <i>column functions</i> in some
+<i>set functions</i> in ANSI SQL and as <i>column functions</i> in some
database literature).</shortdesc>
<prolog><metadata>
<keywords>
Modified: db/derby/docs/trunk/src/ref/rrefsqlj57924.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj57924.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj57924.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj57924.dita Fri Jun 27 17:07:06 2014
@@ -37,7 +37,7 @@ is smaller than the target CHAR FOR BIT
value.</p> <p>Comparisons of CHAR FOR BIT DATA and VARCHAR FOR BIT DATA values
are precise. For two bit strings to be equal, they must be <i>exactly</i> the
same length. (This differs from the way some other DBMSs handle BINARY values
-but works as specified in SQL-92.)</p> <p>An operation on a VARCHAR FOR BIT
+but works as specified in SQL.)</p> <p>An operation on a VARCHAR FOR BIT
DATA and a CHAR FOR BIT DATA value (e.g., a concatenation) yields a VARCHAR
FOR BIT DATA value.</p> </section>
<example><title>Example</title>
Modified: db/derby/docs/trunk/src/ref/rrefsqljcreateaggregate.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljcreateaggregate.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljcreateaggregate.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljcreateaggregate.dita Fri Jun 27 17:07:06 2014
@@ -36,10 +36,11 @@ href="rrefaggregatename.dita#rrefaggrega
[ RETURNS <i>returnDataType</i> ]
<xref href="rrefsqljexternalname.dita#rrefsqljexternalname">EXTERNAL NAME</xref> <i>singleQuotedString</i></b></codeblock>
<p>The aggregate name is composed of an optional <i><xref
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i>
-and a <i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided, the
-current schema is the default schema. If a qualified aggregate name is
-specified, the schema name cannot begin with SYS.</p>
+href="rrefschemaname.dita">schemaName</xref></i> and a
+<i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i>. If a
+<i>schemaName</i> is not provided, the current schema is the default schema. If
+a qualified aggregate name is specified, the schema name cannot begin with
+SYS.</p>
<p>In general, UDAs live in the same namespace as one-argument user-defined
functions (see
<xref href="rrefcreatefunctionstatement.dita#rrefcreatefunctionstatement"></xref>).
Modified: db/derby/docs/trunk/src/ref/rrefsqljcreatesequence.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljcreatesequence.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljcreatesequence.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljcreatesequence.dita Fri Jun 27 17:07:06 2014
@@ -44,10 +44,11 @@ privilege cannot be revoked from the sch
href="rrefsequencename.dita#rrefsequencename">sequenceName</xref></i> [ <i><xref
href="rrefsqljcreatesequence.dita#rrefsqljcreatesequence/rrefsqljcrseqsequenceelement">sequenceElement</xref></i> ]*</b></codeblock>
<p>The sequence name is composed of an optional <i><xref
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> and a
-<i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided, the current
-schema is the default schema. If a qualified sequence name is specified, the
-schema name cannot begin with SYS.</p></refsyn>
+href="rrefschemaname.dita">schemaName</xref></i> and a
+<i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i>. If a
+<i>schemaName</i> is not provided, the current schema is the default schema. If
+a qualified sequence name is specified, the schema name cannot begin with
+SYS.</p></refsyn>
<section id="rrefsqljcrseqsequenceelement"><title>sequenceElement</title>
<codeblock><b>{
AS <i>dataType</i>
Modified: db/derby/docs/trunk/src/ref/rrefsqljcreatetype.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljcreatetype.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljcreatetype.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljcreatetype.dita Fri Jun 27 17:07:06 2014
@@ -39,10 +39,10 @@ href="rreftypename.dita#rreftypename">ty
<xref href="rrefsqljexternalname.dita#rrefsqljexternalname">EXTERNAL NAME</xref> <i>singleQuotedString</i>
LANGUAGE JAVA</b></codeblock>
<p>The type name is composed of an optional <i><xref
-href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> and a
-<i>SQL92Identifier</i>. If a <i>schemaName</i> is not provided,
-the current schema is the default schema. If a qualified type name is specified,
-the schema name cannot begin with SYS.</p>
+href="rrefschemaname.dita">schemaName</xref></i> and a
+<i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i>. If a
+<i>schemaName</i> is not provided, the current schema is the default schema. If
+a qualified type name is specified, the schema name cannot begin with SYS.</p>
<p>If the Java class specified by the <xref
href="rrefsqljexternalname.dita#rrefsqljexternalname"></xref> does not implement
<i>java.io.Serializable</i>, or if it is not public and visible on the
Modified: db/derby/docs/trunk/src/ref/rrefsqljwindow.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqljwindow.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqljwindow.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqljwindow.dita Fri Jun 27 17:07:06 2014
@@ -33,7 +33,7 @@ use a ROW NUMBER function in a <i>select
<title>Syntax</title>
<codeblock><b>WINDOW <i>windowName</i> AS <i>windowSpecification</i></b></codeblock>
<p>In a WINDOW clause, <i>windowName</i> is a
-<xref href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref>.</p>
+<i><xref href="crefsqlj34834.dita">SQLIdentifier</xref></i>.</p>
<p>Currently, the only valid <i>windowSpecification</i> is a set of empty
parentheses (<codeph>()</codeph>), which indicates that the function is
evaluated over the entire result set.</p>
Modified: db/derby/docs/trunk/src/ref/rrefsynonymname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsynonymname.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsynonymname.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsynonymname.dita Fri Jun 27 17:07:06 2014
@@ -25,8 +25,8 @@ To create a synonym, use the
<xref href="rrefsqljcreatesynonym.dita#rrefsqljcreatesynonym"></xref>.</p>
</section>
<section><title>Syntax</title>
-<codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock>
+<codeblock><b>[ <i><xref href="rrefschemaname.dita">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
<p>You can qualify a synonym name with a <i>schemaName</i>. If a qualified
synonym name is specified, the schema name cannot begin with SYS.</p>
</section>
Modified: db/derby/docs/trunk/src/ref/rreftablename.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreftablename.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreftablename.dita (original)
+++ db/derby/docs/trunk/src/ref/rreftablename.dita Fri Jun 27 17:07:06 2014
@@ -24,8 +24,9 @@ limitations under the License.
<section><p>A <i>tableName</i> represents a table. To create a table, use the
<xref href="rrefsqlj24513.dita#rrefsqlj24513">CREATE TABLE statement</xref>.</p>
</section>
-<section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock>
+<section><title>Syntax</title>
+<codeblock><b>[ <i><xref href="rrefschemaname.dita">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
<p>You can qualify a table name with a <i>schemaName</i>. If a qualified
table name is specified, the schema name cannot begin with SYS.</p>
</section>
Modified: db/derby/docs/trunk/src/ref/rreftriggername.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreftriggername.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreftriggername.dita (original)
+++ db/derby/docs/trunk/src/ref/rreftriggername.dita Fri Jun 27 17:07:06 2014
@@ -25,8 +25,9 @@ limitations under the License.
To create a trigger, use the
<xref href="rrefsqlj43125.dita#rrefsqlj43125">CREATE TRIGGER statement</xref>.
</p></section>
-<section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref></i> . ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock>
+<section><title>Syntax</title>
+<codeblock><b>[ <i><xref href="rrefschemaname.dita">schemaName</xref></i> . ] <i><xref
+href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
<p>You can qualify a trigger name with a <i>schemaName</i>. If a qualified
trigger name is specified, the schema name cannot begin with SYS.</p>
</section>
Modified: db/derby/docs/trunk/src/ref/rreftypename.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreftypename.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreftypename.dita (original)
+++ db/derby/docs/trunk/src/ref/rreftypename.dita Fri Jun 27 17:07:06 2014
@@ -27,8 +27,8 @@ use the
<xref href="rrefsqljcreatetype.dita#rrefsqljcreatetype"></xref>.</p>
</section>
<section><title>Syntax</title>
-<codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock>
+<codeblock><b>[ <i><xref href="rrefschemaname.dita">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
<p>You can qualify a type name with a <i>schemaName</i>. If a qualified type
name is specified, the schema name cannot begin with SYS.</p>
</section>
Modified: db/derby/docs/trunk/src/ref/rrefviewname.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefviewname.dita?rev=1606149&r1=1606148&r2=1606149&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefviewname.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefviewname.dita Fri Jun 27 17:07:06 2014
@@ -25,8 +25,9 @@ limitations under the License.
use the <xref
href="rrefsqlj15446.dita#rrefsqlj15446">CREATE VIEW statement</xref>.</p>
</section>
-<section><title>Syntax</title> <codeblock><b>[ <i><xref href="rrefschemaname.dita#rrefschemaname">schemaName</xref>.</i> ] <i><xref
-href="crefsqlj34834.dita#crefsqlj34834">SQL92Identifier</xref></i></b></codeblock>
+<section><title>Syntax</title>
+<codeblock><b>[ <i><xref href="rrefschemaname.dita">schemaName</xref>.</i> ] <i><xref
+href="crefsqlj34834.dita">SQLIdentifier</xref></i></b></codeblock>
<p>You can qualify a view name with a <i>schemaName</i>. If a qualified
view name is specified, the schema name cannot begin with SYS.</p>
</section>