db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chaa...@apache.org
Subject svn commit: r882686 - in /db/derby/docs/trunk/src/ref: rrefsqlj33215.dita rreftableexpression.dita
Date Fri, 20 Nov 2009 19:13:58 GMT
Author: chaase3
Date: Fri Nov 20 19:13:56 2009
New Revision: 882686

URL: http://svn.apache.org/viewvc?rev=882686&view=rev
Log:
DERBY-4399: Syntax description for TableViewOrFunctionExpression lacks subquery option

Modified 2 topics.

Patch: DERBY-4399-2.diff

Modified:
    db/derby/docs/trunk/src/ref/rrefsqlj33215.dita
    db/derby/docs/trunk/src/ref/rreftableexpression.dita

Modified: db/derby/docs/trunk/src/ref/rrefsqlj33215.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rrefsqlj33215.dita?rev=882686&r1=882685&r2=882686&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rrefsqlj33215.dita (original)
+++ db/derby/docs/trunk/src/ref/rrefsqlj33215.dita Fri Nov 20 19:13:56 2009
@@ -21,11 +21,19 @@
 <reference id="rrefsqlj33215" xml:lang="en-us">
 <title>TableViewOrFunctionExpression</title>
 <refbody>
-<example> <codeblock><b>{<i> <xref href="rreftablename.dita#rreftablename">table-Name</xref></i>
|<i> <xref href="rrefviewname.dita#rrefviewname">view-Name</xref></i>
| <i><xref href="rrefsqljtfinvoke.dita#rrefsqljtfinvoke">TableFunctionInvocation</xref></i>}
-    [ [ AS ] <i><xref href="rrefcorrelationname.dita#rrefcorrelationname">correlation-Name</xref></i>
-        [ (<i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i>
[ , <i><xref
-href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i>]*
) ] ] ]
-</b></codeblock></example>
+<example><codeblock><b>{
+    { <i><xref href="rreftablename.dita#rreftablename">table-Name</xref></i>
| <i><xref href="rrefviewname.dita#rrefviewname">view-Name</xref></i>
}
+    [ <i>CorrelationClause</i> ]
+|
+    { <i><xref href="rreftablesubquery.dita#rreftablesubquery">TableSubquery</xref></i>
| <i><xref href="rrefsqljtfinvoke.dita#rrefsqljtfinvoke">TableFunctionInvocation</xref></i>
}
+    <i>CorrelationClause</i>
+}</b></codeblock>
+<p>where <i>CorrelationClause</i> is</p>
+<codeblock><b>[ AS ]
+<i><xref href="rrefcorrelationname.dita#rrefcorrelationname">correlation-Name</xref></i>
+[ ( <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i>
[ , <i><xref href="rrefsimplecolumnname.dita#rrefsimplecolumnname">Simple-column-Name</xref></i>
]* ) ] 
+</b></codeblock>
+</example>
 </refbody>
 </reference>
 

Modified: db/derby/docs/trunk/src/ref/rreftableexpression.dita
URL: http://svn.apache.org/viewvc/db/derby/docs/trunk/src/ref/rreftableexpression.dita?rev=882686&r1=882685&r2=882686&view=diff
==============================================================================
--- db/derby/docs/trunk/src/ref/rreftableexpression.dita (original)
+++ db/derby/docs/trunk/src/ref/rreftableexpression.dita Fri Nov 20 19:13:56 2009
@@ -51,11 +51,11 @@
 can specify, see <cite><ph conref="../conrefs.dita#pub/cittuning"></ph></cite>.</p></section>
 <refsyn><title>Syntax</title>
 <codeblock><b>{
-TableViewOrFunctionExpression | JOIN operation 
+<i><xref href="rrefsqlj33215.dita#rrefsqlj33215">TableViewOrFunctionExpression</xref></i>
| <xref href="rrefsqlj29840.dita#rrefsqlj29840">JOIN operation</xref>
 }
 </b></codeblock>
 </refsyn>
-<example><title>Example</title><codeblock><b><ph>-- SELECT
from a Join expression </ph>
+<example><title>Example</title><codeblock><b><ph>-- SELECT
from a JOIN expression </ph>
 SELECT E.EMPNO, E.LASTNAME, M.EMPNO, M.LASTNAME
  FROM EMPLOYEE E LEFT OUTER JOIN
    	DEPARTMENT INNER JOIN EMPLOYEE M 



Mime
View raw message