removed PivotForColumn

JSQLParser · Aug 11, 2013 · 18904dd · 18904dd
1 parent 410a2d1
commit 18904dd
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj b/src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj
@@ -774,7 +774,7 @@ FunctionItem FunctionItem():
 
 
 
-List<Column> PivotForColumn():
+/* List<Column> PivotForColumn():
 {
     List<Column> columns = new ArrayList<Column>();
     Column column;
@@ -785,17 +785,20 @@ List<Column> PivotForColumn():
         columns.add(column);
         return columns;
     }
-}
+}*/
 
 List<Column> PivotForColumns():
 {
     List<Column> columns = new ArrayList<Column>();
     Column column;
 }
 {
-    "(" column = Column() { columns.add(column); }
-    ("," column = Column() { columns.add(column); } )*
-    ")"
+    (
+		("(" column = Column() { columns.add(column); }
+         ("," column = Column() { columns.add(column); } )*
+		 ")") 
+	| column = Column() { columns.add(column); }
+	)
     { return columns; }
 }
 
@@ -858,9 +861,10 @@ Pivot Pivot():
 }
 {
 	<K_PIVOT> "(" functionItems = PivotFunctionItems() <K_FOR>
-	( forColumns = PivotForColumn() | forColumns = PivotForColumns() )
+	forColumns = PivotForColumns()
 	<K_IN> "("
-	(LOOKAHEAD(3) singleInItems = PivotSingleInItems() | multiInItems = PivotMultiInItems() )
+	(LOOKAHEAD(3) singleInItems = PivotSingleInItems() 
+	| multiInItems = PivotMultiInItems() )
 	")"
 	")"
     {
@@ -883,7 +887,7 @@ PivotXml PivotXml():
 }
 {
 	<K_PIVOT> <K_XML> "(" functionItems = PivotFunctionItems() <K_FOR>
-	( forColumns = PivotForColumn() | forColumns = PivotForColumns() )
+	forColumns = PivotForColumns()
 	<K_IN> "("
 	(
 	    <K_ANY> { retval.setInAny(true); } |