db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r1524432 - /db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
Date Wed, 18 Sep 2013 14:43:56 GMT
Author: rhillegas
Date: Wed Sep 18 14:43:56 2013
New Revision: 1524432

URL: http://svn.apache.org/r1524432
Log:
DERBY-3155: Remove spurious comma from grammar production for multiple WHEN [NOT] MATCHED
clauses in MERGE statement; tests ran cleanly on derby-3155-02-ag-fixParserWarning.diff.

Modified:
    db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj

Modified: db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj?rev=1524432&r1=1524431&r2=1524432&view=diff
==============================================================================
--- db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj (original)
+++ db/derby/code/trunk/java/engine/org/apache/derby/impl/sql/compile/sqlgrammar.jj Wed Sep
18 14:43:56 2013
@@ -3656,7 +3656,7 @@ matchingClauseList() throws StandardExce
     ArrayList<MatchingClauseNode>   matchingClauses = new ArrayList<MatchingClauseNode>();
 }
 {
-    matchingClause( matchingClauses ) ( <COMMA> matchingClause( matchingClauses ) )
*
+    matchingClause( matchingClauses ) ( matchingClause( matchingClauses ) ) *
 	{
         return matchingClauses;
 	}



Mime
View raw message