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 sc...@apache.org on 2007/01/04 20:53:11 UTC
svn commit: r492706 - in /db/derby/docs/trunk/src/ref: refderby.ditamap
rrefcase.dita rrefcasenullif.dita rrefclauses.dita rrefexpressions.dita
rrefqueries.dita rrefsqlj29840.dita
Author: scotsmatrix
Date: Thu Jan 4 11:53:10 2007
New Revision: 492706
URL: http://svn.apache.org/viewvc?view=rev&rev=492706
Log: (empty)
Added:
db/derby/docs/trunk/src/ref/rrefcase.dita (with props)
db/derby/docs/trunk/src/ref/rrefclauses.dita (with props)
db/derby/docs/trunk/src/ref/rrefexpressions.dita (with props)
db/derby/docs/trunk/src/ref/rrefqueries.dita (with props)
Modified:
db/derby/docs/trunk/src/ref/refderby.ditamap
db/derby/docs/trunk/src/ref/rrefcasenullif.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=492706&r1=492705&r2=492706
==============================================================================
--- db/derby/docs/trunk/src/ref/refderby.ditamap (original)
+++ db/derby/docs/trunk/src/ref/refderby.ditamap Thu Jan 4 11:53:10 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">
<!--
@@ -108,6 +108,7 @@
</topicref>
<topicref collection-type="family" href="rrefsqlj81859.dita" navtitle="ALTER TABLE statement">
</topicref>
+<topicref href="rrefcallprocedure.dita" navtitle="CALL (PROCEDURE)"></topicref>
<topicref collection-type="family" href="crefsqlj95081.dita" navtitle="CREATE statements">
<topicref href="rrefcreatefunctionstatement.dita" navtitle="CREATE FUNCTION statement">
</topicref>
@@ -129,6 +130,9 @@
</topicref>
<topicref href="rrefsqlj15446.dita" navtitle="CREATE VIEW statement"></topicref>
</topicref>
+<topicref collection-type="family" href="rrefdeclaretemptable.dita" navtitle="DECLARE GLOBAL TEMPORARY TABLE statement">
+</topicref>
+<topicref href="rrefsqlj35981.dita" navtitle="DELETE statement"></topicref>
<topicref collection-type="family" href="crefsqlj80721.dita" navtitle="DROP Statements">
<topicref href="rrefdropfunctionstatement.dita" navtitle="DROP FUNCTION statement">
</topicref>
@@ -143,55 +147,59 @@
<topicref href="rrefsqlj61102.dita" navtitle="DROP VIEW statement"></topicref>
</topicref>
<topicref href="rrefsqljgrant.dita" navtitle="GRANT statement"></topicref>
+<topicref href="rrefsqlj40774.dita" navtitle="INSERT statement"></topicref>
+<topicref href="rrefsqlj40506.dita" navtitle="LOCK TABLE statement"></topicref>
<topicref collection-type="family" href="crefsqljrenamestatements.dita" navtitle="RENAME statements">
+<topicref href="rrefsqljrenamecolumnstatement.dita" navtitle="RENAME COLUMN statement ">
+</topicref>
<topicref href="rrefsqlj95598.dita" navtitle="RENAME INDEX statement"></topicref>
<topicref href="rrefsqljrenametablestatement.dita" navtitle="RENAME TABLE statement ">
</topicref>
-<topicref href="rrefsqljrenamecolumnstatement.dita" navtitle="RENAME COLUMN statement "/>
</topicref>
<topicref href="rrefsqljrevoke.dita" navtitle="REVOKE statement"></topicref>
<topicref collection-type="family" href="crefsqlj35312.dita" navtitle="SET statements">
-<topicref href="rrefsqlj32268.dita" navtitle="SET SCHEMA statement"></topicref>
<topicref href="rrefsqlj41180.dita" navtitle="SET CURRENT ISOLATION statement">
</topicref>
+<topicref href="rrefsqlj32268.dita" navtitle="SET SCHEMA statement"></topicref>
</topicref>
-<topicref href="rrefcallprocedure.dita" navtitle="CALL (PROCEDURE)"></topicref>
+<topicref href="rrefsqlj41360.dita" navtitle="SELECT statement"></topicref>
+<topicref collection-type="family" href="rrefsqlj26498.dita" navtitle="UPDATE statement">
+<topicref href="rrefsqlj76354.dita" navtitle="Value"></topicref>
+</topicref>
+</topicref>
+<topicref href="rrefclauses.dita" navtitle="SQL Clauses">
<topicref collection-type="family" href="rrefsqlj13590.dita" navtitle="CONSTRAINT clause">
<topicref href="rrefsqlj16095.dita" navtitle="Column-level-constraint"></topicref>
<topicref href="rrefsqlj42154.dita" navtitle="Table-level constraint"></topicref>
<topicref href="rrefsqlj16357.dita" navtitle="References specification"></topicref>
<topicref href="rrefsqlj91438.dita" navtitle="searchCondition"></topicref>
</topicref>
-<topicref collection-type="family" href="rrefdeclaretemptable.dita" navtitle="DECLARE GLOBAL TEMPORARY TABLE statement">
-</topicref>
-<topicref href="rrefsqlj35981.dita" navtitle="DELETE statement"></topicref>
<topicref href="rrefsqlj31783.dita" navtitle="FOR UPDATE clause"></topicref>
<topicref href="rrefsqlj21583.dita" navtitle="FROM clause"></topicref>
<topicref href="rrefsqlj32654.dita" navtitle="GROUP BY clause"></topicref>
<topicref href="rrefsqlj14854.dita" navtitle="HAVING clause"></topicref>
-<topicref href="rrefsqlj35034.dita" navtitle="INNER JOIN "></topicref>
-<topicref href="rrefsqlj40774.dita" navtitle="INSERT statement"></topicref>
-<topicref href="rrefsqlj29840.dita" navtitle="JOIN operation"></topicref>
-<topicref href="rrefsqlj18922.dita" navtitle="LEFT OUTER JOIN"></topicref>
-<topicref href="rrefsqlj40506.dita" navtitle="LOCK TABLE statement"></topicref>
<topicref href="rrefsqlj13658.dita" navtitle="ORDER BY clause"></topicref>
-<topicref href="rrefsqlj21571.dita" navtitle="Query"></topicref>
-<topicref href="rrefsqlj57522.dita" navtitle="RIGHT OUTER JOIN"></topicref>
-<topicref href="rrefscalarsubquery.dita" navtitle="ScalarSubquery"></topicref>
+<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 href="rrefselectexpression.dita" navtitle="SelectExpression"></topicref>
-<topicref href="rrefsqlj41360.dita" navtitle="SELECT statement"></topicref>
<topicref collection-type="family" href="rreftableexpression.dita" navtitle="TableExpression">
<topicref href="rrefsqlj33215.dita" navtitle="TableOrViewExpression"></topicref>
</topicref>
-<topicref href="rreftablesubquery.dita" navtitle="TableSubquery"></topicref>
-<topicref collection-type="family" href="rrefsqlj26498.dita" navtitle="UPDATE statement">
-<topicref href="rrefsqlj76354.dita" navtitle="Value"></topicref>
-</topicref>
<topicref collection-type="family" href="rrefsqlj11277.dita" navtitle="VALUES expression">
<topicref href="rrefsqlj87167.dita" navtitle="Value"></topicref>
</topicref>
-<topicref href="rrefsqlj33602.dita" navtitle="WHERE clause"></topicref>
-<topicref href="rrefsqlj15309.dita" navtitle="WHERE CURRENT OF clause"></topicref>
+</topicref>
+<topicref href="rrefsqlj29840.dita" navtitle="JOIN operations">
+<topicref href="rrefsqlj35034.dita" navtitle="INNER JOIN "></topicref>
+<topicref href="rrefsqlj18922.dita" navtitle="LEFT OUTER JOIN"></topicref>
+<topicref href="rrefsqlj57522.dita" navtitle="RIGHT OUTER JOIN"></topicref>
+</topicref>
+<topicref href="rrefqueries.dita" navtitle="SQL Queries">
+<topicref href="rrefsqlj21571.dita" navtitle="Query"></topicref>
+<topicref href="rrefscalarsubquery.dita" navtitle="ScalarSubquery"></topicref>
+<topicref href="rreftablesubquery.dita" navtitle="TableSubquery"></topicref>
</topicref>
<topicref href="rrefsqlj29026.dita" navtitle="Built-in functions">
<topicref href="rrefsqlj55788.dita" navtitle="Standard built-in functions">
@@ -204,6 +212,7 @@
<topicref href="rreffuncatan.dita" navtitle="ATAN function"></topicref>
<topicref href="rrefsqlj32693.dita" navtitle="AVG"></topicref>
<topicref href="rrefbuiltbigint.dita" navtitle="BIGINT"></topicref>
+<topicref href="rrefcase.dita" navtitle="CASE expressions"></topicref>
<topicref href="rrefsqlj33562.dita" navtitle="CAST"></topicref>
<topicref href="rreffuncceil.dita" navtitle="CEIL or CEILING function"></topicref>
<topicref href="rrefbuiltchar.dita" navtitle="CHAR"></topicref>
@@ -242,8 +251,7 @@
<topicref href="rrefminutefunc.dita" navtitle="MINUTE"></topicref>
<topicref href="rrefsqljmod.dita" navtitle="MOD"></topicref>
<topicref href="rrefmonthfunc.dita" navtitle="MONTH"></topicref>
-<topicref href="rrefcasenullif.dita" navtitle="NULLIF and CASE expressions">
-</topicref>
+<topicref href="rrefcasenullif.dita" navtitle="NULLIF expressions"></topicref>
<topicref href="rreffuncpi.dita" navtitle="PI function"></topicref>
<topicref href="rreffuncradians.dita" navtitle="RADIANS function"></topicref>
<topicref href="rrefsqlj32613.dita" navtitle="RTRIM"></topicref>
Added: db/derby/docs/trunk/src/ref/rrefcase.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefcase.dita?view=auto&rev=492706
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcase.dita (added)
+++ db/derby/docs/trunk/src/ref/rrefcase.dita Thu Jan 4 11:53:10 2007
@@ -0,0 +1,96 @@
+<?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="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>
+<?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>
Propchange: db/derby/docs/trunk/src/ref/rrefcase.dita
------------------------------------------------------------------------------
svn:eol-style = native
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=492706&r1=492705&r2=492706
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefcasenullif.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefcasenullif.dita Thu Jan 4 11:53:10 2007
@@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
+
<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
"../dtd/reference.dtd">
<!--
@@ -18,38 +19,14 @@
limitations under the License.
-->
<reference id="rrefcasenullif" xml:lang="en-us">
-<title>NULLIF and CASE expressions</title>
-<shortdesc>Use the CASE and NULLIF expressions for conditional expressions
-in <ph conref="refconrefs.dita#prod/productshortname"></ph>.</shortdesc>
+<title>NULLIF expressions</title>
+<shortdesc>Use the NULLIF expressions for conditional expressions in <ph conref="refconrefs.dita#prod/productshortname"></ph>.</shortdesc>
<prolog><metadata>
-<keywords><indexterm>NULLIF expression</indexterm><indexterm>CASE expression</indexterm>
-</keywords>
+<keywords><indexterm>NULLIF expression</indexterm></keywords>
</metadata></prolog>
<refbody>
<example><title>NULLIF expression syntax</title><codeblock><b>NULLIF ( L, R )</b></codeblock>The
NULLIF expression is very similar to the CASE expression. For example: <codeblock><b>NULLIF(V1,V2)</b></codeblock> is
equivalent to the following CASE expression:<codeblock><b>CASE WHEN V1=V2 THEN NULL ELSE V1 END</b></codeblock></example>
-<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>
Added: db/derby/docs/trunk/src/ref/rrefclauses.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefclauses.dita?view=auto&rev=492706
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefclauses.dita (added)
+++ db/derby/docs/trunk/src/ref/rrefclauses.dita Thu Jan 4 11:53:10 2007
@@ -0,0 +1,57 @@
+<?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">
+<!--
+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>SQL 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>
Propchange: db/derby/docs/trunk/src/ref/rrefclauses.dita
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/docs/trunk/src/ref/rrefexpressions.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefexpressions.dita?view=auto&rev=492706
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefexpressions.dita (added)
+++ db/derby/docs/trunk/src/ref/rrefexpressions.dita Thu Jan 4 11:53:10 2007
@@ -0,0 +1,57 @@
+<?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>
Propchange: db/derby/docs/trunk/src/ref/rrefexpressions.dita
------------------------------------------------------------------------------
svn:eol-style = native
Added: db/derby/docs/trunk/src/ref/rrefqueries.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefqueries.dita?view=auto&rev=492706
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefqueries.dita (added)
+++ db/derby/docs/trunk/src/ref/rrefqueries.dita Thu Jan 4 11:53:10 2007
@@ -0,0 +1,55 @@
+<?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">
+<!--
+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>SQL 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>
Propchange: db/derby/docs/trunk/src/ref/rrefqueries.dita
------------------------------------------------------------------------------
svn:eol-style = native
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=492706&r1=492705&r2=492706
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj29840.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj29840.dita Thu Jan 4 11:53:10 2007
@@ -1,4 +1,7 @@
<?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
@@ -15,35 +18,32 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
-<!DOCTYPE reference PUBLIC "-//OASIS//DTD DITA Reference//EN"
- "../dtd/reference.dtd">
<reference id="rrefsqlj29840" xml:lang="en-us">
-<title>JOIN operation</title>
+<title>JOIN operations</title>
<prolog><metadata>
-<keywords><indexterm>JOIN operation</indexterm><indexterm>Outer joins</indexterm>
+<keywords><indexterm>JOIN operations</indexterm><indexterm>Outer joins</indexterm>
</keywords>
</metadata></prolog>
<refbody>
<section> <p>The JOIN operations, which are among the possible <i><xref href="rreftableexpression.dita#rreftableexpression">TableExpression</xref
->s</i> in a <xref href="rrefsqlj21583.dita#rrefsqlj21583">FROM clause</xref>, perform
-joins between two tables. (You can also perform a join between two tables
-using an explicit equality test in a WHERE clause, such as "WHERE t1.col1
+>s</i> in a <xref href="rrefsqlj21583.dita#rrefsqlj21583">FROM clause</xref>,
+perform joins between two tables. (You can also perform a join between two
+tables using an explicit equality test in a WHERE clause, such as "WHERE t1.col1
= t2.col2".)</p></section>
<refsyn><title>Syntax</title> <codeblock><b><i>JOIN Operation</i></b></codeblock> <p>The
JOIN operations are: <ul>
-<li><xref href="rrefsqlj35034.dita#rrefsqlj35034"></xref> <p>Specifies a join between
-two tables with an explicit join clause. See <xref href="rrefsqlj35034.dita#rrefsqlj35034"></xref>.</p></li>
+<li><xref href="rrefsqlj35034.dita#rrefsqlj35034"></xref> <p>Specifies a
+join between two tables with an explicit join clause. See <xref href="rrefsqlj35034.dita#rrefsqlj35034"></xref>.</p></li>
<li><xref href="rrefsqlj18922.dita#rrefsqlj18922"></xref> <p>Specifies a
join between two tables with an explicit join clause, preserving unmatched
rows from the first table. See <xref href="rrefsqlj18922.dita#rrefsqlj18922"></xref>.</p></li>
-<li><xref href="rrefsqlj57522.dita#rrefsqlj57522"></xref> <p>Specifies a join between
-two tables with an explicit join clause, preserving unmatched rows from the
-second table. See <xref href="rrefsqlj57522.dita#rrefsqlj57522"></xref>.</p></li>
+<li><xref href="rrefsqlj57522.dita#rrefsqlj57522"></xref> <p>Specifies a
+join between two tables with an explicit join clause, preserving unmatched
+rows from the second table. See <xref href="rrefsqlj57522.dita#rrefsqlj57522"></xref>.</p></li>
</ul></p> <p>In all cases, you can specify additional restrictions on one
-or both of the tables being joined in outer join clauses or in the <xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE clause</xref>.</p> </refsyn>
-<section><title>JOIN expressions and query optimization</title> <p>For
-information on which types of joins are optimized, see <cite><ph conref="refconrefs.dita#pub/cittuning"></ph></cite>.</p> </section>
+or both of the tables being joined in outer join clauses or in the <xref href="rrefsqlj33602.dita#rrefsqlj33602">WHERE
+clause</xref>.</p> </refsyn>
+<section><title>JOIN expressions and query optimization</title> <p>For information
+on which types of joins are optimized, see <cite><ph conref="refconrefs.dita#pub/cittuning"></ph></cite>.</p> </section>
</refbody>
</reference>
-