db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1536351 - in /db/derby/docs/trunk/src/ref: refderby.ditamap rrefsqlj14854.dita rrefsqlj16095.dita rrefsqlj19433.dita rrefsqlj23075.dita rrefsqlj33602.dita rrefsqlj42154.dita rrefsqlj91438.dita
Date Mon, 28 Oct 2013 13:46:18 GMT
Author: chaase3
Date: Mon Oct 28 13:46:18 2013
New Revision: 1536351

URL: http://svn.apache.org/r1536351
Log:
DERBY-6394  Fix problems with searchCondition and Boolean expression documentation in Reference
Manual

Modified 6 Reference Manual topics and the map file, and deleted one topic.

Patch: DERBY-6394.diff

Removed:
    db/derby/docs/trunk/src/ref/rrefsqlj91438.dita
Modified:
    db/derby/docs/trunk/src/ref/refderby.ditamap
    db/derby/docs/trunk/src/ref/rrefsqlj14854.dita
    db/derby/docs/trunk/src/ref/rrefsqlj16095.dita
    db/derby/docs/trunk/src/ref/rrefsqlj19433.dita
    db/derby/docs/trunk/src/ref/rrefsqlj23075.dita
    db/derby/docs/trunk/src/ref/rrefsqlj33602.dita
    db/derby/docs/trunk/src/ref/rrefsqlj42154.dita

Modified: db/derby/docs/trunk/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/refderby.ditamap?rev=1536351&r1=1536350&r2=1536351&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ref/refderby.ditamap Mon Oct 28 13:46:18 2013
@@ -693,7 +693,6 @@ limitations under the License.
 <topicref href="rrefsqlj16095.dita" navtitle="columnLevelConstraint"></topicref>
 <topicref href="rrefsqlj42154.dita" navtitle="tableLevelConstraint"></topicref>
 <topicref href="rrefsqlj16357.dita" navtitle="REFERENCES clause"></topicref>
-<topicref href="rrefsqlj91438.dita" navtitle="searchCondition"></topicref>
 </topicref>
 <topicref href="rrefsqljexternalname.dita" navtitle="EXTERNAL NAME clause"></topicref>
 <topicref href="rrefsqlj31783.dita" navtitle="FOR UPDATE clause"></topicref>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj14854.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj14854.dita?rev=1536351&r1=1536350&r2=1536351&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj14854.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj14854.dita Mon Oct 28 13:46:18 2013
@@ -32,11 +32,12 @@ to any column that does not have a GROUP
 to constants, aggregates, and special registers.</p></section>
 <refsyn><title>Syntax</title>
 <codeblock><b>HAVING <i><xref
-href="rrefsqlj91438.dita#rrefsqlj91438">searchCondition</xref></i></b></codeblock>
-<p>The <i>searchCondition</i>, which is a specialized <i>booleanExpression</i>,
can contain only grouping columns (see <xref href="rrefsqlj32654.dita#rrefsqlj32654"/>),
columns that are part of aggregate expressions,
-and columns that are part of a subquery. For example, the following query
-is illegal, because the column SALARY is not a grouping column, it does not
-appear within an aggregate, and it is not within a subquery:
+href="rrefsqlj23075.dita#rrefsqlj23075">booleanExpression</xref></i></b></codeblock>
+<p>The <i>booleanExpression</i> can contain only grouping columns (see
+<xref href="rrefsqlj32654.dita#rrefsqlj32654"/>), columns that are part of
+aggregate expressions, and columns that are part of a subquery. For example, the
+following query is illegal, because the column SALARY is not a grouping column,
+it does not appear within an aggregate, and it is not within a subquery:
 <codeblock><b>-- SELECT COUNT(*)
 -- FROM SAMP.STAFF
 -- GROUP BY ID

Modified: db/derby/docs/trunk/src/ref/rrefsqlj16095.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj16095.dita?rev=1536351&r1=1536350&r2=1536351&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj16095.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj16095.dita Mon Oct 28 13:46:18 2013
@@ -24,11 +24,20 @@ limitations under the License.
 <example> <codeblock><b>[ CONSTRAINT <i><xref href="rrefconstraintname.dita#rrefconstraintname">constraintName</xref></i>
]
 {
     NOT NULL |
-    CHECK ( <i><xref href="rrefsqlj91438.dita#rrefsqlj91438">searchCondition</xref></i>
) |
+    CHECK ( <i>searchCondition</i> ) |
     PRIMARY KEY |
     UNIQUE |
     <i><xref href="rrefsqlj16357.dita#rrefsqlj16357">REFERENCES clause</xref></i>
 }</b></codeblock></example>
+<section><p>A <i>searchCondition</i> is any
+<xref href="rrefsqlj23075.dita#rrefsqlj23075">boolean expression</xref> that
+meets the requirements specified in
+<xref href="rrefsqlj13590.dita#rrefsqlj13590/sqlj57077"></xref>.</p>
+<p>If a <i><xref
+href="rrefconstraintname.dita#rrefconstraintname">constraintName</xref></i>
is
+not specified, <ph conref="../conrefs.dita#prod/productshortname"></ph>
+generates a unique constraint name.</p>
+</section>
 </refbody>
 </reference>
 

Modified: db/derby/docs/trunk/src/ref/rrefsqlj19433.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj19433.dita?rev=1536351&r1=1536350&r2=1536351&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj19433.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj19433.dita Mon Oct 28 13:46:18 2013
@@ -151,10 +151,9 @@ based on a boolean test. Conditional exp
 </table></section>
 <section><title>Boolean expressions</title>
 <p>Boolean expressions are expressions that result in boolean values. Most
-general expressions can result in boolean values. Boolean expressions commonly
-used in a WHERE clause are made of operands operated on by SQL operators (see
-<xref href="rrefsqlj23075.dita#rrefsqlj23075/sqlj34517"></xref> for a table
-of SQL operators).</p></section>
+general expressions can result in boolean values. See
+<xref href="rrefsqlj23075.dita#rrefsqlj23075"></xref> for more information and
a
+table of operators.</p></section>
 <section><title>Numeric expressions</title>
 <p>Numeric expressions are expressions that result in numeric values. Most of
 the general expressions can result in numeric values. Numeric values have one

Modified: db/derby/docs/trunk/src/ref/rrefsqlj23075.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj23075.dita?rev=1536351&r1=1536350&r2=1536351&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj23075.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj23075.dita Mon Oct 28 13:46:18 2013
@@ -32,17 +32,30 @@ boolean operator</indexterm><indexterm>L
 boolean operator</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<section><p>Boolean expressions are allowed in WHERE clauses and in check
-constraints. Boolean expressions in check constraints have limitations not
-noted here; see <xref href="rrefsqlj13590.dita#rrefsqlj13590"></xref> for
-more information. Boolean expressions in a WHERE clause have a highly liberal
-syntax; see <xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE clause</xref>,
-for example.</p></section>
+<section><p>Boolean expressions are expressions that result in boolean values.
+Most of the expressions listed in the table 
+<xref href="rrefsqlj19433.dita#rrefsqlj19433/sqlj18370"/> can result in boolean
+values.</p>
+<p>Boolean expressions are allowed in the following clauses and operations:
+<ul>
+<li><xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE clause</xref></li>
+<li>Check constraints (boolean expressions in check constraints have
+limitations; see <xref href="rrefsqlj13590.dita#rrefsqlj13590"></xref> for
+details)</li>
+<li><xref href="rrefcase.dita#rrefcase">CASE expression</xref></li>
+<li><xref href="rrefsqlj14854.dita#rrefsqlj14854">HAVING clause</xref>
(with
+restrictions)</li>
+<li>ON clauses of <xref href="rrefsqlj35034.dita#rrefsqlj35034">INNER
+JOIN</xref>, <xref href="rrefsqlj18922.dita#rrefsqlj18922">LEFT OUTER
+JOIN</xref>, and <xref href="rrefsqlj57522.dita#rrefsqlj57522">RIGHT OUTER
+JOIN</xref> operations</li>
+</ul>
+</p></section>
 <section><p>A boolean expression can include a boolean operator or operators.
 These operators are listed in the following table.</p>
 <table frame="all" id="sqlj34517">
-<title>SQL Boolean operators</title>
-<desc>This table lists, describes, and provides the syntax for the SQL Boolean operators.</desc>
+<title>SQL boolean operators</title>
+<desc>This table lists, describes, and provides the syntax for the SQL boolean operators.</desc>
 <tgroup cols="3" colsep="1" rowsep="1">
 <colspec colname="1" colnum="1" colwidth="25*"/>
 <colspec colname="2" colnum="2" colwidth="45*"/>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj33602.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj33602.dita?rev=1536351&r1=1536350&r2=1536351&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj33602.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj33602.dita Mon Oct 28 13:46:18 2013
@@ -30,13 +30,16 @@ The WHERE clause lets you select rows ba
 rows for which the expression evaluates to TRUE are returned in the result,
 or, in the case of a DELETE statement, deleted, or, in the case of an UPDATE
 statement, updated.</p></section>
-<refsyn><title>Syntax</title> <codeblock><b>WHERE <i><xref
href="rrefsqlj23075.dita#rrefsqlj23075">booleanExpression</xref></i></b></codeblock>
<p><indexterm>WHERE
+<refsyn><title>Syntax</title> <codeblock><b>WHERE <i><xref
+href="rrefsqlj23075.dita#rrefsqlj23075">booleanExpression</xref></i></b></codeblock>
<p><indexterm>WHERE
 clause<indexterm>SQL extensions to</indexterm></indexterm>Boolean expressions
-are allowed in the WHERE clause. Most of the general expressions listed in <xref
-href="rrefsqlj19433.dita#rrefsqlj19433/sqlj18370"></xref>, can result in a
-boolean value. </p> <p>In addition, there are the more common boolean expressions.
-Specific boolean operators listed in Table 10, take one or more operands;
-the expressions return a boolean value.</p> </refsyn>
+are allowed in the WHERE clause. Most of the general expressions listed in
+<xref href="rrefsqlj19433.dita#rrefsqlj19433/sqlj18370"></xref> can result in
a
+boolean value. </p>
+<p>In addition, there are the more common boolean expressions.
+Specific boolean operators, listed in <xref
+href="rrefsqlj23075.dita#rrefsqlj23075/sqlj34517"></xref>, take one or more
+operands; the expressions return a boolean value.</p> </refsyn>
 <example><title>Example</title>
 <codeblock><b><ph>-- find the flights where no business-class seats have
 -- been booked</ph>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj42154.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj42154.dita?rev=1536351&r1=1536350&r2=1536351&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj42154.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj42154.dita Mon Oct 28 13:46:18 2013
@@ -23,7 +23,7 @@ limitations under the License.
 <refbody>
 <example> <codeblock><b>[ CONSTRAINT <i><xref href="rrefconstraintname.dita#rrefconstraintname">constraintName</xref></i>
]
 {
-    CHECK ( <i><xref href="rrefsqlj91438.dita#rrefsqlj91438">searchCondition</xref></i>
) |
+    CHECK ( <i>searchCondition</i> ) |
     {
         PRIMARY KEY ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i>
[ , <i><xref
 href="rrefsimplecolumnname.dita#rrefsimplecolumnname">simpleColumnName</xref></i>
]* ) |
@@ -34,6 +34,15 @@ href="rrefsimplecolumnname.dita#rrefsimp
 <i>            <xref href="rrefsqlj16357.dita#rrefsqlj16357">REFERENCES clause</xref></i>
     }
 }</b></codeblock></example>
+<section><p>A <i>searchCondition</i> is any
+<xref href="rrefsqlj23075.dita#rrefsqlj23075">boolean expression</xref> that
+meets the requirements specified in
+<xref href="rrefsqlj13590.dita#rrefsqlj13590/sqlj57077"></xref>.</p>
+<p>If a <i><xref
+href="rrefconstraintname.dita#rrefconstraintname">constraintName</xref></i>
is
+not specified, <ph conref="../conrefs.dita#prod/productshortname"></ph>
+generates a unique constraint name.</p>
+</section>
 </refbody>
 </reference>
 



Mime
View raw message