Merge origin/master

Author: wumpz

README.md

@@ -60,6 +60,8 @@ Also I would like to know about needed examples or documentation stuff.
 
 ## Extensions in the latest SNAPSHOT version 2.1
 
+* introduces Statement streaming support by **CCJSqlParserUtil.streamStatements**
+* improved nested bracket parsing performance by a large scale
 
 ## Extensions of JSqlParser releases
 

src/main/java/net/sf/jsqlparser/expression/AnalyticExpression.java

@@ -9,11 +9,10 @@
  */
 package net.sf.jsqlparser.expression;
 
-import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
-import net.sf.jsqlparser.statement.select.OrderByElement;
-
 import java.util.List;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+import net.sf.jsqlparser.statement.select.OrderByElement;
 
 /**
  * Analytic function. The name of the function is variable but the parameters following the special
@@ -37,6 +36,32 @@ public class AnalyticExpression extends ASTNodeAccessImpl implements Expression
     private boolean distinct = false;
     private boolean ignoreNulls = false;
 
+    public AnalyticExpression() {
+    }
+
+    public AnalyticExpression(Function function) {
+        name = function.getName();
+        allColumns = function.isAllColumns();
+        distinct = function.isDistinct();
+
+        ExpressionList list = function.getParameters();
+        if (list != null) {
+            if (list.getExpressions().size() > 3) {
+                throw new IllegalArgumentException("function object not valid to initialize analytic expression");
+            }
+
+            expression = list.getExpressions().get(0);
+            if (list.getExpressions().size() > 1) {
+                offset = list.getExpressions().get(1);
+            }
+            if (list.getExpressions().size() > 2) {
+                defaultValue = list.getExpressions().get(2);
+            }
+        }
+        ignoreNulls = function.isIgnoreNulls();
+        keep = function.getKeep();
+    }
+
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
         expressionVisitor.visit(this);

src/main/java/net/sf/jsqlparser/expression/BinaryExpression.java

@@ -19,10 +19,8 @@ public abstract class BinaryExpression extends ASTNodeAccessImpl implements Expr
 
     private Expression leftExpression;
     private Expression rightExpression;
-    private boolean not = false;
-    
-    
-    
+//    private boolean not = false;
+
     public BinaryExpression() {
     }
 
@@ -42,23 +40,23 @@ public void setRightExpression(Expression expression) {
         rightExpression = expression;
     }
 
-    public void setNot() {
-        not = true;
-    }
-    
-    public void removeNot() {
-        not = false;
-    }
- 
-    public boolean isNot() {
-        return not;
-    }
-
+//    public void setNot() {
+//        not = true;
+//    }
+//    
+//    public void removeNot() {
+//        not = false;
+//    }
+// 
+//    public boolean isNot() {
+//        return not;
+//    }
     @Override
     public String toString() {
-        return (not ? "NOT " : "") + getLeftExpression() + " " + getStringExpression() + " " + getRightExpression();
+        return //(not ? "NOT " : "") + 
+                getLeftExpression() + " " + getStringExpression() + " " + getRightExpression();
     }
 
     public abstract String getStringExpression();
-    
+
 }

src/main/java/net/sf/jsqlparser/expression/Function.java

@@ -27,6 +27,7 @@ public class Function extends ASTNodeAccessImpl implements Expression {
     private Expression attribute;
     private String attributeName;
     private KeepExpression keep = null;
+    private boolean ignoreNulls = false;
 
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
@@ -49,6 +50,20 @@ public void setAllColumns(boolean b) {
         allColumns = b;
     }
 
+    public boolean isIgnoreNulls() {
+        return ignoreNulls;
+    }
+
+    /**
+     * This is at the moment only necessary for AnalyticExpression initialization and not for normal
+     * functions. Therefore there is no deparsing for it for normal functions.
+     *
+     * @param ignoreNulls
+     */
+    public void setIgnoreNulls(boolean ignoreNulls) {
+        this.ignoreNulls = ignoreNulls;
+    }
+
     /**
      * true if the function is "distinct"
      *

src/main/java/net/sf/jsqlparser/expression/operators/relational/LikeExpression.java

@@ -14,18 +14,18 @@
 
 public class LikeExpression extends BinaryExpression {
 
-    //private boolean not = false;
+    private boolean not = false;
     private String escape = null;
     private boolean caseInsensitive = false;
 
-//    @Override
-//    public boolean isNot() {
-//        return not;
-//    }
-//
-//    public void setNot(boolean b) {
-//        not = b;
-//    }
+    public boolean isNot() {
+        return not;
+    }
+
+    public void setNot(boolean b) {
+        not = b;
+    }
+
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
         expressionVisitor.visit(this);
@@ -38,7 +38,7 @@ public String getStringExpression() {
 
     @Override
     public String toString() {
-        String retval = super.toString();
+        String retval = getLeftExpression() + " " + (not ? "NOT " : "") + getStringExpression() + " " + getRightExpression();
         if (escape != null) {
             retval += " ESCAPE " + "'" + escape + "'";
         }

src/main/java/net/sf/jsqlparser/expression/operators/relational/OldOracleJoinBinaryExpression.java

@@ -28,8 +28,8 @@ public void setOldOracleJoinSyntax(int oldOracleJoinSyntax) {
 
     @Override
     public String toString() {
-        return (isNot() ? "NOT " : "")
-                + (oraclePriorPosition == ORACLE_PRIOR_START ? "PRIOR " : "")
+        return //(isNot() ? "NOT " : "")
+                (oraclePriorPosition == ORACLE_PRIOR_START ? "PRIOR " : "")
                 + getLeftExpression()
                 + (oldOracleJoinSyntax == ORACLE_JOIN_RIGHT ? "(+)" : "") + " "
                 + getStringExpression() + " "

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 (t.warneke@gmx.net)
+ */
+public interface StatementListener {
+
+    void accept(Statement statement);
+}

src/main/java/net/sf/jsqlparser/schema/Column.java

@@ -36,6 +36,28 @@ public Column(String columnName) {
         this(null, columnName);
     }
 
+    /**
+     * Retrieve the information regarding the {@code Table} this {@code Column} does
+     * belong to, if any can be inferred.
+     * <p>
+     * The inference is based only on local information, and not on the whole SQL command.
+     * For example, consider the following query:
+     * <blockquote><pre>
+     *  SELECT x FROM Foo
+     * </pre></blockquote>
+     * Given the {@code Column} called {@code x}, this method would return {@code null},
+     * and not the info about the table {@code Foo}.
+     * On the other hand, consider:
+     * <blockquote><pre>
+     *  SELECT t.x FROM Foo t
+     * </pre></blockquote>
+     * Here, we will get a {@code Table} object for a table called {@code t}.
+     * But because the inference is local, such object will not know that {@code t} is
+     * just an alias for {@code Foo}.
+     *
+     * @return an instance of {@link net.sf.jsqlparser.schema.Table} representing the
+     *          table this column does belong to, if it can be inferred. Can be {@code null}.
+     */
     public Table getTable() {
         return table;
     }