db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From scotsmat...@apache.org
Subject svn commit: r493130 - in /db/derby/docs/trunk/src/ref: refderby.ditamap rrefcase.dita rrefcasenullif.dita rrefclauses.dita rrefexpressions.dita rrefqueries.dita rrefsqlj29840.dita
Date Fri, 05 Jan 2007 18:39:41 GMT
Author: scotsmatrix
Date: Fri Jan  5 10:39:40 2007
New Revision: 493130

URL: http://svn.apache.org/viewvc?view=rev&rev=493130
Log:
DERBY-2013: Updated order of statements in SQL Reference section and created some new sections
for expressions, clauses, and queries. Patch submitted by Laura Stewart.

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/rrefclauses.dita
    db/derby/docs/trunk/src/ref/rrefexpressions.dita
    db/derby/docs/trunk/src/ref/rrefqueries.dita
    db/derby/docs/trunk/src/ref/rrefsqlj29840.dita

Modified: db/derby/docs/trunk/src/ref/refderby.ditamap
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/refderby.ditamap?view=diff&rev=493130&r1=493129&r2=493130
==============================================================================
--- db/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ref/refderby.ditamap Fri Jan  5 10:39:40 2007
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
+ 
 <!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN"
  "map.dtd">
 <!-- 
@@ -182,7 +182,7 @@
 <topicref href="rrefsqlj33602.dita" navtitle="WHERE clause"></topicref>
 <topicref href="rrefsqlj15309.dita" navtitle="WHERE CURRENT OF clause"></topicref>
 </topicref>
-<topicref href="rrefexpressions.dita" navtitle="SQL Expressions">
+<topicref collection-type="family" href="rrefsqlj19433.dita" navtitle="SQL expressions">
 <topicref href="rrefselectexpression.dita" navtitle="SelectExpression"></topicref>
 <topicref collection-type="family" href="rreftableexpression.dita" navtitle="TableExpression">
 <topicref href="rrefsqlj33215.dita" navtitle="TableOrViewExpression"></topicref>
@@ -190,6 +190,16 @@
 <topicref collection-type="family" href="rrefsqlj11277.dita" navtitle="VALUES expression">
 <topicref href="rrefsqlj87167.dita" navtitle="Value"></topicref>
 </topicref>
+<topicref collection-type="family" href="rrefsqlj1080779.dita" navtitle="Expression precedence">
+<topicref href="rrefsqlj1080962.dita" navtitle="Example"></topicref>
+</topicref>
+<topicref href="rrefsqlj23075.dita" navtitle="Boolean expression"></topicref>
+<topicref collection-type="family" href="crefsqlj29911.dita" navtitle="Dynamic parameters">
+<topicref href="rrefsqlj1082953.dita" navtitle="Dynamic parameters example ">
+</topicref>
+<topicref href="rrefsqlj1083019.dita" navtitle="Where dynamic parameters are allowed">
+</topicref>
+</topicref>
 </topicref>
 <topicref href="rrefsqlj29840.dita" navtitle="JOIN operations">
 <topicref href="rrefsqlj35034.dita" navtitle="INNER JOIN "></topicref>
@@ -357,18 +367,6 @@
 <topicref href="rrefsqlj41207.dita" navtitle="VARCHAR"></topicref>
 <topicref href="rrefsqlj32714.dita" navtitle="VARCHAR FOR BIT DATA"></topicref>
 <topicref href="rrefsqljtypexml.dita" navtitle="XML data type"></topicref>
-</topicref>
-<topicref collection-type="family" href="rrefsqlj19433.dita" navtitle="SQL expressions">
-<topicref collection-type="family" href="rrefsqlj1080779.dita" navtitle="Expression precedence">
-<topicref href="rrefsqlj1080962.dita" navtitle="Example"></topicref>
-</topicref>
-<topicref href="rrefsqlj23075.dita" navtitle="Boolean expression"></topicref>
-<topicref collection-type="family" href="crefsqlj29911.dita" navtitle="Dynamic parameters">
-<topicref href="rrefsqlj1082953.dita" navtitle="Dynamic parameters example ">
-</topicref>
-<topicref href="rrefsqlj1083019.dita" navtitle="Where dynamic parameters are allowed">
-</topicref>
-</topicref>
 </topicref>
 </topicref>
 <topicref href="rrefkeywords29722.dita" navtitle="SQL reserved words"></topicref>

Modified: db/derby/docs/trunk/src/ref/rrefcase.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcase.dita?view=diff&rev=493130&r1=493129&r2=493130
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcase.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefcase.dita Fri Jan  5 10:39:40 2007
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -45,52 +44,4 @@
    END
 </b></codeblock> </example>
 </refbody>
-</reference>
-<?xml version="1.0" encoding="utf-8"?>
- 
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at      
-
-http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-See the License for the specific language governing permissions and  
-limitations under the License.
--->
-<reference id="rrefcase" xml:lang="en-us">
-<title>CASE expressions</title>
-<shortdesc>Use the CASE expressions for conditional expressions in <ph conref="refconrefs.dita#prod/productshortname"></ph>.</shortdesc>
-<prolog><metadata>
-<keywords><indexterm>CASE expression</indexterm></keywords>
-</metadata></prolog>
-<refbody>
-<example><title>CASE expression 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> 
-  [ WHEN <i>booleanExpression</i> THEN <i>thenExpression</i> ]...
-  ELSE <i>elseExpression</i> 
-END</b></codeblock> <p><i>ThenExpression</i> and <i>elseExpression</i>
are
-both expressions that must be type-compatible. For built-in types, this means
-that the types must be the same or a built-in broadening conversion must exist
-between the types.</p><codeblock><b>-- returns 3
-VALUES CASE WHEN 1=1 THEN 3 ELSE 4 END</b></codeblock> <codeblock><b>
--- returns 7
-VALUES
-   CASE
-      WHEN 1 = 2 THEN 3
-      WHEN 4 = 5 THEN 6
-      ELSE 7
-   END
-</b></codeblock> </example>
-</refbody>
-</reference>
+</reference>
\ No newline at end of file

Modified: db/derby/docs/trunk/src/ref/rrefcasenullif.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcasenullif.dita?view=diff&rev=493130&r1=493129&r2=493130
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcasenullif.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefcasenullif.dita Fri Jan  5 10:39:40 2007
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
- 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 

Modified: db/derby/docs/trunk/src/ref/rrefclauses.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefclauses.dita?view=diff&rev=493130&r1=493129&r2=493130
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefclauses.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefclauses.dita Fri Jan  5 10:39:40 2007
@@ -1,33 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at      
-
-http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-See the License for the specific language governing permissions and  
-limitations under the License.
--->
-<reference id="rrefclauses" xml:lang="en-us">
-<title>Clauses</title>
-<shortdesc></shortdesc>
-<prolog><metadata>
-<keywords><indexterm>clauses<indexterm>SQL statements</indexterm></indexterm>
-<indexterm>SQL statements<indexterm>clauses</indexterm></indexterm></keywords>
-</metadata></prolog>
-<refbody></refbody>
-</reference>
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -54,4 +25,4 @@
 <indexterm>SQL statements<indexterm>clauses</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody></refbody>
-</reference>
+</reference>
\ No newline at end of file

Modified: db/derby/docs/trunk/src/ref/rrefexpressions.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefexpressions.dita?view=diff&rev=493130&r1=493129&r2=493130
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefexpressions.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefexpressions.dita Fri Jan  5 10:39:40 2007
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at      
-
-http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-See the License for the specific language governing permissions and  
-limitations under the License.
--->
-<reference id="rrefexpressions" xml:lang="en-us">
-<title>Expressions</title>
-<shortdesc></shortdesc>
-<prolog><metadata>
-<keywords><indexterm>expressions<indexterm>SQL statements</indexterm></indexterm>
-<indexterm>SQL statements<indexterm>expressions</indexterm></indexterm></keywords>
-</metadata></prolog>
-<refbody></refbody>
-</reference>
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at      
-
-http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-See the License for the specific language governing permissions and  
-limitations under the License.
--->
-<reference id="rrefexpressions" xml:lang="en-us">
-<title>SQL Expressions</title>
-<shortdesc></shortdesc>
-<prolog><metadata>
-<keywords><indexterm>expressions<indexterm>SQL statements</indexterm></indexterm>
-<indexterm>SQL statements<indexterm>expressions</indexterm></indexterm></keywords>
-</metadata></prolog>
-<refbody></refbody>
-</reference>

Modified: db/derby/docs/trunk/src/ref/rrefqueries.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefqueries.dita?view=diff&rev=493130&r1=493129&r2=493130
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefqueries.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefqueries.dita Fri Jan  5 10:39:40 2007
@@ -1,32 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!--Arbortext, Inc., 1988-2005, v.4002-->
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
-<!-- 
-Licensed to the Apache Software Foundation (ASF) under one or more
-contributor license agreements.  See the NOTICE file distributed with
-this work for additional information regarding copyright ownership.
-The ASF licenses this file to You under the Apache License, Version 2.0
-(the "License"); you may not use this file except in compliance with
-the License.  You may obtain a copy of the License at      
-
-http://www.apache.org/licenses/LICENSE-2.0  
-
-Unless required by applicable law or agreed to in writing, software  
-distributed under the License is distributed on an "AS IS" BASIS,  
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.  
-See the License for the specific language governing permissions and  
-limitations under the License.
--->
-<reference id="rrefqueries" xml:lang="en-us">
-<title>Queries</title>
-<prolog><metadata>
-<keywords><indexterm>queries<indexterm>SQL statements</indexterm></indexterm>
-<indexterm>SQL statements<indexterm>queries</indexterm></indexterm></keywords>
-</metadata></prolog>
-<refbody></refbody>
-</reference>
-<?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 
@@ -52,4 +24,4 @@
 <indexterm>SQL statements<indexterm>queries</indexterm></indexterm></keywords>
 </metadata></prolog>
 <refbody></refbody>
-</reference>
+</reference>
\ No newline at end of file

Modified: db/derby/docs/trunk/src/ref/rrefsqlj29840.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj29840.dita?view=diff&rev=493130&r1=493129&r2=493130
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj29840.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj29840.dita Fri Jan  5 10:39:40 2007
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
- 
 <!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
  "../dtd/reference.dtd">
 <!-- 



Mime
View raw message