[teiid-commits] teiid SVN: r2713 - tags/teiid-parent-7.2.0.Final/build/kits/jboss-container and 1 other directories.

Author: shawkins Date: 2010-11-05 11:02:21 -0400 (Fri, 05 Nov 2010) New Revision: 2713 Modified: branches/7.2.x/documentation/reference/src/main/docbook/en-US/content/grammar.xml branches/7.2.x/documentation/reference/src/main/docbook/en-US/content/procedures.xml tags/teiid-parent-7.2.0.Final/build/kits/jboss-container/teiid-releasenotes.html tags/teiid-parent-7.2.0.Final/documentation/reference/src/main/docbook/en-US/content/grammar.xml tags/teiid-parent-7.2.0.Final/documentation/reference/src/main/docbook/en-US/content/procedures.xml Log: updating missed files for release Modified: branches/7.2.x/documentation/reference/src/main/docbook/en-US/content/grammar.xml =================================================================== --- branches/7.2.x/documentation/reference/src/main/docbook/en-US/content/grammar.xml 2010-11-05 14:43:05 UTC (rev 2712) +++ branches/7.2.x/documentation/reference/src/main/docbook/en-US/content/grammar.xml 2010-11-05 15:02:21 UTC (rev 2713) @@ -427,7 +427,7 @@ <row> <entry align="right" valign="top"><para><anchor id="prod22" xreflabel="delimitedStatement"/>delimitedStatement</para></entry> <entry align="left" valign="top"><para>::= -( <link linkend="prod23">sqlStatement</link> | <link linkend="prod16">errorStatement</link> | <link linkend="prod24">assignStatement</link> | <link linkend="prod25">declareStatement</link> | <link linkend="prod26">continueStatement</link> | <link linkend="prod27">breakStatement</link> ) &lt;SEMICOLON&gt;</para></entry></row> +( <link linkend="prod23">assignStatement</link> | <link linkend="prod24">sqlStatement</link> | <link linkend="prod16">errorStatement</link> | <link linkend="prod25">declareStatement</link> | <link linkend="prod26">continueStatement</link> | <link linkend="prod27">breakStatement</link> ) &lt;SEMICOLON&gt;</para></entry></row> <row> <entry align="right" valign="top"><para><anchor id="prod28" xreflabel="block"/>block</para></entry> <entry align="left" valign="top"><para>::= @@ -463,19 +463,19 @@ <row> <entry align="right" valign="top"><para><anchor id="prod25" xreflabel="declareStatement"/>declareStatement</para></entry> <entry align="left" valign="top"><para>::= -&lt;DECLARE&gt; <link linkend="prod32">dataType</link> <link linkend="prod2">id</link> ( &lt;EQ&gt; <link linkend="prod33">assignStatementOperand</link> )?</para></entry></row> +&lt;DECLARE&gt; <link linkend="prod32">dataType</link> <link linkend="prod2">id</link> ( ( <link linkend="prod15">nonReserved</link> | &lt;EQ&gt; ) <link linkend="prod33">assignStatementOperand</link> )?</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod24" xreflabel="assignStatement"/>assignStatement</para></entry> +<entry align="right" valign="top"><para><anchor id="prod23" xreflabel="assignStatement"/>assignStatement</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod2">id</link> &lt;EQ&gt; <link linkend="prod33">assignStatementOperand</link></para></entry></row> +<link linkend="prod2">id</link> ( <link linkend="prod15">nonReserved</link> | &lt;EQ&gt; ) <link linkend="prod33">assignStatementOperand</link></para></entry></row> <row> <entry align="right" valign="top"><para><anchor id="prod33" xreflabel="assignStatementOperand"/>assignStatementOperand</para></entry> <entry align="left" valign="top"><para>::= -( ( <link linkend="prod9">insert</link> ) | <link linkend="prod10">update</link> | <link linkend="prod11">delete</link> | <link linkend="prod8">storedProcedure</link> | ( <link linkend="prod17">expression</link> ) | <link linkend="prod7">queryExpression</link> )</para></entry></row> +( ( <link linkend="prod9">insert</link> ) | <link linkend="prod10">update</link> | <link linkend="prod11">delete</link> | ( <link linkend="prod17">expression</link> ) | <link linkend="prod7">queryExpression</link> )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod23" xreflabel="sqlStatement"/>sqlStatement</para></entry> +<entry align="right" valign="top"><para><anchor id="prod24" xreflabel="sqlStatement"/>sqlStatement</para></entry> <entry align="left" valign="top"><para>::= -( ( <link linkend="prod34">dynamicCommand</link> ) | <link linkend="prod5">userCommand</link> )</para></entry></row> +( ( <link linkend="prod5">userCommand</link> ) | <link linkend="prod34">dynamicCommand</link> | ( <link linkend="prod2">id</link> ( <link linkend="prod15">nonReserved</link> | &lt;EQ&gt; ) <link linkend="prod8">storedProcedure</link> ) )</para></entry></row> <row> <entry align="right" valign="top"><para><anchor id="prod35" xreflabel="translateCriteria"/>translateCriteria</para></entry> <entry align="left" valign="top"><para>::= @@ -487,7 +487,7 @@ <row> <entry align="right" valign="top"><para><anchor id="prod34" xreflabel="dynamicCommand"/>dynamicCommand</para></entry> <entry align="left" valign="top"><para>::= -( &lt;EXECUTE&gt; | &lt;EXEC&gt; ) &lt;STRING&gt; <link linkend="prod17">expression</link> ( &lt;AS&gt; <link linkend="prod14">createElementsWithTypes</link> ( &lt;INTO&gt; <link linkend="prod2">id</link> )? )? ( &lt;USING&gt; <link linkend="prod36">setClauseList</link> )? ( &lt;UPDATE&gt; ( ( &lt;INTEGERVAL&gt; ) | ( &lt;STAR&gt; ) ) )?</para></entry></row> +( &lt;EXECUTE&gt; | &lt;EXEC&gt; ) ( ( &lt;STRING&gt; | &lt;IMMEDIATE&gt; ) )? <link linkend="prod17">expression</link> ( &lt;AS&gt; <link linkend="prod14">createElementsWithTypes</link> ( &lt;INTO&gt; <link linkend="prod2">id</link> )? )? ( &lt;USING&gt; <link linkend="prod36">setClauseList</link> )? ( &lt;UPDATE&gt; ( ( &lt;INTEGERVAL&gt; ) | ( &lt;STAR&gt; ) ) )?</para></entry></row> <row> <entry align="right" valign="top"><para><anchor id="prod36" xreflabel="setClauseList"/>setClauseList</para></entry> <entry align="left" valign="top"><para>::= @@ -585,35 +585,39 @@ <entry align="left" valign="top"><para>::= &lt;XMLAGG&gt; &lt;LPAREN&gt; <link linkend="prod17">expression</link> ( <link linkend="prod46">orderby</link> )? &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod60" xreflabel="aggregateSymbol"/>aggregateSymbol</para></entry> +<entry align="right" valign="top"><para><anchor id="prod60" xreflabel="textAgg"/>textAgg</para></entry> <entry align="left" valign="top"><para>::= +<link linkend="prod15">nonReserved</link> &lt;LPAREN&gt; &lt;FOR&gt; <link linkend="prod58">derivedColumn</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* ( &lt;ID&gt; <link linkend="prod61">charVal</link> )? ( ( &lt;ID&gt; <link linkend="prod61">charVal</link> ) )? ( &lt;ID&gt; )? ( ( &lt;ID&gt; <link linkend="prod2">id</link> ) )? ( <link linkend="prod46">orderby</link> )? &lt;RPAREN&gt;</para></entry></row> +<row> +<entry align="right" valign="top"><para><anchor id="prod62" xreflabel="aggregateSymbol"/>aggregateSymbol</para></entry> +<entry align="left" valign="top"><para>::= ( ( <link linkend="prod15">nonReserved</link> &lt;LPAREN&gt; &lt;STAR&gt; &lt;RPAREN&gt; ) | ( ( <link linkend="prod15">nonReserved</link> | &lt;ANY&gt; | &lt;SOME&gt; ) &lt;LPAREN&gt; ( &lt;DISTINCT&gt; | &lt;ALL&gt; )? <link linkend="prod17">expression</link> &lt;RPAREN&gt; ) )</para></entry></row> <row> <entry align="right" valign="top"><para><anchor id="prod52" xreflabel="from"/>from</para></entry> <entry align="left" valign="top"><para>::= -&lt;FROM&gt; ( <link linkend="prod61">tableReference</link> ( &lt;COMMA&gt; <link linkend="prod61">tableReference</link> )* )</para></entry></row> +&lt;FROM&gt; ( <link linkend="prod63">tableReference</link> ( &lt;COMMA&gt; <link linkend="prod63">tableReference</link> )* )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod61" xreflabel="tableReference"/>tableReference</para></entry> +<entry align="right" valign="top"><para><anchor id="prod63" xreflabel="tableReference"/>tableReference</para></entry> <entry align="left" valign="top"><para>::= -( ( &lt;LBRACE&gt; <link linkend="prod15">nonReserved</link> <link linkend="prod62">joinedTable</link> &lt;RBRACE&gt; ) | <link linkend="prod62">joinedTable</link> )</para></entry></row> +( ( &lt;LBRACE&gt; <link linkend="prod15">nonReserved</link> <link linkend="prod64">joinedTable</link> &lt;RBRACE&gt; ) | <link linkend="prod64">joinedTable</link> )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod62" xreflabel="joinedTable"/>joinedTable</para></entry> +<entry align="right" valign="top"><para><anchor id="prod64" xreflabel="joinedTable"/>joinedTable</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod63">tablePrimary</link> ( ( <link linkend="prod64">crossJoin</link> | <link linkend="prod65">qualifiedJoin</link> ) )*</para></entry></row> +<link linkend="prod65">tablePrimary</link> ( ( <link linkend="prod66">crossJoin</link> | <link linkend="prod67">qualifiedJoin</link> ) )*</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod64" xreflabel="crossJoin"/>crossJoin</para></entry> +<entry align="right" valign="top"><para><anchor id="prod66" xreflabel="crossJoin"/>crossJoin</para></entry> <entry align="left" valign="top"><para>::= -( ( &lt;CROSS&gt; | &lt;UNION&gt; ) &lt;JOIN&gt; <link linkend="prod63">tablePrimary</link> )</para></entry></row> +( ( &lt;CROSS&gt; | &lt;UNION&gt; ) &lt;JOIN&gt; <link linkend="prod65">tablePrimary</link> )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod65" xreflabel="qualifiedJoin"/>qualifiedJoin</para></entry> +<entry align="right" valign="top"><para><anchor id="prod67" xreflabel="qualifiedJoin"/>qualifiedJoin</para></entry> <entry align="left" valign="top"><para>::= -( ( ( &lt;RIGHT&gt; ( &lt;OUTER&gt; )? ) | ( &lt;LEFT&gt; ( &lt;OUTER&gt; )? ) | ( &lt;FULL&gt; ( &lt;OUTER&gt; )? ) | &lt;INNER&gt; )? &lt;JOIN&gt; <link linkend="prod61">tableReference</link> &lt;ON&gt; <link linkend="prod29">criteria</link> )</para></entry></row> +( ( ( &lt;RIGHT&gt; ( &lt;OUTER&gt; )? ) | ( &lt;LEFT&gt; ( &lt;OUTER&gt; )? ) | ( &lt;FULL&gt; ( &lt;OUTER&gt; )? ) | &lt;INNER&gt; )? &lt;JOIN&gt; <link linkend="prod63">tableReference</link> &lt;ON&gt; <link linkend="prod29">criteria</link> )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod63" xreflabel="tablePrimary"/>tablePrimary</para></entry> +<entry align="right" valign="top"><para><anchor id="prod65" xreflabel="tablePrimary"/>tablePrimary</para></entry> <entry align="left" valign="top"><para>::= -( <link linkend="prod66">textTable</link> | <link linkend="prod67">xmlTable</link> | <link linkend="prod68">unaryFromClause</link> | <link linkend="prod69">subqueryFromClause</link> | ( &lt;LPAREN&gt; <link linkend="prod62">joinedTable</link> &lt;RPAREN&gt; ) ) ( ( &lt;MAKEDEP&gt; ) | ( &lt;MAKENOTDEP&gt; ) )?</para></entry></row> +( <link linkend="prod68">textTable</link> | <link linkend="prod69">xmlTable</link> | <link linkend="prod70">unaryFromClause</link> | <link linkend="prod71">subqueryFromClause</link> | ( &lt;LPAREN&gt; <link linkend="prod64">joinedTable</link> &lt;RPAREN&gt; ) ) ( ( &lt;MAKEDEP&gt; ) | ( &lt;MAKENOTDEP&gt; ) )?</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod70" xreflabel="xmlSerialize"/>xmlSerialize</para></entry> +<entry align="right" valign="top"><para><anchor id="prod72" xreflabel="xmlSerialize"/>xmlSerialize</para></entry> <entry align="left" valign="top"><para>::= &lt;XMLSERIALIZE&gt; &lt;LPAREN&gt; ( <link linkend="prod15">nonReserved</link> )? <link linkend="prod17">expression</link> ( &lt;AS&gt; ( &lt;STRING&gt; | &lt;VARCHAR&gt; | &lt;CLOB&gt; ) )? &lt;RPAREN&gt;</para></entry></row> <row> @@ -621,35 +625,35 @@ <entry align="left" valign="top"><para>::= &lt;ID&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod66" xreflabel="textTable"/>textTable</para></entry> +<entry align="right" valign="top"><para><anchor id="prod68" xreflabel="textTable"/>textTable</para></entry> <entry align="left" valign="top"><para>::= -&lt;ID&gt; &lt;LPAREN&gt; <link linkend="prod17">expression</link> <link linkend="prod15">nonReserved</link> <link linkend="prod71">textColumn</link> ( &lt;COMMA&gt; <link linkend="prod71">textColumn</link> )* ( &lt;ID&gt; <link linkend="prod72">charVal</link> )? ( ( &lt;ESCAPE&gt; <link linkend="prod72">charVal</link> ) | ( &lt;ID&gt; <link linkend="prod72">charVal</link> ) )? ( &lt;ID&gt; ( <link linkend="prod73">intVal</link> )? )? ( &lt;ID&gt; <link linkend="prod73">intVal</link> )? &lt;RPAREN&gt; ( &lt;AS&gt; )? <link linkend="prod2">id</link></para></entry></row> +&lt;ID&gt; &lt;LPAREN&gt; <link linkend="prod17">expression</link> <link linkend="prod15">nonReserved</link> <link linkend="prod73">textColumn</link> ( &lt;COMMA&gt; <link linkend="prod73">textColumn</link> )* ( &lt;ID&gt; <link linkend="prod61">charVal</link> )? ( ( &lt;ESCAPE&gt; <link linkend="prod61">charVal</link> ) | ( &lt;ID&gt; <link linkend="prod61">charVal</link> ) )? ( &lt;ID&gt; ( <link linkend="prod74">intVal</link> )? )? ( &lt;ID&gt; <link linkend="prod74">intVal</link> )? &lt;RPAREN&gt; ( &lt;AS&gt; )? <link linkend="prod2">id</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod71" xreflabel="textColumn"/>textColumn</para></entry> +<entry align="right" valign="top"><para><anchor id="prod73" xreflabel="textColumn"/>textColumn</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod2">id</link> <link linkend="prod32">dataType</link> ( &lt;ID&gt; <link linkend="prod73">intVal</link> )?</para></entry></row> +<link linkend="prod2">id</link> <link linkend="prod32">dataType</link> ( &lt;ID&gt; <link linkend="prod74">intVal</link> )?</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod74" xreflabel="xmlQuery"/>xmlQuery</para></entry> +<entry align="right" valign="top"><para><anchor id="prod75" xreflabel="xmlQuery"/>xmlQuery</para></entry> <entry align="left" valign="top"><para>::= -&lt;XMLQUERY&gt; &lt;LPAREN&gt; ( <link linkend="prod75">xmlNamespaces</link> &lt;COMMA&gt; )? <link linkend="prod1">stringVal</link> ( &lt;ID&gt; <link linkend="prod58">derivedColumn</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* )? ( ( &lt;NULL&gt; | <link linkend="prod15">nonReserved</link> ) &lt;ON&gt; <link linkend="prod15">nonReserved</link> )? &lt;RPAREN&gt;</para></entry></row> +&lt;XMLQUERY&gt; &lt;LPAREN&gt; ( <link linkend="prod76">xmlNamespaces</link> &lt;COMMA&gt; )? <link linkend="prod1">stringVal</link> ( &lt;ID&gt; <link linkend="prod58">derivedColumn</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* )? ( ( &lt;NULL&gt; | <link linkend="prod15">nonReserved</link> ) &lt;ON&gt; <link linkend="prod15">nonReserved</link> )? &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod67" xreflabel="xmlTable"/>xmlTable</para></entry> +<entry align="right" valign="top"><para><anchor id="prod69" xreflabel="xmlTable"/>xmlTable</para></entry> <entry align="left" valign="top"><para>::= -&lt;XMLTABLE&gt; &lt;LPAREN&gt; ( <link linkend="prod75">xmlNamespaces</link> &lt;COMMA&gt; )? <link linkend="prod1">stringVal</link> ( &lt;ID&gt; <link linkend="prod58">derivedColumn</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* )? ( &lt;ID&gt; <link linkend="prod76">xmlColumn</link> ( &lt;COMMA&gt; <link linkend="prod76">xmlColumn</link> )* )? &lt;RPAREN&gt; ( &lt;AS&gt; )? <link linkend="prod2">id</link></para></entry></row> +&lt;XMLTABLE&gt; &lt;LPAREN&gt; ( <link linkend="prod76">xmlNamespaces</link> &lt;COMMA&gt; )? <link linkend="prod1">stringVal</link> ( &lt;ID&gt; <link linkend="prod58">derivedColumn</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* )? ( &lt;ID&gt; <link linkend="prod77">xmlColumn</link> ( &lt;COMMA&gt; <link linkend="prod77">xmlColumn</link> )* )? &lt;RPAREN&gt; ( &lt;AS&gt; )? <link linkend="prod2">id</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod76" xreflabel="xmlColumn"/>xmlColumn</para></entry> +<entry align="right" valign="top"><para><anchor id="prod77" xreflabel="xmlColumn"/>xmlColumn</para></entry> <entry align="left" valign="top"><para>::= <link linkend="prod2">id</link> ( ( &lt;FOR&gt; <link linkend="prod15">nonReserved</link> ) | ( <link linkend="prod32">dataType</link> ( &lt;DEFAULT_KEYWORD&gt; <link linkend="prod17">expression</link> )? ( <link linkend="prod15">nonReserved</link> <link linkend="prod1">stringVal</link> )? ) )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod73" xreflabel="intVal"/>intVal</para></entry> +<entry align="right" valign="top"><para><anchor id="prod74" xreflabel="intVal"/>intVal</para></entry> <entry align="left" valign="top"><para>::= &lt;INTEGERVAL&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod69" xreflabel="subqueryFromClause"/>subqueryFromClause</para></entry> +<entry align="right" valign="top"><para><anchor id="prod71" xreflabel="subqueryFromClause"/>subqueryFromClause</para></entry> <entry align="left" valign="top"><para>::= ( &lt;TABLE&gt; )? &lt;LPAREN&gt; ( <link linkend="prod7">queryExpression</link> | <link linkend="prod8">storedProcedure</link> ) &lt;RPAREN&gt; ( &lt;AS&gt; )? <link linkend="prod2">id</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod68" xreflabel="unaryFromClause"/>unaryFromClause</para></entry> +<entry align="right" valign="top"><para><anchor id="prod70" xreflabel="unaryFromClause"/>unaryFromClause</para></entry> <entry align="left" valign="top"><para>::= ( &lt;ID&gt; ( ( &lt;AS&gt; )? <link linkend="prod2">id</link> )? )</para></entry></row> <row> @@ -659,69 +663,69 @@ <row> <entry align="right" valign="top"><para><anchor id="prod29" xreflabel="criteria"/>criteria</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod77">compoundCritOr</link></para></entry></row> +<link linkend="prod78">compoundCritOr</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod77" xreflabel="compoundCritOr"/>compoundCritOr</para></entry> +<entry align="right" valign="top"><para><anchor id="prod78" xreflabel="compoundCritOr"/>compoundCritOr</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod78">compoundCritAnd</link> ( &lt;OR&gt; <link linkend="prod78">compoundCritAnd</link> )*</para></entry></row> +<link linkend="prod79">compoundCritAnd</link> ( &lt;OR&gt; <link linkend="prod79">compoundCritAnd</link> )*</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod78" xreflabel="compoundCritAnd"/>compoundCritAnd</para></entry> +<entry align="right" valign="top"><para><anchor id="prod79" xreflabel="compoundCritAnd"/>compoundCritAnd</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod79">notCrit</link> ( &lt;AND&gt; <link linkend="prod79">notCrit</link> )*</para></entry></row> +<link linkend="prod80">notCrit</link> ( &lt;AND&gt; <link linkend="prod80">notCrit</link> )*</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod79" xreflabel="notCrit"/>notCrit</para></entry> +<entry align="right" valign="top"><para><anchor id="prod80" xreflabel="notCrit"/>notCrit</para></entry> <entry align="left" valign="top"><para>::= -( &lt;NOT&gt; )? <link linkend="prod80">booleanPrimary</link></para></entry></row> +( &lt;NOT&gt; )? <link linkend="prod81">booleanPrimary</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod80" xreflabel="booleanPrimary"/>booleanPrimary</para></entry> +<entry align="right" valign="top"><para><anchor id="prod81" xreflabel="booleanPrimary"/>booleanPrimary</para></entry> <entry align="left" valign="top"><para>::= -( <link linkend="prod35">translateCriteria</link> | ( <link linkend="prod81">commonValueExpression</link> ( ( <link linkend="prod82">betweenCrit</link> | <link linkend="prod83">matchCrit</link> | <link linkend="prod84">setCrit</link> | <link linkend="prod85">isNullCrit</link> | <link linkend="prod86">subqueryCompareCriteria</link> | <link linkend="prod87">compareCrit</link> ) )? ) | <link linkend="prod88">existsCriteria</link> | <link linkend="prod31">hasCriteria</link> )</para></entry></row> +( <link linkend="prod35">translateCriteria</link> | ( <link linkend="prod82">commonValueExpression</link> ( ( <link linkend="prod83">betweenCrit</link> | <link linkend="prod84">matchCrit</link> | <link linkend="prod85">setCrit</link> | <link linkend="prod86">isNullCrit</link> | <link linkend="prod87">subqueryCompareCriteria</link> | <link linkend="prod88">compareCrit</link> ) )? ) | <link linkend="prod89">existsCriteria</link> | <link linkend="prod31">hasCriteria</link> )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod89" xreflabel="operator"/>operator</para></entry> +<entry align="right" valign="top"><para><anchor id="prod90" xreflabel="operator"/>operator</para></entry> <entry align="left" valign="top"><para>::= ( &lt;EQ&gt; | &lt;NE&gt; | &lt;NE2&gt; | &lt;LT&gt; | &lt;LE&gt; | &lt;GT&gt; | &lt;GE&gt; )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod87" xreflabel="compareCrit"/>compareCrit</para></entry> +<entry align="right" valign="top"><para><anchor id="prod88" xreflabel="compareCrit"/>compareCrit</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod89">operator</link> <link linkend="prod81">commonValueExpression</link></para></entry></row> +<link linkend="prod90">operator</link> <link linkend="prod82">commonValueExpression</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod90" xreflabel="subquery"/>subquery</para></entry> +<entry align="right" valign="top"><para><anchor id="prod91" xreflabel="subquery"/>subquery</para></entry> <entry align="left" valign="top"><para>::= -&lt;LPAREN&gt; ( <link linkend="prod7">queryExpression</link> | <link linkend="prod8">storedProcedure</link> ) &lt;RPAREN&gt;</para></entry></row> +&lt;LPAREN&gt; ( <link linkend="prod7">queryExpression</link> | ( <link linkend="prod8">storedProcedure</link> ) ) &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod86" xreflabel="subqueryCompareCriteria"/>subqueryCompareCriteria</para></entry> +<entry align="right" valign="top"><para><anchor id="prod87" xreflabel="subqueryCompareCriteria"/>subqueryCompareCriteria</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod89">operator</link> ( &lt;ANY&gt; | &lt;SOME&gt; | &lt;ALL&gt; ) <link linkend="prod90">subquery</link></para></entry></row> +<link linkend="prod90">operator</link> ( &lt;ANY&gt; | &lt;SOME&gt; | &lt;ALL&gt; ) <link linkend="prod91">subquery</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod83" xreflabel="matchCrit"/>matchCrit</para></entry> +<entry align="right" valign="top"><para><anchor id="prod84" xreflabel="matchCrit"/>matchCrit</para></entry> <entry align="left" valign="top"><para>::= -( &lt;NOT&gt; )? &lt;LIKE&gt; <link linkend="prod81">commonValueExpression</link> ( &lt;ESCAPE&gt; <link linkend="prod72">charVal</link> | ( &lt;LBRACE&gt; &lt;ESCAPE&gt; <link linkend="prod72">charVal</link> &lt;RBRACE&gt; ) )?</para></entry></row> +( &lt;NOT&gt; )? &lt;LIKE&gt; <link linkend="prod82">commonValueExpression</link> ( &lt;ESCAPE&gt; <link linkend="prod61">charVal</link> | ( &lt;LBRACE&gt; &lt;ESCAPE&gt; <link linkend="prod61">charVal</link> &lt;RBRACE&gt; ) )?</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod72" xreflabel="charVal"/>charVal</para></entry> +<entry align="right" valign="top"><para><anchor id="prod61" xreflabel="charVal"/>charVal</para></entry> <entry align="left" valign="top"><para>::= <link linkend="prod1">stringVal</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod82" xreflabel="betweenCrit"/>betweenCrit</para></entry> +<entry align="right" valign="top"><para><anchor id="prod83" xreflabel="betweenCrit"/>betweenCrit</para></entry> <entry align="left" valign="top"><para>::= -( &lt;NOT&gt; )? &lt;BETWEEN&gt; <link linkend="prod81">commonValueExpression</link> &lt;AND&gt; <link linkend="prod81">commonValueExpression</link></para></entry></row> +( &lt;NOT&gt; )? &lt;BETWEEN&gt; <link linkend="prod82">commonValueExpression</link> &lt;AND&gt; <link linkend="prod82">commonValueExpression</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod85" xreflabel="isNullCrit"/>isNullCrit</para></entry> +<entry align="right" valign="top"><para><anchor id="prod86" xreflabel="isNullCrit"/>isNullCrit</para></entry> <entry align="left" valign="top"><para>::= &lt;IS&gt; ( &lt;NOT&gt; )? &lt;NULL&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod84" xreflabel="setCrit"/>setCrit</para></entry> +<entry align="right" valign="top"><para><anchor id="prod85" xreflabel="setCrit"/>setCrit</para></entry> <entry align="left" valign="top"><para>::= -( &lt;NOT&gt; )? &lt;IN&gt; ( ( <link linkend="prod90">subquery</link> ) | ( &lt;LPAREN&gt; <link linkend="prod81">commonValueExpression</link> ( &lt;COMMA&gt; <link linkend="prod81">commonValueExpression</link> )* &lt;RPAREN&gt; ) )</para></entry></row> +( &lt;NOT&gt; )? &lt;IN&gt; ( ( <link linkend="prod91">subquery</link> ) | ( &lt;LPAREN&gt; <link linkend="prod82">commonValueExpression</link> ( &lt;COMMA&gt; <link linkend="prod82">commonValueExpression</link> )* &lt;RPAREN&gt; ) )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod88" xreflabel="existsCriteria"/>existsCriteria</para></entry> +<entry align="right" valign="top"><para><anchor id="prod89" xreflabel="existsCriteria"/>existsCriteria</para></entry> <entry align="left" valign="top"><para>::= -&lt;EXISTS&gt; <link linkend="prod90">subquery</link></para></entry></row> +&lt;EXISTS&gt; <link linkend="prod91">subquery</link></para></entry></row> <row> <entry align="right" valign="top"><para><anchor id="prod53" xreflabel="groupBy"/>groupBy</para></entry> <entry align="left" valign="top"><para>::= -&lt;GROUP&gt; &lt;BY&gt; ( <link linkend="prod91">groupByItem</link> ( &lt;COMMA&gt; <link linkend="prod91">groupByItem</link> )* )</para></entry></row> +&lt;GROUP&gt; &lt;BY&gt; ( <link linkend="prod92">groupByItem</link> ( &lt;COMMA&gt; <link linkend="prod92">groupByItem</link> )* )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod91" xreflabel="groupByItem"/>groupByItem</para></entry> +<entry align="right" valign="top"><para><anchor id="prod92" xreflabel="groupByItem"/>groupByItem</para></entry> <entry align="left" valign="top"><para>::= <link linkend="prod17">expression</link></para></entry></row> <row> @@ -731,13 +735,13 @@ <row> <entry align="right" valign="top"><para><anchor id="prod46" xreflabel="orderby"/>orderby</para></entry> <entry align="left" valign="top"><para>::= -&lt;ORDER&gt; &lt;BY&gt; <link linkend="prod92">sortSpecification</link> ( &lt;COMMA&gt; <link linkend="prod92">sortSpecification</link> )*</para></entry></row> +&lt;ORDER&gt; &lt;BY&gt; <link linkend="prod93">sortSpecification</link> ( &lt;COMMA&gt; <link linkend="prod93">sortSpecification</link> )*</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod92" xreflabel="sortSpecification"/>sortSpecification</para></entry> +<entry align="right" valign="top"><para><anchor id="prod93" xreflabel="sortSpecification"/>sortSpecification</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod93">sortKey</link> ( &lt;ASC&gt; | &lt;DESC&gt; )? ( <link linkend="prod15">nonReserved</link> <link linkend="prod15">nonReserved</link> )?</para></entry></row> +<link linkend="prod94">sortKey</link> ( &lt;ASC&gt; | &lt;DESC&gt; )? ( <link linkend="prod15">nonReserved</link> <link linkend="prod15">nonReserved</link> )?</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod93" xreflabel="sortKey"/>sortKey</para></entry> +<entry align="right" valign="top"><para><anchor id="prod94" xreflabel="sortKey"/>sortKey</para></entry> <entry align="left" valign="top"><para>::= <link linkend="prod17">expression</link></para></entry></row> <row> @@ -753,71 +757,71 @@ <entry align="left" valign="top"><para>::= <link linkend="prod29">criteria</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod81" xreflabel="commonValueExpression"/>commonValueExpression</para></entry> +<entry align="right" valign="top"><para><anchor id="prod82" xreflabel="commonValueExpression"/>commonValueExpression</para></entry> <entry align="left" valign="top"><para>::= -( <link linkend="prod94">plusExpression</link> ( &lt;CONCAT_OP&gt; <link linkend="prod94">plusExpression</link> )* )</para></entry></row> +( <link linkend="prod95">plusExpression</link> ( &lt;CONCAT_OP&gt; <link linkend="prod95">plusExpression</link> )* )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod94" xreflabel="plusExpression"/>plusExpression</para></entry> +<entry align="right" valign="top"><para><anchor id="prod95" xreflabel="plusExpression"/>plusExpression</para></entry> <entry align="left" valign="top"><para>::= -( <link linkend="prod95">timesExpression</link> ( <link linkend="prod96">plusOperator</link> <link linkend="prod95">timesExpression</link> )* )</para></entry></row> +( <link linkend="prod96">timesExpression</link> ( <link linkend="prod97">plusOperator</link> <link linkend="prod96">timesExpression</link> )* )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod96" xreflabel="plusOperator"/>plusOperator</para></entry> +<entry align="right" valign="top"><para><anchor id="prod97" xreflabel="plusOperator"/>plusOperator</para></entry> <entry align="left" valign="top"><para>::= ( &lt;PLUS&gt; | &lt;MINUS&gt; )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod95" xreflabel="timesExpression"/>timesExpression</para></entry> +<entry align="right" valign="top"><para><anchor id="prod96" xreflabel="timesExpression"/>timesExpression</para></entry> <entry align="left" valign="top"><para>::= -( <link linkend="prod97">valueExpressionPrimary</link> ( <link linkend="prod98">timesOperator</link> <link linkend="prod97">valueExpressionPrimary</link> )* )</para></entry></row> +( <link linkend="prod98">valueExpressionPrimary</link> ( <link linkend="prod99">timesOperator</link> <link linkend="prod98">valueExpressionPrimary</link> )* )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod98" xreflabel="timesOperator"/>timesOperator</para></entry> +<entry align="right" valign="top"><para><anchor id="prod99" xreflabel="timesOperator"/>timesOperator</para></entry> <entry align="left" valign="top"><para>::= ( &lt;STAR&gt; | &lt;SLASH&gt; )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod97" xreflabel="valueExpressionPrimary"/>valueExpressionPrimary</para></entry> +<entry align="right" valign="top"><para><anchor id="prod98" xreflabel="valueExpressionPrimary"/>valueExpressionPrimary</para></entry> <entry align="left" valign="top"><para>::= -( &lt;QMARK&gt; | <link linkend="prod99">literal</link> | ( &lt;LBRACE&gt; <link linkend="prod15">nonReserved</link> <link linkend="prod100">function</link> &lt;RBRACE&gt; ) | ( <link linkend="prod60">aggregateSymbol</link> ) | ( <link linkend="prod60">aggregateSymbol</link> ) | ( <link linkend="prod60">aggregateSymbol</link> ) | ( <link linkend="prod59">xmlAgg</link> ) | ( <link linkend="prod100">function</link> ) | ( &lt;ID&gt; ) | <link linkend="prod90">subquery</link> | ( &lt;LPAREN&gt; <link linkend="prod17">expression</link> &lt;RPAREN&gt; ) | <link linkend="prod101">searchedCaseExpression</link> | <link linkend="prod102">caseExpression</link> )</para></entry></row> +( &lt;QMARK&gt; | <link linkend="prod100">literal</link> | ( &lt;LBRACE&gt; <link linkend="prod15">nonReserved</link> <link linkend="prod101">function</link> &lt;RBRACE&gt; ) | ( <link linkend="prod60">textAgg</link> ) | ( <link linkend="prod62">aggregateSymbol</link> ) | ( <link linkend="prod62">aggregateSymbol</link> ) | ( <link linkend="prod62">aggregateSymbol</link> ) | ( <link linkend="prod59">xmlAgg</link> ) | ( <link linkend="prod101">function</link> ) | ( &lt;ID&gt; ) | <link linkend="prod91">subquery</link> | ( &lt;LPAREN&gt; <link linkend="prod17">expression</link> &lt;RPAREN&gt; ) | <link linkend="prod102">searchedCaseExpression</link> | <link linkend="prod103">caseExpression</link> )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod102" xreflabel="caseExpression"/>caseExpression</para></entry> +<entry align="right" valign="top"><para><anchor id="prod103" xreflabel="caseExpression"/>caseExpression</para></entry> <entry align="left" valign="top"><para>::= &lt;CASE&gt; <link linkend="prod17">expression</link> ( &lt;WHEN&gt; <link linkend="prod17">expression</link> &lt;THEN&gt; <link linkend="prod17">expression</link> )+ ( &lt;ELSE&gt; <link linkend="prod17">expression</link> )? &lt;END&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod101" xreflabel="searchedCaseExpression"/>searchedCaseExpression</para></entry> +<entry align="right" valign="top"><para><anchor id="prod102" xreflabel="searchedCaseExpression"/>searchedCaseExpression</para></entry> <entry align="left" valign="top"><para>::= &lt;CASE&gt; ( &lt;WHEN&gt; <link linkend="prod29">criteria</link> &lt;THEN&gt; <link linkend="prod17">expression</link> )+ ( &lt;ELSE&gt; <link linkend="prod17">expression</link> )? &lt;END&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod100" xreflabel="function"/>function</para></entry> +<entry align="right" valign="top"><para><anchor id="prod101" xreflabel="function"/>function</para></entry> <entry align="left" valign="top"><para>::= -( ( &lt;CONVERT&gt; &lt;LPAREN&gt; <link linkend="prod17">expression</link> &lt;COMMA&gt; <link linkend="prod32">dataType</link> &lt;RPAREN&gt; ) | ( &lt;CAST&gt; &lt;LPAREN&gt; <link linkend="prod17">expression</link> &lt;AS&gt; <link linkend="prod32">dataType</link> &lt;RPAREN&gt; ) | ( <link linkend="prod15">nonReserved</link> &lt;LPAREN&gt; <link linkend="prod17">expression</link> &lt;COMMA&gt; <link linkend="prod103">stringConstant</link> &lt;RPAREN&gt; ) | ( <link linkend="prod15">nonReserved</link> &lt;LPAREN&gt; <link linkend="prod104">intervalType</link> &lt;COMMA&gt; <link linkend="prod17">expression</link> &lt;COMMA&gt; <link linkend="prod17">expression</link> &lt;RPAREN&gt; ) | <link linkend="prod105">queryString</link> | ( ( &lt;LEFT&gt; | &lt;RIGHT&gt; | &lt;CHAR&gt; | &lt;USER&gt; | &lt;YEAR&gt; | &lt;MONTH&gt; | &lt;HOUR&gt; | &lt;MINUTE&gt; | &lt;SECOND&gt; | &lt;XMLCONCAT&gt; | &lt;XMLCOMMENT&gt; ) &lt;LPAREN&gt; ( <link linkend="prod17">expression</link> ! ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )* )? &lt;RPAREN&gt; ) | ( ( &lt;INSERT&gt; ) &lt;LPAREN&gt; ( <link linkend="prod17">expression</link> ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )* )? &lt;RPAREN&gt; ) | ( ( &lt;TRANSLATE&gt; ) &lt;LPAREN&gt; ( <link linkend="prod17">expression</link> ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )* )? &lt;RPAREN&gt; ) | <link linkend="prod106">xmlParse</link> | <link linkend="prod107">xmlElement</link> | ( &lt;XMLPI&gt; &lt;LPAREN&gt; ( &lt;ID&gt; <link linkend="prod108">idExpression</link> | <link linkend="prod108">idExpression</link> ) ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )? &lt;RPAREN&gt; ) | <link linkend="prod109">xmlForest</link> | <link linkend="prod70">xmlSerialize</link> | <link linkend="prod74">xmlQuery</link> | ( <link linkend="prod2">id</link> &lt;LPAREN&gt; ( <link linkend="prod17">expression</link> ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )*! )? &lt;RPAREN&gt; ) )</para></entry></row> +( ( &lt;CONVERT&gt; &lt;LPAREN&gt; <link linkend="prod17">expression</link> &lt;COMMA&gt; <link linkend="prod32">dataType</link> &lt;RPAREN&gt; ) | ( &lt;CAST&gt; &lt;LPAREN&gt; <link linkend="prod17">expression</link> &lt;AS&gt; <link linkend="prod32">dataType</link> &lt;RPAREN&gt; ) | ( <link linkend="prod15">nonReserved</link> &lt;LPAREN&gt; <link linkend="prod17">expression</link> &lt;COMMA&gt; <link linkend="prod104">stringConstant</link> &lt;RPAREN&gt; ) | ( <link linkend="prod15">nonReserved</link> &lt;LPAREN&gt; <link linkend="prod105">intervalType</link> &lt;COMMA&gt; <link linkend="prod17">expression</link> &lt;COMMA&gt; <link linkend="prod17">expression</link> &lt;RPAREN&gt; ) | <link linkend="prod106">queryString</link> | ( ( &lt;LEFT&gt; | &lt;RIGHT&gt; | &lt;CHAR&gt; | &lt;USER&gt; | &lt;YEAR&gt; | &lt;MONTH&gt; | &lt;HOUR&gt; | &lt;MINUTE&gt; | &lt;SECOND&gt; | &lt;XMLCONCAT&gt; | &lt;XMLCOMMENT&gt; ) &lt;LPAREN&gt; ( <link linkend="prod17">expression</link> ! ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )* )? &lt;RPAREN&gt; ) | ( ( &lt;INSERT&gt; ) &lt;LPAREN&gt; ( <link linkend="prod17">expression</link> ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )* )? &lt;RPAREN&gt; ) | ( ( &lt;TRANSLATE&gt; ) &lt;LPAREN&gt; ( <link linkend="prod17">expression</link> ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )* )? &lt;RPAREN&gt; ) | <link linkend="prod107">xmlParse</link> | <link linkend="prod108">xmlElement</link> | ( &lt;XMLPI&gt; &lt;LPAREN&gt; ( &lt;ID&gt; <link linkend="prod109">idExpression</link> | <link linkend="prod109">idExpression</link> ) ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )? &lt;RPAREN&gt; ) | <link linkend="prod110">xmlForest</link> | <link linkend="prod72">xmlSerialize</link> | <link linkend="prod75">xmlQuery</link> | ( <link linkend="prod2">id</link> &lt;LPAREN&gt; ( <link linkend="prod17">expression</link> ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )*! )? &lt;RPAREN&gt; ) )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod103" xreflabel="stringConstant"/>stringConstant</para></entry> +<entry align="right" valign="top"><para><anchor id="prod104" xreflabel="stringConstant"/>stringConstant</para></entry> <entry align="left" valign="top"><para>::= <link linkend="prod1">stringVal</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod106" xreflabel="xmlParse"/>xmlParse</para></entry> +<entry align="right" valign="top"><para><anchor id="prod107" xreflabel="xmlParse"/>xmlParse</para></entry> <entry align="left" valign="top"><para>::= &lt;XMLPARSE&gt; &lt;LPAREN&gt; <link linkend="prod15">nonReserved</link> <link linkend="prod17">expression</link> ( <link linkend="prod15">nonReserved</link> )? &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod105" xreflabel="queryString"/>queryString</para></entry> +<entry align="right" valign="top"><para><anchor id="prod106" xreflabel="queryString"/>queryString</para></entry> <entry align="left" valign="top"><para>::= <link linkend="prod15">nonReserved</link> &lt;LPAREN&gt; <link linkend="prod17">expression</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod107" xreflabel="xmlElement"/>xmlElement</para></entry> +<entry align="right" valign="top"><para><anchor id="prod108" xreflabel="xmlElement"/>xmlElement</para></entry> <entry align="left" valign="top"><para>::= -&lt;XMLELEMENT&gt; &lt;LPAREN&gt; ( &lt;ID&gt; <link linkend="prod2">id</link> | <link linkend="prod2">id</link> ) ( &lt;COMMA&gt; <link linkend="prod75">xmlNamespaces</link> )? ( &lt;COMMA&gt; <link linkend="prod110">xmlAttributes</link> )? ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )* &lt;RPAREN&gt;</para></entry></row> +&lt;XMLELEMENT&gt; &lt;LPAREN&gt; ( &lt;ID&gt; <link linkend="prod2">id</link> | <link linkend="prod2">id</link> ) ( &lt;COMMA&gt; <link linkend="prod76">xmlNamespaces</link> )? ( &lt;COMMA&gt; <link linkend="prod111">xmlAttributes</link> )? ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )* &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod110" xreflabel="xmlAttributes"/>xmlAttributes</para></entry> +<entry align="right" valign="top"><para><anchor id="prod111" xreflabel="xmlAttributes"/>xmlAttributes</para></entry> <entry align="left" valign="top"><para>::= &lt;XMLATTRIBUTES&gt; &lt;LPAREN&gt; <link linkend="prod58">derivedColumn</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod109" xreflabel="xmlForest"/>xmlForest</para></entry> +<entry align="right" valign="top"><para><anchor id="prod110" xreflabel="xmlForest"/>xmlForest</para></entry> <entry align="left" valign="top"><para>::= -&lt;XMLFOREST&gt; &lt;LPAREN&gt; ( <link linkend="prod75">xmlNamespaces</link> &lt;COMMA&gt; )? <link linkend="prod58">derivedColumn</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* &lt;RPAREN&gt;</para></entry></row> +&lt;XMLFOREST&gt; &lt;LPAREN&gt; ( <link linkend="prod76">xmlNamespaces</link> &lt;COMMA&gt; )? <link linkend="prod58">derivedColumn</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod75" xreflabel="xmlNamespaces"/>xmlNamespaces</para></entry> +<entry align="right" valign="top"><para><anchor id="prod76" xreflabel="xmlNamespaces"/>xmlNamespaces</para></entry> <entry align="left" valign="top"><para>::= -&lt;XMLNAMESPACES&gt; &lt;LPAREN&gt; <link linkend="prod111">namespaceItem</link> ( &lt;COMMA&gt; <link linkend="prod111">namespaceItem</link> )* &lt;RPAREN&gt;</para></entry></row> +&lt;XMLNAMESPACES&gt; &lt;LPAREN&gt; <link linkend="prod112">namespaceItem</link> ( &lt;COMMA&gt; <link linkend="prod112">namespaceItem</link> )* &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod111" xreflabel="namespaceItem"/>namespaceItem</para></entry> +<entry align="right" valign="top"><para><anchor id="prod112" xreflabel="namespaceItem"/>namespaceItem</para></entry> <entry align="left" valign="top"><para>::= ( <link linkend="prod1">stringVal</link> &lt;AS&gt; <link linkend="prod2">id</link> )</para></entry></row> <row> @@ -829,7 +833,7 @@ <entry align="left" valign="top"><para>::= ( &lt;DEFAULT_KEYWORD&gt; <link linkend="prod1">stringVal</link> )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod108" xreflabel="idExpression"/>idExpression</para></entry> +<entry align="right" valign="top"><para><anchor id="prod109" xreflabel="idExpression"/>idExpression</para></entry> <entry align="left" valign="top"><para>::= <link linkend="prod2">id</link></para></entry></row> <row> @@ -837,11 +841,11 @@ <entry align="left" valign="top"><para>::= ( &lt;STRING&gt; | &lt;VARCHAR&gt; | &lt;BOOLEAN&gt; | &lt;BYTE&gt; | &lt;TINYINT&gt; | &lt;SHORT&gt; | &lt;SMALLINT&gt; | &lt;CHAR&gt; | &lt;INTEGER&gt; | &lt;LONG&gt; | &lt;BIGINT&gt; | &lt;BIGINTEGER&gt; | &lt;FLOAT&gt; | &lt;REAL&gt; | &lt;DOUBLE&gt; | &lt;BIGDECIMAL&gt; | &lt;DECIMAL&gt; | &lt;DATE&gt; | &lt;TIME&gt; | &lt;TIMESTAMP&gt; | &lt;OBJECT&gt; | &lt;BLOB&gt; | &lt;CLOB&gt; | &lt;XML&gt; )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod104" xreflabel="intervalType"/>intervalType</para></entry> +<entry align="right" valign="top"><para><anchor id="prod105" xreflabel="intervalType"/>intervalType</para></entry> <entry align="left" valign="top"><para>::= ( <link linkend="prod15">nonReserved</link> )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod99" xreflabel="literal"/>literal</para></entry> +<entry align="right" valign="top"><para><anchor id="prod100" xreflabel="literal"/>literal</para></entry> <entry align="left" valign="top"><para>::= ( <link linkend="prod1">stringVal</link> | &lt;INTEGERVAL&gt; | &lt;FLOATVAL&gt; | &lt;FALSE&gt; | &lt;TRUE&gt; | &lt;UNKNOWN&gt; | &lt;NULL&gt; | ( ( &lt;BOOLEANTYPE&gt; | &lt;TIMESTAMPTYPE&gt; | &lt;DATETYPE&gt; | &lt;TIMETYPE&gt; ) <link linkend="prod1">stringVal</link> &lt;RBRACE&gt; ) )</para></entry></row> </tbody> Modified: branches/7.2.x/documentation/reference/src/main/docbook/en-US/content/procedures.xml =================================================================== --- branches/7.2.x/documentation/reference/src/main/docbook/en-US/content/procedures.xml 2010-11-05 14:43:05 UTC (rev 2712) +++ branches/7.2.x/documentation/reference/src/main/docbook/en-US/content/procedures.xml 2010-11-05 15:02:21 UTC (rev 2713) @@ -552,11 +552,14 @@ </section> <section> <title>TRANSLATE CRITERIA</title> - <para>You can use the TRANSLATE CRITERIA clause to convert the criteria from the user application’s SQL command into the form required to interact with the target source or view tables. The TRANSLATE CRITERIA statement uses the SELECT transformation to infer the column mapping. This clause evaluates to a translated criteria that is evaluated in the context of a command.</para> + <warning><para>TRANSLATE CRITERIA has been deprecated. An alternative approach to update procedures will be introduced in a subsequent version.</para></warning> + <para>You can use the TRANSLATE CRITERIA clause to convert the criteria from the user application’s SQL command into the form required to interact with the target source or view tables. The TRANSLATE CRITERIA statement uses the SELECT transformation to infer the column mapping. This clause evaluates to a translated criteria that is evaluated in the context of a command. + You can use these mappings either to replace the default mappings generated from the SELECT transformation or to specify a reverse expression when a virtual column is defined by an expression.</para> <para> Usage: <synopsis>TRANSLATE [criteria operator] CRITERIA [ON (column list)] [WITH (mapping list)]</synopsis> </para> + <para>If there is no user criteria, then the translated criteria is always treated as TRUE.</para> <itemizedlist> <para>Syntax Rules</para> <listitem> @@ -571,9 +574,16 @@ <para>The columns in a TRANSLATE CRITERIA ON clause always refer to view columns. </para> </listitem> + <listitem> + <para>The WITH clause always has items with form &lt;elem&gt; = &lt;expression&gt; where the left hand side must refer to a view column. + </para> + </listitem> + <listitem> + <para>If the WITH clause or a specific mapping is not specified, then a mapping is created based on the SELECT clause of the SELECT transformation (the view column gets mapped to expression in SELECT clause at same position). + </para> + </listitem> </itemizedlist> - <para>You can use these mappings either to replace the default mappings generated from the SELECT transformation or to specify a reverse expression when a virtual column is defined by an expression.</para> - <para>Some samples of the HAS TRANSLATE clause:</para> + <para>Some samples of TRANSLATE CRITERIA:</para> <informaltable> <tgroup cols="2"> <colspec colwidth="1*"/> @@ -600,18 +610,7 @@ </tbody> </tgroup> </informaltable> - <para> - The TRANSLATE CRITERIA, ON clause always refers to view columns. - The WITH clause always has items with form &lt;elem&gt; = &lt;expression&gt;, - where the &lt;elem&gt; is a view column and the &lt;expression&gt; - specifies what that view column should be - replaced with when TRANSLATE CRITERIA translates the view - criteria (from UPDATE or DELETE) into a physical criteria in - the command. By default, a mapping is created based on the - SELECT clause of the SELECT transformation (view column - gets mapped to expression in SELECT clause at same - position). - </para> + <note><para>If a specific predicate type or column set is specified by TRANSALATE CRITERIA, but the user criteria has predicates that do not match, then an exception will be thrown.</para></note> </section> </section> <section> Modified: tags/teiid-parent-7.2.0.Final/build/kits/jboss-container/teiid-releasenotes.html =================================================================== --- tags/teiid-parent-7.2.0.Final/build/kits/jboss-container/teiid-releasenotes.html 2010-11-05 14:43:05 UTC (rev 2712) +++ tags/teiid-parent-7.2.0.Final/build/kits/jboss-container/teiid-releasenotes.html 2010-11-05 15:02:21 UTC (rev 2713) @@ -165,7 +165,293 @@ <h2><a name="Details">Detailed Release Notes</a></h2> Detailed Release Notes - Teiid - Version ${project.version} +<h2> Bug +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1168'>TEIID-1168</a>] - Query Testing - CLOB, LOB, etc is returning an object reference in CTC rather than returning the content of the object (content is needed for validation purposes) +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1218'>TEIID-1218</a>] - AdminShell help for changeVDBConnectionType is &quot;Cancel a request&quot; +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1219'>TEIID-1219</a>] - Metadata for XML Document models not being showing up after Admin API mergeVDB() call. +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1221'>TEIID-1221</a>] - Query Processing Uncorrelated subquery evaluation - Not saving state causing re-execution without closing prior connection +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1222'>TEIID-1222</a>] - Partially qualified unambiguous virtual procedure problem resolving inputs. +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1223'>TEIID-1223</a>] - Cache hint cannot be specified against set queries or callable statements +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1224'>TEIID-1224</a>] - Stored Procedures - java exception being thrown relating to pre-evaluation of uncorrelated subqueries +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1229'>TEIID-1229</a>] - In predicate issue with temp table composite key +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1230'>TEIID-1230</a>] - TeiidDriver is used instead of MetaMatrixDriver during connection to the MM Server +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1232'>TEIID-1232</a>] - Cannot create LDAP connection. +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1233'>TEIID-1233</a>] - VDB version from the file name is not being picked up +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1234'>TEIID-1234</a>] - Parameter ordering is incorrect +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1235'>TEIID-1235</a>] - The bind address 0.0.0.0 is always resolving to localhost +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1240'>TEIID-1240</a>] - Exception with false join predicate +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1243'>TEIID-1243</a>] - teiid admin console plugin cannot show dynamic VDB content +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1244'>TEIID-1244</a>] - JBoss AS admin console troubles with text based connection factory +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1245'>TEIID-1245</a>] - exception trying to get a test connection through admin console to a text file based connection factory +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1247'>TEIID-1247</a>] - Passthrough Authentication on JDBC Connection not switching identities +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1249'>TEIID-1249</a>] - VDB scoped cached results not checked for access +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1251'>TEIID-1251</a>] - Fully qualified order by key can resolve incorrectly +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1254'>TEIID-1254</a>] - Detect session scoped temp tables in setting determism +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1256'>TEIID-1256</a>] - Clear caches when VDB with same version re-deployed +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1257'>TEIID-1257</a>] - Teiid creates multiple &quot;buffer&quot; directories +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1266'>TEIID-1266</a>] - jboss-log4j.xml - after modified by installing teiid - references org.apache.log4j.RollingFileAppender +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1269'>TEIID-1269</a>] - Closing connections to Teiid may result in a stack trace written to the server&#39;s log file +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1270'>TEIID-1270</a>] - adminshell - getAdmin() returns: ERROR org.teiid.core.TeiidRuntimeException: toString +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1274'>TEIID-1274</a>] - NPE during the execution of query when a wrong JNDI name supplied +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1276'>TEIID-1276</a>] - Updating an existing VDB via copy-paste in the filesystem causes ConcurrentModificationException +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1278'>TEIID-1278</a>] - vdb-deployer.xsd should have a description for translators. +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1279'>TEIID-1279</a>] - Got an Unexpected exception when starting the server, after digging, I think the message should have indicated that the UDF requires static methods +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1283'>TEIID-1283</a>] - Race condition results in bad resultset for query on union +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1286'>TEIID-1286</a>] - Invalid Link in Teiid Developer Guide +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1289'>TEIID-1289</a>] - hasNext causes indexing issue +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1290'>TEIID-1290</a>] - Application name is null in JOPR +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1292'>TEIID-1292</a>] - Invalid Fetch Size using JDBC ODBC bridge to query MS Access via a Teiid VDB +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1297'>TEIID-1297</a>] - Missing message key when no result for executed system procedure: &quot;Request.no_result_set&quot; in: org.teiid.query.i18n +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1298'>TEIID-1298</a>] - invalid links in Teiid Client Developer Guide +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1302'>TEIID-1302</a>] - Selecting data from salesforce results in a IndexOutOfBoundsException +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1303'>TEIID-1303</a>] - Sybase issues +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1305'>TEIID-1305</a>] - Problem executing an ORDER BY against the ModeShape data source +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1307'>TEIID-1307</a>] - Client Dev Guide - repeated property in tables for Driver &amp; Datasource +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1310'>TEIID-1310</a>] - SYS.VDBResources table is set as a non-system-owned table - should be isSystem = true +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1313'>TEIID-1313</a>] - Possible duplicate rows at when using nested table feature. When using TABLE or XMLTABLE or TEXTTABLE. +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1315'>TEIID-1315</a>] - Teiid misinterprets relative location of XSD when doc model is in different folder: causes Unknown Query Metadata error +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1316'>TEIID-1316</a>] - XML encoding of a blob is not properly detected. +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1317'>TEIID-1317</a>] - Limit keyword causes class cast exception running query against DB2 translator +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1318'>TEIID-1318</a>] - Adminshell: Accessing VDB version results in exception: Connector worker process failed for atomic-request +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1319'>TEIID-1319</a>] - Incorrect format for postgres timestamp to string +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1320'>TEIID-1320</a>] - Oracle datetime columns as timestamp have invalid tostring +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1321'>TEIID-1321</a>] - Error message when connecting to missing VDB is misleading (makes it sound like it exists) +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1322'>TEIID-1322</a>] - Stored procedures are not pre-evaluating scalar subquery arguments. +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1325'>TEIID-1325</a>] - Teiid Admin connection re-connect fails every time +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1333'>TEIID-1333</a>] - Dynamic VDB can be set to ACTIVE, even when the data source is not available. +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1334'>TEIID-1334</a>] - java.net.URISyntaxException starting jboss-soa-p-5 (i.e. with Teiid) installed on LINUX under folder name containing spaces +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1336'>TEIID-1336</a>] - EDS adminshell - clearCache() having no effect +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1337'>TEIID-1337</a>] - Cached costing needs cleared more completely +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1340'>TEIID-1340</a>] - Unable to delete vdb using JOPR, throws exception +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1342'>TEIID-1342</a>] - NPE in RuntimeEngineDeployer Starting JBossAS +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1345'>TEIID-1345</a>] - VDB with even one data role requires all users to have at least one mappable role +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1346'>TEIID-1346</a>] - Rewrite is wrong with translate criteria and no user criteria +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1347'>TEIID-1347</a>] - Configuration Update for Teiid Engine Should Look for compName Instead of Name +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1348'>TEIID-1348</a>] - Internal Mat View of table with Primary Key gets duplicate key error when populating temporary mat view table +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1156'>TEIID-1156</a>] - Description fields for UDF Model objects are limited to 128 characters +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1205'>TEIID-1205</a>] - First deployment of weather example fails to query and requires restarting JBoss AS (weather does not exist) +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1232'>TEIID-1232</a>] - Cannot create LDAP connection. +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1247'>TEIID-1247</a>] - Passthrough Authentication on JDBC Connection not switching identities +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1295'>TEIID-1295</a>] - Multisource updates affecting multiple sources returns wrong update count +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1296'>TEIID-1296</a>] - Multi-Source may not be wrapping the transactional scope correctly +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1308'>TEIID-1308</a>] - Multi-source vdb table&#39;s metadata does not report the implicit &quot;source_name&quot; column +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1309'>TEIID-1309</a>] - The engine should validate against using an insert with a query expression in a multisource scenario. +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1346'>TEIID-1346</a>] - Rewrite is wrong with translate criteria and no user criteria +</li> +</ul> + +<h2> Feature Request +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/browse/TEIID-951'>TEIID-951</a>] - Add/Verify ipv6 readiness +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-982'>TEIID-982</a>] - Materialized Views should be treated as a service in MMx through the Console +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1030'>TEIID-1030</a>] - Provide ability to retrieve a VDB archive from ModeShape repository and then deploy the Teiid runtime. +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1103'>TEIID-1103</a>] - Add ability to configure transport settings for the ws resource adapter +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1104'>TEIID-1104</a>] - Teiid engine will be clusterable. +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1106'>TEIID-1106</a>] - Create the ModeShape connector to be used with the ModeShape jdbc driver to access the ModeShape JCR repository +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1138'>TEIID-1138</a>] - Add support to call binary web services +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1196'>TEIID-1196</a>] - Support Deployment of VDB via a URL in Jopr Plugin +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1204'>TEIID-1204</a>] - Re-enable failover support +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1209'>TEIID-1209</a>] - Add cache usage statistics +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1210'>TEIID-1210</a>] - Add support for non-unique indexes for materialized view tables +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1212'>TEIID-1212</a>] - Add replication for internal materialized view tables +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1213'>TEIID-1213</a>] - Procedure results should be cachable as well +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1215'>TEIID-1215</a>] - Add a performance tuning chapter to the admin guide +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1220'>TEIID-1220</a>] - Change Data Roles from a Global (server-wide) to a VDB-based property +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1225'>TEIID-1225</a>] - Reuse procedure plans +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1263'>TEIID-1263</a>] - Reference Guide Section 10.3.1.2 - No sample code for &quot;periodically checking the result object for new warnings&quot; +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-962'>TEIID-962</a>] - Create new system function to dump temp table contents to file. +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1171'>TEIID-1171</a>] - Add support for the with clause +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1237'>TEIID-1237</a>] - Stored procedures should allow for better use of inout/out/return values +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1250'>TEIID-1250</a>] - Allow usage of select expressions in order by, even with group by/distinct. +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1273'>TEIID-1273</a>] - Add support for using source_name with multisource INSERT Statements +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1288'>TEIID-1288</a>] - Add support for explicit table syntax +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1306'>TEIID-1306</a>] - Add support for JSON data sources (JSON translator, JSON-to-table mapping functions). +</li> +</ul> +<h2> Patch +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1285'>TEIID-1285</a>] - fixes from Data Services Platform version of the Teiid Developer Guide +</li> +</ul> + +<h2> Quality Risk +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/browse/TEIID-950'>TEIID-950</a>] - Add ability to control access to environment variables +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1027'>TEIID-1027</a>] - Clean up i18n files +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1202'>TEIID-1202</a>] - JOPR Console VDB View has couple usability issues +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1211'>TEIID-1211</a>] - Refine load-balancing support in AS +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1214'>TEIID-1214</a>] - The translators displayed in the JOPR console need a full description, not just Teiid Translator, because a 2 char. name (i.e., ws) with no description isn&#39;t clear +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1231'>TEIID-1231</a>] - Model visibility should only refer to whether entries are in metadata +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1238'>TEIID-1238</a>] - WS Connector config/configname should not be specific to ws-security +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1246'>TEIID-1246</a>] - Determine access strategy for SYS/pg_catalog +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1252'>TEIID-1252</a>] - LOB handling strategy issues +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1259'>TEIID-1259</a>] - Multi-line error message is difficult to follow +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1260'>TEIID-1260</a>] - All admin traffic should be encrypted by default +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1261'>TEIID-1261</a>] - Add documentation of transaction considerations +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1264'>TEIID-1264</a>] - Make &quot;build&quot; project manage all the responsibility of the assemblies +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1265'>TEIID-1265</a>] - Document the replacement approach for credentail maps +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1271'>TEIID-1271</a>] - Add more logging for pushdown decisions +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1272'>TEIID-1272</a>] - Join planning should make better decisions when mixing costing and unknown values +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1293'>TEIID-1293</a>] - subqueries should not allow select into +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1294'>TEIID-1294</a>] - procedure validation issues +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1312'>TEIID-1312</a>] - Default stored procedure params should not show up in string form +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-885'>TEIID-885</a>] - CTC vdbs should use appropriate capabilities +</li> +</ul> + +<h2> Task +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1236'>TEIID-1236</a>] - Provide sample DS.xml files for all the data sources that Teiid supports. +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1255'>TEIID-1255</a>] - Add documentation about usage of Multi-Source +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1258'>TEIID-1258</a>] - fixed formatting of translators.xml in reference guide +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1262'>TEIID-1262</a>] - Update Netty to 3.2.1 in the 7.1.x branch +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1277'>TEIID-1277</a>] - Add documentation/article about how to use the &quot;import web-service as relational model&quot; generated model. +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1284'>TEIID-1284</a>] - Need more detail in the Admin guide regarding data roles +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1299'>TEIID-1299</a>] - Remove un-implemented Admin API methods. +</li> +</ul> + +<h2> Thirdparty Change +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1314'>TEIID-1314</a>] - BigDecimal values truncated with jConnect 6.05 +</li> +</ul> + +<h2> Sub-task +</h2> +<ul> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1148'>TEIID-1148</a>] - Require the use of CXF +</li> +<li>[<a href='https://jira.jboss.org/browse/TEIID-1228'>TEIID-1228</a>] - Add JOPR data role display +</li> +</ul> + <h2><a name="Documentation">Documentation and Help</a></h2> The <a href="http://www.jboss.org/teiid/">Teiid community project</a> is hosted on jboss.org. Modified: tags/teiid-parent-7.2.0.Final/documentation/reference/src/main/docbook/en-US/content/grammar.xml =================================================================== --- tags/teiid-parent-7.2.0.Final/documentation/reference/src/main/docbook/en-US/content/grammar.xml 2010-11-05 14:43:05 UTC (rev 2712) +++ tags/teiid-parent-7.2.0.Final/documentation/reference/src/main/docbook/en-US/content/grammar.xml 2010-11-05 15:02:21 UTC (rev 2713) @@ -427,7 +427,7 @@ <row> <entry align="right" valign="top"><para><anchor id="prod22" xreflabel="delimitedStatement"/>delimitedStatement</para></entry> <entry align="left" valign="top"><para>::= -( <link linkend="prod23">sqlStatement</link> | <link linkend="prod16">errorStatement</link> | <link linkend="prod24">assignStatement</link> | <link linkend="prod25">declareStatement</link> | <link linkend="prod26">continueStatement</link> | <link linkend="prod27">breakStatement</link> ) &lt;SEMICOLON&gt;</para></entry></row> +( <link linkend="prod23">assignStatement</link> | <link linkend="prod24">sqlStatement</link> | <link linkend="prod16">errorStatement</link> | <link linkend="prod25">declareStatement</link> | <link linkend="prod26">continueStatement</link> | <link linkend="prod27">breakStatement</link> ) &lt;SEMICOLON&gt;</para></entry></row> <row> <entry align="right" valign="top"><para><anchor id="prod28" xreflabel="block"/>block</para></entry> <entry align="left" valign="top"><para>::= @@ -463,19 +463,19 @@ <row> <entry align="right" valign="top"><para><anchor id="prod25" xreflabel="declareStatement"/>declareStatement</para></entry> <entry align="left" valign="top"><para>::= -&lt;DECLARE&gt; <link linkend="prod32">dataType</link> <link linkend="prod2">id</link> ( &lt;EQ&gt; <link linkend="prod33">assignStatementOperand</link> )?</para></entry></row> +&lt;DECLARE&gt; <link linkend="prod32">dataType</link> <link linkend="prod2">id</link> ( ( <link linkend="prod15">nonReserved</link> | &lt;EQ&gt; ) <link linkend="prod33">assignStatementOperand</link> )?</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod24" xreflabel="assignStatement"/>assignStatement</para></entry> +<entry align="right" valign="top"><para><anchor id="prod23" xreflabel="assignStatement"/>assignStatement</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod2">id</link> &lt;EQ&gt; <link linkend="prod33">assignStatementOperand</link></para></entry></row> +<link linkend="prod2">id</link> ( <link linkend="prod15">nonReserved</link> | &lt;EQ&gt; ) <link linkend="prod33">assignStatementOperand</link></para></entry></row> <row> <entry align="right" valign="top"><para><anchor id="prod33" xreflabel="assignStatementOperand"/>assignStatementOperand</para></entry> <entry align="left" valign="top"><para>::= -( ( <link linkend="prod9">insert</link> ) | <link linkend="prod10">update</link> | <link linkend="prod11">delete</link> | <link linkend="prod8">storedProcedure</link> | ( <link linkend="prod17">expression</link> ) | <link linkend="prod7">queryExpression</link> )</para></entry></row> +( ( <link linkend="prod9">insert</link> ) | <link linkend="prod10">update</link> | <link linkend="prod11">delete</link> | ( <link linkend="prod17">expression</link> ) | <link linkend="prod7">queryExpression</link> )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod23" xreflabel="sqlStatement"/>sqlStatement</para></entry> +<entry align="right" valign="top"><para><anchor id="prod24" xreflabel="sqlStatement"/>sqlStatement</para></entry> <entry align="left" valign="top"><para>::= -( ( <link linkend="prod34">dynamicCommand</link> ) | <link linkend="prod5">userCommand</link> )</para></entry></row> +( ( <link linkend="prod5">userCommand</link> ) | <link linkend="prod34">dynamicCommand</link> | ( <link linkend="prod2">id</link> ( <link linkend="prod15">nonReserved</link> | &lt;EQ&gt; ) <link linkend="prod8">storedProcedure</link> ) )</para></entry></row> <row> <entry align="right" valign="top"><para><anchor id="prod35" xreflabel="translateCriteria"/>translateCriteria</para></entry> <entry align="left" valign="top"><para>::= @@ -487,7 +487,7 @@ <row> <entry align="right" valign="top"><para><anchor id="prod34" xreflabel="dynamicCommand"/>dynamicCommand</para></entry> <entry align="left" valign="top"><para>::= -( &lt;EXECUTE&gt; | &lt;EXEC&gt; ) &lt;STRING&gt; <link linkend="prod17">expression</link> ( &lt;AS&gt; <link linkend="prod14">createElementsWithTypes</link> ( &lt;INTO&gt; <link linkend="prod2">id</link> )? )? ( &lt;USING&gt; <link linkend="prod36">setClauseList</link> )? ( &lt;UPDATE&gt; ( ( &lt;INTEGERVAL&gt; ) | ( &lt;STAR&gt; ) ) )?</para></entry></row> +( &lt;EXECUTE&gt; | &lt;EXEC&gt; ) ( ( &lt;STRING&gt; | &lt;IMMEDIATE&gt; ) )? <link linkend="prod17">expression</link> ( &lt;AS&gt; <link linkend="prod14">createElementsWithTypes</link> ( &lt;INTO&gt; <link linkend="prod2">id</link> )? )? ( &lt;USING&gt; <link linkend="prod36">setClauseList</link> )? ( &lt;UPDATE&gt; ( ( &lt;INTEGERVAL&gt; ) | ( &lt;STAR&gt; ) ) )?</para></entry></row> <row> <entry align="right" valign="top"><para><anchor id="prod36" xreflabel="setClauseList"/>setClauseList</para></entry> <entry align="left" valign="top"><para>::= @@ -585,35 +585,39 @@ <entry align="left" valign="top"><para>::= &lt;XMLAGG&gt; &lt;LPAREN&gt; <link linkend="prod17">expression</link> ( <link linkend="prod46">orderby</link> )? &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod60" xreflabel="aggregateSymbol"/>aggregateSymbol</para></entry> +<entry align="right" valign="top"><para><anchor id="prod60" xreflabel="textAgg"/>textAgg</para></entry> <entry align="left" valign="top"><para>::= +<link linkend="prod15">nonReserved</link> &lt;LPAREN&gt; &lt;FOR&gt; <link linkend="prod58">derivedColumn</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* ( &lt;ID&gt; <link linkend="prod61">charVal</link> )? ( ( &lt;ID&gt; <link linkend="prod61">charVal</link> ) )? ( &lt;ID&gt; )? ( ( &lt;ID&gt; <link linkend="prod2">id</link> ) )? ( <link linkend="prod46">orderby</link> )? &lt;RPAREN&gt;</para></entry></row> +<row> +<entry align="right" valign="top"><para><anchor id="prod62" xreflabel="aggregateSymbol"/>aggregateSymbol</para></entry> +<entry align="left" valign="top"><para>::= ( ( <link linkend="prod15">nonReserved</link> &lt;LPAREN&gt; &lt;STAR&gt; &lt;RPAREN&gt; ) | ( ( <link linkend="prod15">nonReserved</link> | &lt;ANY&gt; | &lt;SOME&gt; ) &lt;LPAREN&gt; ( &lt;DISTINCT&gt; | &lt;ALL&gt; )? <link linkend="prod17">expression</link> &lt;RPAREN&gt; ) )</para></entry></row> <row> <entry align="right" valign="top"><para><anchor id="prod52" xreflabel="from"/>from</para></entry> <entry align="left" valign="top"><para>::= -&lt;FROM&gt; ( <link linkend="prod61">tableReference</link> ( &lt;COMMA&gt; <link linkend="prod61">tableReference</link> )* )</para></entry></row> +&lt;FROM&gt; ( <link linkend="prod63">tableReference</link> ( &lt;COMMA&gt; <link linkend="prod63">tableReference</link> )* )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod61" xreflabel="tableReference"/>tableReference</para></entry> +<entry align="right" valign="top"><para><anchor id="prod63" xreflabel="tableReference"/>tableReference</para></entry> <entry align="left" valign="top"><para>::= -( ( &lt;LBRACE&gt; <link linkend="prod15">nonReserved</link> <link linkend="prod62">joinedTable</link> &lt;RBRACE&gt; ) | <link linkend="prod62">joinedTable</link> )</para></entry></row> +( ( &lt;LBRACE&gt; <link linkend="prod15">nonReserved</link> <link linkend="prod64">joinedTable</link> &lt;RBRACE&gt; ) | <link linkend="prod64">joinedTable</link> )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod62" xreflabel="joinedTable"/>joinedTable</para></entry> +<entry align="right" valign="top"><para><anchor id="prod64" xreflabel="joinedTable"/>joinedTable</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod63">tablePrimary</link> ( ( <link linkend="prod64">crossJoin</link> | <link linkend="prod65">qualifiedJoin</link> ) )*</para></entry></row> +<link linkend="prod65">tablePrimary</link> ( ( <link linkend="prod66">crossJoin</link> | <link linkend="prod67">qualifiedJoin</link> ) )*</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod64" xreflabel="crossJoin"/>crossJoin</para></entry> +<entry align="right" valign="top"><para><anchor id="prod66" xreflabel="crossJoin"/>crossJoin</para></entry> <entry align="left" valign="top"><para>::= -( ( &lt;CROSS&gt; | &lt;UNION&gt; ) &lt;JOIN&gt; <link linkend="prod63">tablePrimary</link> )</para></entry></row> +( ( &lt;CROSS&gt; | &lt;UNION&gt; ) &lt;JOIN&gt; <link linkend="prod65">tablePrimary</link> )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod65" xreflabel="qualifiedJoin"/>qualifiedJoin</para></entry> +<entry align="right" valign="top"><para><anchor id="prod67" xreflabel="qualifiedJoin"/>qualifiedJoin</para></entry> <entry align="left" valign="top"><para>::= -( ( ( &lt;RIGHT&gt; ( &lt;OUTER&gt; )? ) | ( &lt;LEFT&gt; ( &lt;OUTER&gt; )? ) | ( &lt;FULL&gt; ( &lt;OUTER&gt; )? ) | &lt;INNER&gt; )? &lt;JOIN&gt; <link linkend="prod61">tableReference</link> &lt;ON&gt; <link linkend="prod29">criteria</link> )</para></entry></row> +( ( ( &lt;RIGHT&gt; ( &lt;OUTER&gt; )? ) | ( &lt;LEFT&gt; ( &lt;OUTER&gt; )? ) | ( &lt;FULL&gt; ( &lt;OUTER&gt; )? ) | &lt;INNER&gt; )? &lt;JOIN&gt; <link linkend="prod63">tableReference</link> &lt;ON&gt; <link linkend="prod29">criteria</link> )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod63" xreflabel="tablePrimary"/>tablePrimary</para></entry> +<entry align="right" valign="top"><para><anchor id="prod65" xreflabel="tablePrimary"/>tablePrimary</para></entry> <entry align="left" valign="top"><para>::= -( <link linkend="prod66">textTable</link> | <link linkend="prod67">xmlTable</link> | <link linkend="prod68">unaryFromClause</link> | <link linkend="prod69">subqueryFromClause</link> | ( &lt;LPAREN&gt; <link linkend="prod62">joinedTable</link> &lt;RPAREN&gt; ) ) ( ( &lt;MAKEDEP&gt; ) | ( &lt;MAKENOTDEP&gt; ) )?</para></entry></row> +( <link linkend="prod68">textTable</link> | <link linkend="prod69">xmlTable</link> | <link linkend="prod70">unaryFromClause</link> | <link linkend="prod71">subqueryFromClause</link> | ( &lt;LPAREN&gt; <link linkend="prod64">joinedTable</link> &lt;RPAREN&gt; ) ) ( ( &lt;MAKEDEP&gt; ) | ( &lt;MAKENOTDEP&gt; ) )?</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod70" xreflabel="xmlSerialize"/>xmlSerialize</para></entry> +<entry align="right" valign="top"><para><anchor id="prod72" xreflabel="xmlSerialize"/>xmlSerialize</para></entry> <entry align="left" valign="top"><para>::= &lt;XMLSERIALIZE&gt; &lt;LPAREN&gt; ( <link linkend="prod15">nonReserved</link> )? <link linkend="prod17">expression</link> ( &lt;AS&gt; ( &lt;STRING&gt; | &lt;VARCHAR&gt; | &lt;CLOB&gt; ) )? &lt;RPAREN&gt;</para></entry></row> <row> @@ -621,35 +625,35 @@ <entry align="left" valign="top"><para>::= &lt;ID&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod66" xreflabel="textTable"/>textTable</para></entry> +<entry align="right" valign="top"><para><anchor id="prod68" xreflabel="textTable"/>textTable</para></entry> <entry align="left" valign="top"><para>::= -&lt;ID&gt; &lt;LPAREN&gt; <link linkend="prod17">expression</link> <link linkend="prod15">nonReserved</link> <link linkend="prod71">textColumn</link> ( &lt;COMMA&gt; <link linkend="prod71">textColumn</link> )* ( &lt;ID&gt; <link linkend="prod72">charVal</link> )? ( ( &lt;ESCAPE&gt; <link linkend="prod72">charVal</link> ) | ( &lt;ID&gt; <link linkend="prod72">charVal</link> ) )? ( &lt;ID&gt; ( <link linkend="prod73">intVal</link> )? )? ( &lt;ID&gt; <link linkend="prod73">intVal</link> )? &lt;RPAREN&gt; ( &lt;AS&gt; )? <link linkend="prod2">id</link></para></entry></row> +&lt;ID&gt; &lt;LPAREN&gt; <link linkend="prod17">expression</link> <link linkend="prod15">nonReserved</link> <link linkend="prod73">textColumn</link> ( &lt;COMMA&gt; <link linkend="prod73">textColumn</link> )* ( &lt;ID&gt; <link linkend="prod61">charVal</link> )? ( ( &lt;ESCAPE&gt; <link linkend="prod61">charVal</link> ) | ( &lt;ID&gt; <link linkend="prod61">charVal</link> ) )? ( &lt;ID&gt; ( <link linkend="prod74">intVal</link> )? )? ( &lt;ID&gt; <link linkend="prod74">intVal</link> )? &lt;RPAREN&gt; ( &lt;AS&gt; )? <link linkend="prod2">id</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod71" xreflabel="textColumn"/>textColumn</para></entry> +<entry align="right" valign="top"><para><anchor id="prod73" xreflabel="textColumn"/>textColumn</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod2">id</link> <link linkend="prod32">dataType</link> ( &lt;ID&gt; <link linkend="prod73">intVal</link> )?</para></entry></row> +<link linkend="prod2">id</link> <link linkend="prod32">dataType</link> ( &lt;ID&gt; <link linkend="prod74">intVal</link> )?</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod74" xreflabel="xmlQuery"/>xmlQuery</para></entry> +<entry align="right" valign="top"><para><anchor id="prod75" xreflabel="xmlQuery"/>xmlQuery</para></entry> <entry align="left" valign="top"><para>::= -&lt;XMLQUERY&gt; &lt;LPAREN&gt; ( <link linkend="prod75">xmlNamespaces</link> &lt;COMMA&gt; )? <link linkend="prod1">stringVal</link> ( &lt;ID&gt; <link linkend="prod58">derivedColumn</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* )? ( ( &lt;NULL&gt; | <link linkend="prod15">nonReserved</link> ) &lt;ON&gt; <link linkend="prod15">nonReserved</link> )? &lt;RPAREN&gt;</para></entry></row> +&lt;XMLQUERY&gt; &lt;LPAREN&gt; ( <link linkend="prod76">xmlNamespaces</link> &lt;COMMA&gt; )? <link linkend="prod1">stringVal</link> ( &lt;ID&gt; <link linkend="prod58">derivedColumn</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* )? ( ( &lt;NULL&gt; | <link linkend="prod15">nonReserved</link> ) &lt;ON&gt; <link linkend="prod15">nonReserved</link> )? &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod67" xreflabel="xmlTable"/>xmlTable</para></entry> +<entry align="right" valign="top"><para><anchor id="prod69" xreflabel="xmlTable"/>xmlTable</para></entry> <entry align="left" valign="top"><para>::= -&lt;XMLTABLE&gt; &lt;LPAREN&gt; ( <link linkend="prod75">xmlNamespaces</link> &lt;COMMA&gt; )? <link linkend="prod1">stringVal</link> ( &lt;ID&gt; <link linkend="prod58">derivedColumn</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* )? ( &lt;ID&gt; <link linkend="prod76">xmlColumn</link> ( &lt;COMMA&gt; <link linkend="prod76">xmlColumn</link> )* )? &lt;RPAREN&gt; ( &lt;AS&gt; )? <link linkend="prod2">id</link></para></entry></row> +&lt;XMLTABLE&gt; &lt;LPAREN&gt; ( <link linkend="prod76">xmlNamespaces</link> &lt;COMMA&gt; )? <link linkend="prod1">stringVal</link> ( &lt;ID&gt; <link linkend="prod58">derivedColumn</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* )? ( &lt;ID&gt; <link linkend="prod77">xmlColumn</link> ( &lt;COMMA&gt; <link linkend="prod77">xmlColumn</link> )* )? &lt;RPAREN&gt; ( &lt;AS&gt; )? <link linkend="prod2">id</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod76" xreflabel="xmlColumn"/>xmlColumn</para></entry> +<entry align="right" valign="top"><para><anchor id="prod77" xreflabel="xmlColumn"/>xmlColumn</para></entry> <entry align="left" valign="top"><para>::= <link linkend="prod2">id</link> ( ( &lt;FOR&gt; <link linkend="prod15">nonReserved</link> ) | ( <link linkend="prod32">dataType</link> ( &lt;DEFAULT_KEYWORD&gt; <link linkend="prod17">expression</link> )? ( <link linkend="prod15">nonReserved</link> <link linkend="prod1">stringVal</link> )? ) )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod73" xreflabel="intVal"/>intVal</para></entry> +<entry align="right" valign="top"><para><anchor id="prod74" xreflabel="intVal"/>intVal</para></entry> <entry align="left" valign="top"><para>::= &lt;INTEGERVAL&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod69" xreflabel="subqueryFromClause"/>subqueryFromClause</para></entry> +<entry align="right" valign="top"><para><anchor id="prod71" xreflabel="subqueryFromClause"/>subqueryFromClause</para></entry> <entry align="left" valign="top"><para>::= ( &lt;TABLE&gt; )? &lt;LPAREN&gt; ( <link linkend="prod7">queryExpression</link> | <link linkend="prod8">storedProcedure</link> ) &lt;RPAREN&gt; ( &lt;AS&gt; )? <link linkend="prod2">id</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod68" xreflabel="unaryFromClause"/>unaryFromClause</para></entry> +<entry align="right" valign="top"><para><anchor id="prod70" xreflabel="unaryFromClause"/>unaryFromClause</para></entry> <entry align="left" valign="top"><para>::= ( &lt;ID&gt; ( ( &lt;AS&gt; )? <link linkend="prod2">id</link> )? )</para></entry></row> <row> @@ -659,69 +663,69 @@ <row> <entry align="right" valign="top"><para><anchor id="prod29" xreflabel="criteria"/>criteria</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod77">compoundCritOr</link></para></entry></row> +<link linkend="prod78">compoundCritOr</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod77" xreflabel="compoundCritOr"/>compoundCritOr</para></entry> +<entry align="right" valign="top"><para><anchor id="prod78" xreflabel="compoundCritOr"/>compoundCritOr</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod78">compoundCritAnd</link> ( &lt;OR&gt; <link linkend="prod78">compoundCritAnd</link> )*</para></entry></row> +<link linkend="prod79">compoundCritAnd</link> ( &lt;OR&gt; <link linkend="prod79">compoundCritAnd</link> )*</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod78" xreflabel="compoundCritAnd"/>compoundCritAnd</para></entry> +<entry align="right" valign="top"><para><anchor id="prod79" xreflabel="compoundCritAnd"/>compoundCritAnd</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod79">notCrit</link> ( &lt;AND&gt; <link linkend="prod79">notCrit</link> )*</para></entry></row> +<link linkend="prod80">notCrit</link> ( &lt;AND&gt; <link linkend="prod80">notCrit</link> )*</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod79" xreflabel="notCrit"/>notCrit</para></entry> +<entry align="right" valign="top"><para><anchor id="prod80" xreflabel="notCrit"/>notCrit</para></entry> <entry align="left" valign="top"><para>::= -( &lt;NOT&gt; )? <link linkend="prod80">booleanPrimary</link></para></entry></row> +( &lt;NOT&gt; )? <link linkend="prod81">booleanPrimary</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod80" xreflabel="booleanPrimary"/>booleanPrimary</para></entry> +<entry align="right" valign="top"><para><anchor id="prod81" xreflabel="booleanPrimary"/>booleanPrimary</para></entry> <entry align="left" valign="top"><para>::= -( <link linkend="prod35">translateCriteria</link> | ( <link linkend="prod81">commonValueExpression</link> ( ( <link linkend="prod82">betweenCrit</link> | <link linkend="prod83">matchCrit</link> | <link linkend="prod84">setCrit</link> | <link linkend="prod85">isNullCrit</link> | <link linkend="prod86">subqueryCompareCriteria</link> | <link linkend="prod87">compareCrit</link> ) )? ) | <link linkend="prod88">existsCriteria</link> | <link linkend="prod31">hasCriteria</link> )</para></entry></row> +( <link linkend="prod35">translateCriteria</link> | ( <link linkend="prod82">commonValueExpression</link> ( ( <link linkend="prod83">betweenCrit</link> | <link linkend="prod84">matchCrit</link> | <link linkend="prod85">setCrit</link> | <link linkend="prod86">isNullCrit</link> | <link linkend="prod87">subqueryCompareCriteria</link> | <link linkend="prod88">compareCrit</link> ) )? ) | <link linkend="prod89">existsCriteria</link> | <link linkend="prod31">hasCriteria</link> )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod89" xreflabel="operator"/>operator</para></entry> +<entry align="right" valign="top"><para><anchor id="prod90" xreflabel="operator"/>operator</para></entry> <entry align="left" valign="top"><para>::= ( &lt;EQ&gt; | &lt;NE&gt; | &lt;NE2&gt; | &lt;LT&gt; | &lt;LE&gt; | &lt;GT&gt; | &lt;GE&gt; )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod87" xreflabel="compareCrit"/>compareCrit</para></entry> +<entry align="right" valign="top"><para><anchor id="prod88" xreflabel="compareCrit"/>compareCrit</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod89">operator</link> <link linkend="prod81">commonValueExpression</link></para></entry></row> +<link linkend="prod90">operator</link> <link linkend="prod82">commonValueExpression</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod90" xreflabel="subquery"/>subquery</para></entry> +<entry align="right" valign="top"><para><anchor id="prod91" xreflabel="subquery"/>subquery</para></entry> <entry align="left" valign="top"><para>::= -&lt;LPAREN&gt; ( <link linkend="prod7">queryExpression</link> | <link linkend="prod8">storedProcedure</link> ) &lt;RPAREN&gt;</para></entry></row> +&lt;LPAREN&gt; ( <link linkend="prod7">queryExpression</link> | ( <link linkend="prod8">storedProcedure</link> ) ) &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod86" xreflabel="subqueryCompareCriteria"/>subqueryCompareCriteria</para></entry> +<entry align="right" valign="top"><para><anchor id="prod87" xreflabel="subqueryCompareCriteria"/>subqueryCompareCriteria</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod89">operator</link> ( &lt;ANY&gt; | &lt;SOME&gt; | &lt;ALL&gt; ) <link linkend="prod90">subquery</link></para></entry></row> +<link linkend="prod90">operator</link> ( &lt;ANY&gt; | &lt;SOME&gt; | &lt;ALL&gt; ) <link linkend="prod91">subquery</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod83" xreflabel="matchCrit"/>matchCrit</para></entry> +<entry align="right" valign="top"><para><anchor id="prod84" xreflabel="matchCrit"/>matchCrit</para></entry> <entry align="left" valign="top"><para>::= -( &lt;NOT&gt; )? &lt;LIKE&gt; <link linkend="prod81">commonValueExpression</link> ( &lt;ESCAPE&gt; <link linkend="prod72">charVal</link> | ( &lt;LBRACE&gt; &lt;ESCAPE&gt; <link linkend="prod72">charVal</link> &lt;RBRACE&gt; ) )?</para></entry></row> +( &lt;NOT&gt; )? &lt;LIKE&gt; <link linkend="prod82">commonValueExpression</link> ( &lt;ESCAPE&gt; <link linkend="prod61">charVal</link> | ( &lt;LBRACE&gt; &lt;ESCAPE&gt; <link linkend="prod61">charVal</link> &lt;RBRACE&gt; ) )?</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod72" xreflabel="charVal"/>charVal</para></entry> +<entry align="right" valign="top"><para><anchor id="prod61" xreflabel="charVal"/>charVal</para></entry> <entry align="left" valign="top"><para>::= <link linkend="prod1">stringVal</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod82" xreflabel="betweenCrit"/>betweenCrit</para></entry> +<entry align="right" valign="top"><para><anchor id="prod83" xreflabel="betweenCrit"/>betweenCrit</para></entry> <entry align="left" valign="top"><para>::= -( &lt;NOT&gt; )? &lt;BETWEEN&gt; <link linkend="prod81">commonValueExpression</link> &lt;AND&gt; <link linkend="prod81">commonValueExpression</link></para></entry></row> +( &lt;NOT&gt; )? &lt;BETWEEN&gt; <link linkend="prod82">commonValueExpression</link> &lt;AND&gt; <link linkend="prod82">commonValueExpression</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod85" xreflabel="isNullCrit"/>isNullCrit</para></entry> +<entry align="right" valign="top"><para><anchor id="prod86" xreflabel="isNullCrit"/>isNullCrit</para></entry> <entry align="left" valign="top"><para>::= &lt;IS&gt; ( &lt;NOT&gt; )? &lt;NULL&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod84" xreflabel="setCrit"/>setCrit</para></entry> +<entry align="right" valign="top"><para><anchor id="prod85" xreflabel="setCrit"/>setCrit</para></entry> <entry align="left" valign="top"><para>::= -( &lt;NOT&gt; )? &lt;IN&gt; ( ( <link linkend="prod90">subquery</link> ) | ( &lt;LPAREN&gt; <link linkend="prod81">commonValueExpression</link> ( &lt;COMMA&gt; <link linkend="prod81">commonValueExpression</link> )* &lt;RPAREN&gt; ) )</para></entry></row> +( &lt;NOT&gt; )? &lt;IN&gt; ( ( <link linkend="prod91">subquery</link> ) | ( &lt;LPAREN&gt; <link linkend="prod82">commonValueExpression</link> ( &lt;COMMA&gt; <link linkend="prod82">commonValueExpression</link> )* &lt;RPAREN&gt; ) )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod88" xreflabel="existsCriteria"/>existsCriteria</para></entry> +<entry align="right" valign="top"><para><anchor id="prod89" xreflabel="existsCriteria"/>existsCriteria</para></entry> <entry align="left" valign="top"><para>::= -&lt;EXISTS&gt; <link linkend="prod90">subquery</link></para></entry></row> +&lt;EXISTS&gt; <link linkend="prod91">subquery</link></para></entry></row> <row> <entry align="right" valign="top"><para><anchor id="prod53" xreflabel="groupBy"/>groupBy</para></entry> <entry align="left" valign="top"><para>::= -&lt;GROUP&gt; &lt;BY&gt; ( <link linkend="prod91">groupByItem</link> ( &lt;COMMA&gt; <link linkend="prod91">groupByItem</link> )* )</para></entry></row> +&lt;GROUP&gt; &lt;BY&gt; ( <link linkend="prod92">groupByItem</link> ( &lt;COMMA&gt; <link linkend="prod92">groupByItem</link> )* )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod91" xreflabel="groupByItem"/>groupByItem</para></entry> +<entry align="right" valign="top"><para><anchor id="prod92" xreflabel="groupByItem"/>groupByItem</para></entry> <entry align="left" valign="top"><para>::= <link linkend="prod17">expression</link></para></entry></row> <row> @@ -731,13 +735,13 @@ <row> <entry align="right" valign="top"><para><anchor id="prod46" xreflabel="orderby"/>orderby</para></entry> <entry align="left" valign="top"><para>::= -&lt;ORDER&gt; &lt;BY&gt; <link linkend="prod92">sortSpecification</link> ( &lt;COMMA&gt; <link linkend="prod92">sortSpecification</link> )*</para></entry></row> +&lt;ORDER&gt; &lt;BY&gt; <link linkend="prod93">sortSpecification</link> ( &lt;COMMA&gt; <link linkend="prod93">sortSpecification</link> )*</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod92" xreflabel="sortSpecification"/>sortSpecification</para></entry> +<entry align="right" valign="top"><para><anchor id="prod93" xreflabel="sortSpecification"/>sortSpecification</para></entry> <entry align="left" valign="top"><para>::= -<link linkend="prod93">sortKey</link> ( &lt;ASC&gt; | &lt;DESC&gt; )? ( <link linkend="prod15">nonReserved</link> <link linkend="prod15">nonReserved</link> )?</para></entry></row> +<link linkend="prod94">sortKey</link> ( &lt;ASC&gt; | &lt;DESC&gt; )? ( <link linkend="prod15">nonReserved</link> <link linkend="prod15">nonReserved</link> )?</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod93" xreflabel="sortKey"/>sortKey</para></entry> +<entry align="right" valign="top"><para><anchor id="prod94" xreflabel="sortKey"/>sortKey</para></entry> <entry align="left" valign="top"><para>::= <link linkend="prod17">expression</link></para></entry></row> <row> @@ -753,71 +757,71 @@ <entry align="left" valign="top"><para>::= <link linkend="prod29">criteria</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod81" xreflabel="commonValueExpression"/>commonValueExpression</para></entry> +<entry align="right" valign="top"><para><anchor id="prod82" xreflabel="commonValueExpression"/>commonValueExpression</para></entry> <entry align="left" valign="top"><para>::= -( <link linkend="prod94">plusExpression</link> ( &lt;CONCAT_OP&gt; <link linkend="prod94">plusExpression</link> )* )</para></entry></row> +( <link linkend="prod95">plusExpression</link> ( &lt;CONCAT_OP&gt; <link linkend="prod95">plusExpression</link> )* )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod94" xreflabel="plusExpression"/>plusExpression</para></entry> +<entry align="right" valign="top"><para><anchor id="prod95" xreflabel="plusExpression"/>plusExpression</para></entry> <entry align="left" valign="top"><para>::= -( <link linkend="prod95">timesExpression</link> ( <link linkend="prod96">plusOperator</link> <link linkend="prod95">timesExpression</link> )* )</para></entry></row> +( <link linkend="prod96">timesExpression</link> ( <link linkend="prod97">plusOperator</link> <link linkend="prod96">timesExpression</link> )* )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod96" xreflabel="plusOperator"/>plusOperator</para></entry> +<entry align="right" valign="top"><para><anchor id="prod97" xreflabel="plusOperator"/>plusOperator</para></entry> <entry align="left" valign="top"><para>::= ( &lt;PLUS&gt; | &lt;MINUS&gt; )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod95" xreflabel="timesExpression"/>timesExpression</para></entry> +<entry align="right" valign="top"><para><anchor id="prod96" xreflabel="timesExpression"/>timesExpression</para></entry> <entry align="left" valign="top"><para>::= -( <link linkend="prod97">valueExpressionPrimary</link> ( <link linkend="prod98">timesOperator</link> <link linkend="prod97">valueExpressionPrimary</link> )* )</para></entry></row> +( <link linkend="prod98">valueExpressionPrimary</link> ( <link linkend="prod99">timesOperator</link> <link linkend="prod98">valueExpressionPrimary</link> )* )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod98" xreflabel="timesOperator"/>timesOperator</para></entry> +<entry align="right" valign="top"><para><anchor id="prod99" xreflabel="timesOperator"/>timesOperator</para></entry> <entry align="left" valign="top"><para>::= ( &lt;STAR&gt; | &lt;SLASH&gt; )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod97" xreflabel="valueExpressionPrimary"/>valueExpressionPrimary</para></entry> +<entry align="right" valign="top"><para><anchor id="prod98" xreflabel="valueExpressionPrimary"/>valueExpressionPrimary</para></entry> <entry align="left" valign="top"><para>::= -( &lt;QMARK&gt; | <link linkend="prod99">literal</link> | ( &lt;LBRACE&gt; <link linkend="prod15">nonReserved</link> <link linkend="prod100">function</link> &lt;RBRACE&gt; ) | ( <link linkend="prod60">aggregateSymbol</link> ) | ( <link linkend="prod60">aggregateSymbol</link> ) | ( <link linkend="prod60">aggregateSymbol</link> ) | ( <link linkend="prod59">xmlAgg</link> ) | ( <link linkend="prod100">function</link> ) | ( &lt;ID&gt; ) | <link linkend="prod90">subquery</link> | ( &lt;LPAREN&gt; <link linkend="prod17">expression</link> &lt;RPAREN&gt; ) | <link linkend="prod101">searchedCaseExpression</link> | <link linkend="prod102">caseExpression</link> )</para></entry></row> +( &lt;QMARK&gt; | <link linkend="prod100">literal</link> | ( &lt;LBRACE&gt; <link linkend="prod15">nonReserved</link> <link linkend="prod101">function</link> &lt;RBRACE&gt; ) | ( <link linkend="prod60">textAgg</link> ) | ( <link linkend="prod62">aggregateSymbol</link> ) | ( <link linkend="prod62">aggregateSymbol</link> ) | ( <link linkend="prod62">aggregateSymbol</link> ) | ( <link linkend="prod59">xmlAgg</link> ) | ( <link linkend="prod101">function</link> ) | ( &lt;ID&gt; ) | <link linkend="prod91">subquery</link> | ( &lt;LPAREN&gt; <link linkend="prod17">expression</link> &lt;RPAREN&gt; ) | <link linkend="prod102">searchedCaseExpression</link> | <link linkend="prod103">caseExpression</link> )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod102" xreflabel="caseExpression"/>caseExpression</para></entry> +<entry align="right" valign="top"><para><anchor id="prod103" xreflabel="caseExpression"/>caseExpression</para></entry> <entry align="left" valign="top"><para>::= &lt;CASE&gt; <link linkend="prod17">expression</link> ( &lt;WHEN&gt; <link linkend="prod17">expression</link> &lt;THEN&gt; <link linkend="prod17">expression</link> )+ ( &lt;ELSE&gt; <link linkend="prod17">expression</link> )? &lt;END&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod101" xreflabel="searchedCaseExpression"/>searchedCaseExpression</para></entry> +<entry align="right" valign="top"><para><anchor id="prod102" xreflabel="searchedCaseExpression"/>searchedCaseExpression</para></entry> <entry align="left" valign="top"><para>::= &lt;CASE&gt; ( &lt;WHEN&gt; <link linkend="prod29">criteria</link> &lt;THEN&gt; <link linkend="prod17">expression</link> )+ ( &lt;ELSE&gt; <link linkend="prod17">expression</link> )? &lt;END&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod100" xreflabel="function"/>function</para></entry> +<entry align="right" valign="top"><para><anchor id="prod101" xreflabel="function"/>function</para></entry> <entry align="left" valign="top"><para>::= -( ( &lt;CONVERT&gt; &lt;LPAREN&gt; <link linkend="prod17">expression</link> &lt;COMMA&gt; <link linkend="prod32">dataType</link> &lt;RPAREN&gt; ) | ( &lt;CAST&gt; &lt;LPAREN&gt; <link linkend="prod17">expression</link> &lt;AS&gt; <link linkend="prod32">dataType</link> &lt;RPAREN&gt; ) | ( <link linkend="prod15">nonReserved</link> &lt;LPAREN&gt; <link linkend="prod17">expression</link> &lt;COMMA&gt; <link linkend="prod103">stringConstant</link> &lt;RPAREN&gt; ) | ( <link linkend="prod15">nonReserved</link> &lt;LPAREN&gt; <link linkend="prod104">intervalType</link> &lt;COMMA&gt; <link linkend="prod17">expression</link> &lt;COMMA&gt; <link linkend="prod17">expression</link> &lt;RPAREN&gt; ) | <link linkend="prod105">queryString</link> | ( ( &lt;LEFT&gt; | &lt;RIGHT&gt; | &lt;CHAR&gt; | &lt;USER&gt; | &lt;YEAR&gt; | &lt;MONTH&gt; | &lt;HOUR&gt; | &lt;MINUTE&gt; | &lt;SECOND&gt; | &lt;XMLCONCAT&gt; | &lt;XMLCOMMENT&gt; ) &lt;LPAREN&gt; ( <link linkend="prod17">expression</link> ! ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )* )? &lt;RPAREN&gt; ) | ( ( &lt;INSERT&gt; ) &lt;LPAREN&gt; ( <link linkend="prod17">expression</link> ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )* )? &lt;RPAREN&gt; ) | ( ( &lt;TRANSLATE&gt; ) &lt;LPAREN&gt; ( <link linkend="prod17">expression</link> ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )* )? &lt;RPAREN&gt; ) | <link linkend="prod106">xmlParse</link> | <link linkend="prod107">xmlElement</link> | ( &lt;XMLPI&gt; &lt;LPAREN&gt; ( &lt;ID&gt; <link linkend="prod108">idExpression</link> | <link linkend="prod108">idExpression</link> ) ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )? &lt;RPAREN&gt; ) | <link linkend="prod109">xmlForest</link> | <link linkend="prod70">xmlSerialize</link> | <link linkend="prod74">xmlQuery</link> | ( <link linkend="prod2">id</link> &lt;LPAREN&gt; ( <link linkend="prod17">expression</link> ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )*! )? &lt;RPAREN&gt; ) )</para></entry></row> +( ( &lt;CONVERT&gt; &lt;LPAREN&gt; <link linkend="prod17">expression</link> &lt;COMMA&gt; <link linkend="prod32">dataType</link> &lt;RPAREN&gt; ) | ( &lt;CAST&gt; &lt;LPAREN&gt; <link linkend="prod17">expression</link> &lt;AS&gt; <link linkend="prod32">dataType</link> &lt;RPAREN&gt; ) | ( <link linkend="prod15">nonReserved</link> &lt;LPAREN&gt; <link linkend="prod17">expression</link> &lt;COMMA&gt; <link linkend="prod104">stringConstant</link> &lt;RPAREN&gt; ) | ( <link linkend="prod15">nonReserved</link> &lt;LPAREN&gt; <link linkend="prod105">intervalType</link> &lt;COMMA&gt; <link linkend="prod17">expression</link> &lt;COMMA&gt; <link linkend="prod17">expression</link> &lt;RPAREN&gt; ) | <link linkend="prod106">queryString</link> | ( ( &lt;LEFT&gt; | &lt;RIGHT&gt; | &lt;CHAR&gt; | &lt;USER&gt; | &lt;YEAR&gt; | &lt;MONTH&gt; | &lt;HOUR&gt; | &lt;MINUTE&gt; | &lt;SECOND&gt; | &lt;XMLCONCAT&gt; | &lt;XMLCOMMENT&gt; ) &lt;LPAREN&gt; ( <link linkend="prod17">expression</link> ! ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )* )? &lt;RPAREN&gt; ) | ( ( &lt;INSERT&gt; ) &lt;LPAREN&gt; ( <link linkend="prod17">expression</link> ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )* )? &lt;RPAREN&gt; ) | ( ( &lt;TRANSLATE&gt; ) &lt;LPAREN&gt; ( <link linkend="prod17">expression</link> ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )* )? &lt;RPAREN&gt; ) | <link linkend="prod107">xmlParse</link> | <link linkend="prod108">xmlElement</link> | ( &lt;XMLPI&gt; &lt;LPAREN&gt; ( &lt;ID&gt; <link linkend="prod109">idExpression</link> | <link linkend="prod109">idExpression</link> ) ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )? &lt;RPAREN&gt; ) | <link linkend="prod110">xmlForest</link> | <link linkend="prod72">xmlSerialize</link> | <link linkend="prod75">xmlQuery</link> | ( <link linkend="prod2">id</link> &lt;LPAREN&gt; ( <link linkend="prod17">expression</link> ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )*! )? &lt;RPAREN&gt; ) )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod103" xreflabel="stringConstant"/>stringConstant</para></entry> +<entry align="right" valign="top"><para><anchor id="prod104" xreflabel="stringConstant"/>stringConstant</para></entry> <entry align="left" valign="top"><para>::= <link linkend="prod1">stringVal</link></para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod106" xreflabel="xmlParse"/>xmlParse</para></entry> +<entry align="right" valign="top"><para><anchor id="prod107" xreflabel="xmlParse"/>xmlParse</para></entry> <entry align="left" valign="top"><para>::= &lt;XMLPARSE&gt; &lt;LPAREN&gt; <link linkend="prod15">nonReserved</link> <link linkend="prod17">expression</link> ( <link linkend="prod15">nonReserved</link> )? &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod105" xreflabel="queryString"/>queryString</para></entry> +<entry align="right" valign="top"><para><anchor id="prod106" xreflabel="queryString"/>queryString</para></entry> <entry align="left" valign="top"><para>::= <link linkend="prod15">nonReserved</link> &lt;LPAREN&gt; <link linkend="prod17">expression</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod107" xreflabel="xmlElement"/>xmlElement</para></entry> +<entry align="right" valign="top"><para><anchor id="prod108" xreflabel="xmlElement"/>xmlElement</para></entry> <entry align="left" valign="top"><para>::= -&lt;XMLELEMENT&gt; &lt;LPAREN&gt; ( &lt;ID&gt; <link linkend="prod2">id</link> | <link linkend="prod2">id</link> ) ( &lt;COMMA&gt; <link linkend="prod75">xmlNamespaces</link> )? ( &lt;COMMA&gt; <link linkend="prod110">xmlAttributes</link> )? ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )* &lt;RPAREN&gt;</para></entry></row> +&lt;XMLELEMENT&gt; &lt;LPAREN&gt; ( &lt;ID&gt; <link linkend="prod2">id</link> | <link linkend="prod2">id</link> ) ( &lt;COMMA&gt; <link linkend="prod76">xmlNamespaces</link> )? ( &lt;COMMA&gt; <link linkend="prod111">xmlAttributes</link> )? ( &lt;COMMA&gt; <link linkend="prod17">expression</link> )* &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod110" xreflabel="xmlAttributes"/>xmlAttributes</para></entry> +<entry align="right" valign="top"><para><anchor id="prod111" xreflabel="xmlAttributes"/>xmlAttributes</para></entry> <entry align="left" valign="top"><para>::= &lt;XMLATTRIBUTES&gt; &lt;LPAREN&gt; <link linkend="prod58">derivedColumn</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod109" xreflabel="xmlForest"/>xmlForest</para></entry> +<entry align="right" valign="top"><para><anchor id="prod110" xreflabel="xmlForest"/>xmlForest</para></entry> <entry align="left" valign="top"><para>::= -&lt;XMLFOREST&gt; &lt;LPAREN&gt; ( <link linkend="prod75">xmlNamespaces</link> &lt;COMMA&gt; )? <link linkend="prod58">derivedColumn</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* &lt;RPAREN&gt;</para></entry></row> +&lt;XMLFOREST&gt; &lt;LPAREN&gt; ( <link linkend="prod76">xmlNamespaces</link> &lt;COMMA&gt; )? <link linkend="prod58">derivedColumn</link> ( &lt;COMMA&gt; <link linkend="prod58">derivedColumn</link> )* &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod75" xreflabel="xmlNamespaces"/>xmlNamespaces</para></entry> +<entry align="right" valign="top"><para><anchor id="prod76" xreflabel="xmlNamespaces"/>xmlNamespaces</para></entry> <entry align="left" valign="top"><para>::= -&lt;XMLNAMESPACES&gt; &lt;LPAREN&gt; <link linkend="prod111">namespaceItem</link> ( &lt;COMMA&gt; <link linkend="prod111">namespaceItem</link> )* &lt;RPAREN&gt;</para></entry></row> +&lt;XMLNAMESPACES&gt; &lt;LPAREN&gt; <link linkend="prod112">namespaceItem</link> ( &lt;COMMA&gt; <link linkend="prod112">namespaceItem</link> )* &lt;RPAREN&gt;</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod111" xreflabel="namespaceItem"/>namespaceItem</para></entry> +<entry align="right" valign="top"><para><anchor id="prod112" xreflabel="namespaceItem"/>namespaceItem</para></entry> <entry align="left" valign="top"><para>::= ( <link linkend="prod1">stringVal</link> &lt;AS&gt; <link linkend="prod2">id</link> )</para></entry></row> <row> @@ -829,7 +833,7 @@ <entry align="left" valign="top"><para>::= ( &lt;DEFAULT_KEYWORD&gt; <link linkend="prod1">stringVal</link> )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod108" xreflabel="idExpression"/>idExpression</para></entry> +<entry align="right" valign="top"><para><anchor id="prod109" xreflabel="idExpression"/>idExpression</para></entry> <entry align="left" valign="top"><para>::= <link linkend="prod2">id</link></para></entry></row> <row> @@ -837,11 +841,11 @@ <entry align="left" valign="top"><para>::= ( &lt;STRING&gt; | &lt;VARCHAR&gt; | &lt;BOOLEAN&gt; | &lt;BYTE&gt; | &lt;TINYINT&gt; | &lt;SHORT&gt; | &lt;SMALLINT&gt; | &lt;CHAR&gt; | &lt;INTEGER&gt; | &lt;LONG&gt; | &lt;BIGINT&gt; | &lt;BIGINTEGER&gt; | &lt;FLOAT&gt; | &lt;REAL&gt; | &lt;DOUBLE&gt; | &lt;BIGDECIMAL&gt; | &lt;DECIMAL&gt; | &lt;DATE&gt; | &lt;TIME&gt; | &lt;TIMESTAMP&gt; | &lt;OBJECT&gt; | &lt;BLOB&gt; | &lt;CLOB&gt; | &lt;XML&gt; )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod104" xreflabel="intervalType"/>intervalType</para></entry> +<entry align="right" valign="top"><para><anchor id="prod105" xreflabel="intervalType"/>intervalType</para></entry> <entry align="left" valign="top"><para>::= ( <link linkend="prod15">nonReserved</link> )</para></entry></row> <row> -<entry align="right" valign="top"><para><anchor id="prod99" xreflabel="literal"/>literal</para></entry> +<entry align="right" valign="top"><para><anchor id="prod100" xreflabel="literal"/>literal</para></entry> <entry align="left" valign="top"><para>::= ( <link linkend="prod1">stringVal</link> | &lt;INTEGERVAL&gt; | &lt;FLOATVAL&gt; | &lt;FALSE&gt; | &lt;TRUE&gt; | &lt;UNKNOWN&gt; | &lt;NULL&gt; | ( ( &lt;BOOLEANTYPE&gt; | &lt;TIMESTAMPTYPE&gt; | &lt;DATETYPE&gt; | &lt;TIMETYPE&gt; ) <link linkend="prod1">stringVal</link> &lt;RBRACE&gt; ) )</para></entry></row> </tbody> Modified: tags/teiid-parent-7.2.0.Final/documentation/reference/src/main/docbook/en-US/content/procedures.xml =================================================================== --- tags/teiid-parent-7.2.0.Final/documentation/reference/src/main/docbook/en-US/content/procedures.xml 2010-11-05 14:43:05 UTC (rev 2712) +++ tags/teiid-parent-7.2.0.Final/documentation/reference/src/main/docbook/en-US/content/procedures.xml 2010-11-05 15:02:21 UTC (rev 2713) @@ -552,11 +552,14 @@ </section> <section> <title>TRANSLATE CRITERIA</title> - <para>You can use the TRANSLATE CRITERIA clause to convert the criteria from the user application’s SQL command into the form required to interact with the target source or view tables. The TRANSLATE CRITERIA statement uses the SELECT transformation to infer the column mapping. This clause evaluates to a translated criteria that is evaluated in the context of a command.</para> + <warning><para>TRANSLATE CRITERIA has been deprecated. An alternative approach to update procedures will be introduced in a subsequent version.</para></warning> + <para>You can use the TRANSLATE CRITERIA clause to convert the criteria from the user application’s SQL command into the form required to interact with the target source or view tables. The TRANSLATE CRITERIA statement uses the SELECT transformation to infer the column mapping. This clause evaluates to a translated criteria that is evaluated in the context of a command. + You can use these mappings either to replace the default mappings generated from the SELECT transformation or to specify a reverse expression when a virtual column is defined by an expression.</para> <para> Usage: <synopsis>TRANSLATE [criteria operator] CRITERIA [ON (column list)] [WITH (mapping list)]</synopsis> </para> + <para>If there is no user criteria, then the translated criteria is always treated as TRUE.</para> <itemizedlist> <para>Syntax Rules</para> <listitem> @@ -571,9 +574,16 @@ <para>The columns in a TRANSLATE CRITERIA ON clause always refer to view columns. </para> </listitem> + <listitem> + <para>The WITH clause always has items with form &lt;elem&gt; = &lt;expression&gt; where the left hand side must refer to a view column. + </para> + </listitem> + <listitem> + <para>If the WITH clause or a specific mapping is not specified, then a mapping is created based on the SELECT clause of the SELECT transformation (the view column gets mapped to expression in SELECT clause at same position). + </para> + </listitem> </itemizedlist> - <para>You can use these mappings either to replace the default mappings generated from the SELECT transformation or to specify a reverse expression when a virtual column is defined by an expression.</para> - <para>Some samples of the HAS TRANSLATE clause:</para> + <para>Some samples of TRANSLATE CRITERIA:</para> <informaltable> <tgroup cols="2"> <colspec colwidth="1*"/> @@ -600,18 +610,7 @@ </tbody> </tgroup> </informaltable> - <para> - The TRANSLATE CRITERIA, ON clause always refers to view columns. - The WITH clause always has items with form &lt;elem&gt; = &lt;expression&gt;, - where the &lt;elem&gt; is a view column and the &lt;expression&gt; - specifies what that view column should be - replaced with when TRANSLATE CRITERIA translates the view - criteria (from UPDATE or DELETE) into a physical criteria in - the command. By default, a mapping is created based on the - SELECT clause of the SELECT transformation (view column - gets mapped to expression in SELECT clause at same - position). - </para> + <note><para>If a specific predicate type or column set is specified by TRANSALATE CRITERIA, but the user criteria has predicates that do not match, then an exception will be thrown.</para></note> </section> </section> <section>