fixes #777

Author: wumpz

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

@@ -70,7 +70,7 @@ public static Statement parse(InputStream is, String encoding) throws JSQLParser
     public static Expression parseExpression(String expression) throws JSQLParserException {
         return parseExpression(expression, true);
     }
-    
+
     public static Expression parseExpression(String expression, boolean allowPartialParse) throws JSQLParserException {
         CCJSqlParser parser = new CCJSqlParser(new StringProvider(expression));
         try {
@@ -124,4 +124,23 @@ public static Statements parseStatements(String sqls) throws JSQLParserException
         }
     }
 
+    public static void streamStatements(StatementListener listener, InputStream is, String encoding) throws JSQLParserException {
+        try {
+            CCJSqlParser parser = new CCJSqlParser(new StreamProvider(is, encoding));
+            while (true) {
+                Statement stmt = parser.SingleStatement();
+                listener.accept(stmt);
+                if (parser.getToken(1).kind == CCJSqlParserTokenManager.ST_SEMICOLON) {
+                    parser.getNextToken();
+                }
+
+                if (parser.getToken(1).kind == CCJSqlParserTokenManager.EOF) {
+                    break;
+                }
+            }
+        } catch (Exception ex) {
+            throw new JSQLParserException(ex);
+        }
+    }
+
 }

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

@@ -0,0 +1,39 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2019 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+/*
+ * Copyright (C) 2019 JSQLParser.
+ *
+ * This library 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 library 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
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301  USA
+ */
+package net.sf.jsqlparser.parser;
+
+import net.sf.jsqlparser.statement.Statement;
+
+/**
+ *
+ * @author Tobias Warneke ([email protected])
+ */
+public interface StatementListener {
+
+    void accept(Statement statement);
+}

src/test/java/net/sf/jsqlparser/parser/CCJSqlParserUtilTest.java

@@ -9,22 +9,23 @@
  */
 package net.sf.jsqlparser.parser;
 
+import java.io.ByteArrayInputStream;
+import java.io.StringReader;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
 import net.sf.jsqlparser.JSQLParserException;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.LongValue;
 import net.sf.jsqlparser.expression.Parenthesis;
 import net.sf.jsqlparser.expression.operators.arithmetic.Addition;
 import net.sf.jsqlparser.expression.operators.arithmetic.Multiplication;
 import net.sf.jsqlparser.schema.Column;
+import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.Statements;
 import org.junit.After;
 import org.junit.AfterClass;
 import static org.junit.Assert.*;
-
-import java.io.ByteArrayInputStream;
-import java.io.StringReader;
-import java.nio.charset.StandardCharsets;
-
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -81,12 +82,12 @@ public void testParseExpressionNonPartial() throws Exception {
 
     @Test(expected = JSQLParserException.class)
     public void testParseExpressionFromStringFail() throws Exception {
-         CCJSqlParserUtil.parse("whatever$");
+        CCJSqlParserUtil.parse("whatever$");
     }
 
     @Test(expected = JSQLParserException.class)
     public void testParseExpressionFromRaderFail() throws Exception {
-         CCJSqlParserUtil.parse(new StringReader("whatever$"));
+        CCJSqlParserUtil.parse(new StringReader("whatever$"));
     }
 
     @Test
@@ -103,19 +104,19 @@ public void testParseCondExpression() throws Exception {
 
     @Test(expected = JSQLParserException.class)
     public void testParseCondExpressionFail() throws Exception {
-       CCJSqlParserUtil.parseCondExpression(";");
+        CCJSqlParserUtil.parseCondExpression(";");
 
     }
 
     @Test(expected = JSQLParserException.class)
     public void testParseFromStreamFail() throws Exception {
-       CCJSqlParserUtil.parse(new ByteArrayInputStream("BLA".getBytes(StandardCharsets.UTF_8)));
+        CCJSqlParserUtil.parse(new ByteArrayInputStream("BLA".getBytes(StandardCharsets.UTF_8)));
 
     }
 
     @Test(expected = JSQLParserException.class)
     public void testParseFromStreamWithEncodingFail() throws Exception {
-       CCJSqlParserUtil.parse(new ByteArrayInputStream("BLA".getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8.name());
+        CCJSqlParserUtil.parse(new ByteArrayInputStream("BLA".getBytes(StandardCharsets.UTF_8)), StandardCharsets.UTF_8.name());
 
     }
 
@@ -160,14 +161,36 @@ public void testParseStatementsIssue691() throws Exception {
                 + "SELECT * FROM dual;\n", result.toString());
     }
 
+    @Test
+    public void testStreamStatementsIssue777() throws Exception {
+        final List<Statement> list = new ArrayList<>();
+
+        CCJSqlParserUtil.streamStatements(new StatementListener() {
+            @Override
+            public void accept(Statement statement) {
+                list.add(statement);
+            }
+        }, new ByteArrayInputStream(("select * from dual;\n"
+                + "select\n"
+                + "*\n"
+                + "from\n"
+                + "dual;\n"
+                + "\n"
+                + "-- some comment\n"
+                + "select *\n"
+                + "from dual;").getBytes(StandardCharsets.UTF_8)), "UTF-8");
+
+        assertEquals(list.size(), 3);
+    }
+
     @Test(expected = JSQLParserException.class)
     public void testParseStatementsFail() throws Exception {
-       CCJSqlParserUtil.parseStatements("select * from dual;WHATEVER!!");
+        CCJSqlParserUtil.parseStatements("select * from dual;WHATEVER!!");
     }
 
     @Test(expected = JSQLParserException.class)
     public void testParseASTFail() throws Exception {
-       CCJSqlParserUtil.parseAST("select * from dual;WHATEVER!!");
+        CCJSqlParserUtil.parseAST("select * from dual;WHATEVER!!");
     }
 
     @Test
@@ -180,14 +203,14 @@ public void testParseStatementsIssue691_2() throws Exception {
 
     @Test
     public void testParseStatementIssue742() throws Exception {
-        Statements result = CCJSqlParserUtil.parseStatements("CREATE TABLE `table_name` (\n" +
-                "  `id` bigint(20) NOT NULL AUTO_INCREMENT,\n" +
-                "  `another_column_id` bigint(20) NOT NULL COMMENT 'column id as sent by SYSTEM',\n" +
-                "  PRIMARY KEY (`id`),\n" +
-                "  UNIQUE KEY `uk_another_column_id` (`another_column_id`)\n" +
-                ")");
-        assertEquals("CREATE TABLE `table_name` (`id` bigint (20) NOT NULL AUTO_INCREMENT, `another_column_id` " +
-                "bigint (20) NOT NULL COMMENT 'column id as sent by SYSTEM', PRIMARY KEY (`id`), UNIQUE KEY `uk_another_column_id` " +
-                "(`another_column_id`));\n", result.toString());
+        Statements result = CCJSqlParserUtil.parseStatements("CREATE TABLE `table_name` (\n"
+                + "  `id` bigint(20) NOT NULL AUTO_INCREMENT,\n"
+                + "  `another_column_id` bigint(20) NOT NULL COMMENT 'column id as sent by SYSTEM',\n"
+                + "  PRIMARY KEY (`id`),\n"
+                + "  UNIQUE KEY `uk_another_column_id` (`another_column_id`)\n"
+                + ")");
+        assertEquals("CREATE TABLE `table_name` (`id` bigint (20) NOT NULL AUTO_INCREMENT, `another_column_id` "
+                + "bigint (20) NOT NULL COMMENT 'column id as sent by SYSTEM', PRIMARY KEY (`id`), UNIQUE KEY `uk_another_column_id` "
+                + "(`another_column_id`));\n", result.toString());
     }
 }