db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r1325247 - in /db/derby/docs/trunk/src/ref: refderby.ditamap rrefcase.dita rrefcasenullif.dita rrefsqlj19433.dita
Date Thu, 12 Apr 2012 13:31:02 GMT
Author: chaase3
Date: Thu Apr 12 13:31:02 2012
New Revision: 1325247

URL: http://svn.apache.org/viewvc?rev=1325247&view=rev
Log:
DERBY-5557  NULLIF topic in reference manual should explain NULLIF

Modified both NULLIF and CASE topics, moved CASE from functions to SQL 
expressions, added info to expression table.

Patch: DERBY-5557-2.diff

Modified:
    db/derby/docs/trunk/src/ref/refderby.ditamap
    db/derby/docs/trunk/src/ref/rrefcase.dita
    db/derby/docs/trunk/src/ref/rrefcasenullif.dita
    db/derby/docs/trunk/src/ref/rrefsqlj19433.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=1325247&r1=1325246&r2=1325247&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ref/refderby.ditamap Thu Apr 12 13:31:02 2012
@@ -33,6 +33,33 @@ limitations under the License.
 <reltable>
 <relrow>
 <relcell>
+<topicref href="rrefcase.dita" navtitle="CASE expression"></topicref>
+</relcell>
+<relcell>
+<topicref href="rrefcasenullif.dita" navtitle="NULLIF function"></topicref>
+<topicref href="rreffunccoalesce.dita" navtitle="COALESCE function"></topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="rrefcasenullif.dita" navtitle="NULLIF function"></topicref>
+</relcell>
+<relcell>
+<topicref href="rrefcase.dita" navtitle="CASE expression"></topicref>
+<topicref href="rreffunccoalesce.dita" navtitle="COALESCE function"></topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
+<topicref href="rreffunccoalesce.dita" navtitle="COALESCE function"></topicref>
+</relcell>
+<relcell>
+<topicref href="rrefcase.dita" navtitle="CASE expression"></topicref>
+<topicref href="rrefcasenullif.dita" navtitle="NULLIF function"></topicref>
+</relcell>
+</relrow>
+<relrow>
+<relcell>
 <topicref href="rrefsqljgrant.dita" navtitle="GRANT statement "></topicref>
 </relcell>
 <relcell>
@@ -244,6 +271,7 @@ limitations under the License.
 <topicref href="rrefsqlj11277.dita" navtitle="VALUES expression"></topicref>
 <topicref href="rrefsqlj1080779.dita" navtitle="Expression precedence"></topicref>
 <topicref href="rrefsqlj23075.dita" navtitle="Boolean expression"></topicref>
+<topicref href="rrefcase.dita" navtitle="CASE expression"></topicref>
 <topicref collection-type="family" href="crefsqlj29911.dita" navtitle="Dynamic parameters">
 <topicref href="rrefsqlj1082953.dita" navtitle="Dynamic parameters example ">
 </topicref>
@@ -278,7 +306,6 @@ limitations under the License.
 <topicref href="rreffuncatan2.dita" navtitle="ATAN2 function"></topicref>
 <topicref href="rrefsqlj32693.dita" navtitle="AVG function"></topicref>
 <topicref href="rrefbuiltbigint.dita" navtitle="BIGINT function"></topicref>
-<topicref href="rrefcase.dita" navtitle="CASE expressions"></topicref>
 <topicref href="rrefsqlj33562.dita" navtitle="CAST function"></topicref>
 <topicref href="rreffuncceil.dita" navtitle="CEIL or CEILING function"></topicref>
 <topicref href="rrefbuiltchar.dita" navtitle="CHAR function"></topicref>
@@ -325,7 +352,7 @@ limitations under the License.
 <topicref href="rrefminutefunc.dita" navtitle="MINUTE function"></topicref>
 <topicref href="rrefsqljmod.dita" navtitle="MOD function"></topicref>
 <topicref href="rrefmonthfunc.dita" navtitle="MONTH function"></topicref>
-<topicref href="rrefcasenullif.dita" navtitle="NULLIF expressions"></topicref>
+<topicref href="rrefcasenullif.dita" navtitle="NULLIF function"></topicref>
 <topicref href="rreffuncpi.dita" navtitle="PI function"></topicref>
 <topicref href="rreffuncradians.dita" navtitle="RADIANS function"></topicref>
 <topicref href="rreffuncrandom.dita" navtitle="RANDOM function"></topicref>

Modified: db/derby/docs/trunk/src/ref/rrefcase.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcase.dita?rev=1325247&r1=1325246&r2=1325247&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcase.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefcase.dita Thu Apr 12 13:31:02 2012
@@ -18,13 +18,14 @@ See the License for the specific languag
 limitations under the License.
 -->
 <reference id="rrefcase" xml:lang="en-us">
-<title>CASE expressions</title>
-<shortdesc>Use the CASE expressions for conditional expressions in <ph conref="../conrefs.dita#prod/productshortname"></ph>.</shortdesc>
+<title>CASE expression</title>
+<shortdesc>The CASE expression can be used for conditional expressions in
+<ph conref="../conrefs.dita#prod/productshortname"></ph>.</shortdesc>
 <prolog><metadata>
 <keywords><indexterm>CASE expression</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<refsyn><title>CASE expression syntax</title><p>You can place a CASE
expression
+<refsyn><title>Syntax</title><p>You can place a CASE expression
 anywhere an expression is allowed. It chooses an expression to evaluate based
 on a boolean test.</p> <codeblock><b>CASE 
   WHEN <i>booleanExpression</i> THEN <i>thenExpression</i> 

Modified: db/derby/docs/trunk/src/ref/rrefcasenullif.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcasenullif.dita?rev=1325247&r1=1325246&r2=1325247&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcasenullif.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefcasenullif.dita Thu Apr 12 13:31:02 2012
@@ -18,16 +18,18 @@ See the License for the specific languag
 limitations under the License.
 -->
 <reference id="rrefcasenullif" xml:lang="en-us">
-<title>NULLIF expressions</title>
-<shortdesc>Use the NULLIF expressions for conditional expressions in <ph conref="../conrefs.dita#prod/productshortname"></ph>.</shortdesc>
+<title>NULLIF function</title>
+<shortdesc>The NULLIF function can be used for conditional expressions in
+<ph conref="../conrefs.dita#prod/productshortname"></ph>.</shortdesc>
 <prolog><metadata>
-<keywords><indexterm>NULLIF expression</indexterm></keywords>
+<keywords><indexterm>NULLIF function</indexterm></keywords>
 </metadata></prolog>
 <refbody>
-<refsyn><title>NULLIF expression syntax</title>
+<refsyn><title>Syntax</title>
 <codeblock><b>NULLIF ( L, R )</b></codeblock></refsyn>
-<section><p>The
-NULLIF expression is very similar to the CASE expression. For example,</p>
+<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>
 <codeblock><b>NULLIF(V1,V2)</b></codeblock>
 <p>is
 equivalent to the following CASE expression:</p>

Modified: db/derby/docs/trunk/src/ref/rrefsqlj19433.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj19433.dita?rev=1325247&r1=1325246&r2=1325247&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj19433.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj19433.dita Thu Apr 12 13:31:02 2012
@@ -140,7 +140,11 @@ comparisons.</p></entry>
 <row>
 <entry colname="2"> Conditional expression</entry>
 <entry colname="3">A conditional expression chooses an expression to evaluate
-based on a boolean test.</entry>
+based on a boolean test. Conditional expressions include the
+<xref href="rrefcase.dita#rrefcase">CASE expression</xref>, the
+<xref href="rrefcasenullif.dita#rrefcasenullif">NULLIF function</xref>, and the
+<xref href="rreffunccoalesce.dita#rreffunccoalesce">COALESCE function</xref>.
+</entry>
 </row>
 </tbody>
 </tgroup>



Mime
View raw message