first statements version

Author: wumpz

src/main/java/net/sf/jsqlparser/parser/CCJSqlParserUtil.java

@@ -27,6 +27,7 @@
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.statement.Statement;
+import net.sf.jsqlparser.statement.Statements;
 
 /**
  * Toolfunctions to start and use JSqlParser.
@@ -83,6 +84,18 @@ public static Expression parseExpression(String expression) throws JSQLParserExc
 			throw new JSQLParserException(ex);
 		} 
 	}
+    
+    /**
+     * Parse a statement list.
+     */
+    public static Statements parseStatements(String sqls) throws JSQLParserException {
+		CCJSqlParser parser = new CCJSqlParser(new StringReader(sqls));
+		try {
+			return parser.Statements();
+		} catch (Exception ex) {
+			throw new JSQLParserException(ex);
+		} 
+	}
 
 	private CCJSqlParserUtil() {
 	}

src/main/java/net/sf/jsqlparser/statement/StatementVisitor.java

@@ -56,4 +56,6 @@ public interface StatementVisitor {
 	void visit(CreateView createView);
 
 	void visit(Alter alter);
+    
+    void visit(Statements stmts);
 }

src/main/java/net/sf/jsqlparser/statement/Statements.java

@@ -0,0 +1,54 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2014 JSQLParser
+ * %%
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation, either version 2.1 of the
+ * License, or (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Lesser Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Lesser Public
+ * License along with this program.  If not, see
+ * <http://www.gnu.org/licenses/lgpl-2.1.html>.
+ * #L%
+ */
+package net.sf.jsqlparser.statement;
+
+import java.util.List;
+
+/**
+ *
+ * @author toben
+ */
+public class Statements {
+
+    private List<Statement> statements;
+
+    public List<Statement> getStatements() {
+        return statements;
+    }
+
+    public void setStatements(List<Statement> statements) {
+        this.statements = statements;
+    }
+
+    public void accept(StatementVisitor statementVisitor) {
+        statementVisitor.visit(this);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder b = new StringBuilder();
+        for (Statement stmt : statements) {
+            b.append(stmt.toString()).append(";\n");
+        }
+        return b.toString();
+    }
+}

src/main/java/net/sf/jsqlparser/util/deparser/StatementDeParser.java

@@ -22,8 +22,10 @@
 package net.sf.jsqlparser.util.deparser;
 
 import java.util.Iterator;
+import net.sf.jsqlparser.statement.Statement;
 
 import net.sf.jsqlparser.statement.StatementVisitor;
+import net.sf.jsqlparser.statement.Statements;
 import net.sf.jsqlparser.statement.alter.Alter;
 import net.sf.jsqlparser.statement.create.index.CreateIndex;
 import net.sf.jsqlparser.statement.create.table.CreateTable;
@@ -117,12 +119,10 @@ public void visit(Select select) {
 			}
 		}
 		select.getSelectBody().accept(selectDeParser);
-
 	}
 
 	@Override
 	public void visit(Truncate truncate) {
-		// TODO Auto-generated method stub
 	}
 
 	@Override
@@ -148,4 +148,9 @@ public void setBuffer(StringBuilder buffer) {
 	public void visit(Alter alter) {
 
 	}
+
+    @Override
+    public void visit(Statements stmts) {
+        stmts.accept(this);
+    }
 }

src/main/javacc/net/sf/jsqlparser/parser/JSqlParserCC.jj

@@ -232,8 +232,16 @@ a configurable addition. One must rebuild JSqlParser with this new "Letterset".
 |   < #ADDITIONAL_LETTERS: ["ä","ö","ü","Ä","Ö","Ü","ß"] >
 }
 
+Statement Statement() : 
+{ Statement stm; } 
+{
+    stm = SingleStatement()
+    [";"]
+    <EOF>
+    { return stm; }
+}
 
-Statement Statement() :
+Statement SingleStatement() :
 { Statement stm;}
 {
 	(
@@ -245,7 +253,7 @@ Statement Statement() :
     |
     stm = Delete()
     |
-    stm =  Replace()
+    stm = Replace()
     |
 	stm = Alter()
 	|
@@ -262,9 +270,24 @@ Statement Statement() :
     |
     stm = Truncate()
     )
+    { return stm; }
+}
+
+Statements Statements() : 
+{ Statements stmts = new Statements();
+  List<Statement> list = new ArrayList<Statement>();
+  Statement stm; }
+{
+    stm = SingleStatement() { list.add(stm); }
+     (LOOKAHEAD(2) ";" stm = SingleStatement() { list.add(stm); } )*
+
     [";"]
     <EOF>
-    { return stm; }
+
+    {
+        stmts.setStatements(list);
+        return stmts;
+    }
 }
 
 Update Update():
@@ -1044,9 +1067,9 @@ OrderByElement OrderByElement():
 	columnReference = SimpleExpression()
     [<K_ASC> | (<K_DESC> { orderByElement.setAsc(false); } )  ]
     [<K_NULLS> ( 
-        [<K_FIRST> { orderByElement.setNullOrdering(OrderByElement.NullOrdering.NULLS_FIRST);  } ] | 
-        [<K_LAST> { orderByElement.setNullOrdering(OrderByElement.NullOrdering.NULLS_LAST);  } ] 
-        ) 
+        <K_FIRST> { orderByElement.setNullOrdering(OrderByElement.NullOrdering.NULLS_FIRST);  }  | 
+        <K_LAST> { orderByElement.setNullOrdering(OrderByElement.NullOrdering.NULLS_LAST);  }  
+        )?
     ]
 	{
     	orderByElement.setExpression(columnReference);

src/test/java/net/sf/jsqlparser/statement/StatementsTest.java

@@ -0,0 +1,52 @@
+package net.sf.jsqlparser.statement;
+
+import net.sf.jsqlparser.JSQLParserException;
+import net.sf.jsqlparser.parser.CCJSqlParserUtil;
+import net.sf.jsqlparser.statement.select.Select;
+import org.junit.After;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import static org.junit.Assert.*;
+
+/**
+ *
+ * @author toben
+ */
+public class StatementsTest {
+    
+    public StatementsTest() {
+    }
+    
+    @BeforeClass
+    public static void setUpClass() {
+    }
+    
+    @AfterClass
+    public static void tearDownClass() {
+    }
+    
+    @Before
+    public void setUp() {
+    }
+    
+    @After
+    public void tearDown() {
+    }
+
+    /**
+     * Test of toString method, of class Statements.
+     */
+    @Test
+    public void testStatements() throws JSQLParserException {
+        String sqls = "select * from mytable; select * from mytable2;";
+        Statements parseStatements = CCJSqlParserUtil.parseStatements(sqls);
+        
+        assertEquals("SELECT * FROM mytable;\nSELECT * FROM mytable2;\n", parseStatements.toString());
+        
+        assertTrue(parseStatements.getStatements().get(0) instanceof Select);
+        assertTrue(parseStatements.getStatements().get(1) instanceof Select);
+    }
+    
+}