Merge origin/master

Author: wumpz

README.md

@@ -22,6 +22,7 @@ JSqlParser is dual licensed under **LGPL V2.1** or **Apache Software License, Ve
 Please provide feedback on https://github.com/JSQLParser/JSqlParser/issues/677, about removing bracket identifier quotation to support array processing.
 
 ## News
+* breaking **API** change: to support chained functions attribute type was changed to **Expression**
 * Released version **1.4** of JSqlParser
 * Released version **1.3** of JSqlParser
 * Changed behaviour of dotted multipart names for user variables, tables and columns to accept e.g. ORM class names. To achieve this some behaviour of name parsing had to be changed. Before this the parser would fail missing databasenames for SqlServer queries (server..schema.table). But this is allowed for the schema (server.database..table). Now the parser accepts missing inner names per se to avoid some very complicated parsing rules.
@@ -33,6 +34,9 @@ Please provide feedback on https://github.com/JSQLParser/JSqlParser/issues/677,
 
 More news can be found here: https://github.com/JSQLParser/JSqlParser/wiki/News.
 
+## Alternatives to JSqlParser?
+[**General SQL Parser**](http://www.sqlparser.com/features/introduce.php?utm_source=github-jsqlparser&utm_medium=text-general) looks pretty good, with extended SQL syntax (like PL/SQL and T-SQL) and java + .NET APIs. The tool is commercial (license available online), with a free download option.
+
 ## JSqlParser
 
 JSqlParser is a SQL statement parser. It translates SQLs in a traversable hierarchy of Java classes. JSqlParser is not limited to one database but provides support for a lot of specials of Oracle, SqlServer, MySQL, PostgreSQL ... To name some, it has support for Oracles join syntax using (+), PostgreSQLs cast syntax using ::, relational operators like != and so on.
@@ -55,6 +59,11 @@ Also I would like to know about needed examples or documentation stuff.
 
 ## Extensions in the latest SNAPSHOT version 2.0
 
+* support for **GROUPING SETS**
+* first support for db date arithmetic
+* support for chained functions
+* first support for **FOR XML PATH**
+* support for **NEXTVAL FOR**
 * changed all source code license headers to reflect the dual license of JSqlParser more correctly
 * support of **OPTIMIZE FOR 20 ROWS** like expressions
 * allowed conditions within **then** and **else** of a **case** statement
@@ -133,7 +142,7 @@ And this is the dependency declaration in your pom:
 <dependency>
 	<groupId>com.github.jsqlparser</groupId>
 	<artifactId>jsqlparser</artifactId>
-	<version>1.2</version>
+	<version>1.4</version>
 </dependency>
 ```
 

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

@@ -0,0 +1,49 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2019 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.expression;
+
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+public class CollateExpression extends ASTNodeAccessImpl implements Expression {
+
+    private Expression leftExpression;
+    private String collate;
+
+    public CollateExpression(Expression leftExpression, String collate) {
+        this.leftExpression = leftExpression;
+        this.collate = collate;
+    }
+
+    @Override
+    public void accept(ExpressionVisitor expressionVisitor) {
+        expressionVisitor.visit(this);
+    }
+
+    public Expression getLeftExpression() {
+        return leftExpression;
+    }
+
+    public void setLeftExpression(Expression leftExpression) {
+        this.leftExpression = leftExpression;
+    }
+
+    public String getCollate() {
+        return collate;
+    }
+
+    public void setCollate(String collate) {
+        this.collate = collate;
+    }
+
+    @Override
+    public String toString() {
+        return leftExpression.toString() + " COLLATE " + collate;
+    }
+}

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

@@ -29,14 +29,14 @@
 import net.sf.jsqlparser.expression.operators.relational.GreaterThanEquals;
 import net.sf.jsqlparser.expression.operators.relational.InExpression;
 import net.sf.jsqlparser.expression.operators.relational.IsNullExpression;
+import net.sf.jsqlparser.expression.operators.relational.JsonOperator;
 import net.sf.jsqlparser.expression.operators.relational.LikeExpression;
 import net.sf.jsqlparser.expression.operators.relational.Matches;
 import net.sf.jsqlparser.expression.operators.relational.MinorThan;
 import net.sf.jsqlparser.expression.operators.relational.MinorThanEquals;
 import net.sf.jsqlparser.expression.operators.relational.NotEqualsTo;
 import net.sf.jsqlparser.expression.operators.relational.RegExpMatchOperator;
 import net.sf.jsqlparser.expression.operators.relational.RegExpMySQLOperator;
-import net.sf.jsqlparser.expression.operators.relational.JsonOperator;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.select.SubSelect;
 
@@ -155,7 +155,7 @@ public interface ExpressionVisitor {
     void visit(KeepExpression aexpr);
 
     void visit(MySQLGroupConcat groupConcat);
-    
+
     void visit(ValueListExpression valueList);
 
     void visit(RowConstructor rowConstructor);
@@ -168,4 +168,8 @@ public interface ExpressionVisitor {
 
     public void visit(NotExpression aThis);
 
+    public void visit(NextValExpression aThis);
+
+    public void visit(CollateExpression aThis);
+
 }

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

@@ -12,7 +12,6 @@
 import net.sf.jsqlparser.expression.operators.arithmetic.*;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
-import net.sf.jsqlparser.expression.operators.relational.JsonOperator;
 import net.sf.jsqlparser.expression.operators.relational.*;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.select.AllColumns;
@@ -341,7 +340,6 @@ public void visit(NamedExpressionList namedExpressionList) {
         }
     }
 
-
     @Override
     public void visit(MultiExpressionList multiExprList) {
         for (ExpressionList list : multiExprList.getExprList()) {
@@ -412,7 +410,7 @@ public void visit(MySQLGroupConcat groupConcat) {
             }
         }
     }
-    
+
     @Override
     public void visit(ValueListExpression valueListExpression) {
         for (Expression expr : valueListExpression.getExpressionList().getExpressions()) {
@@ -493,7 +491,14 @@ public void visit(TimeKeyExpression timeKeyExpression) {
 
     @Override
     public void visit(DateTimeLiteralExpression literal) {
+    }
 
+    @Override
+    public void visit(NextValExpression nextVal) {
     }
 
+    @Override
+    public void visit(CollateExpression col) {
+        col.getLeftExpression().accept(this);
+    }
 }

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

@@ -21,7 +21,8 @@ public class Function extends ASTNodeAccessImpl implements Expression {
     private boolean allColumns = false;
     private boolean distinct = false;
     private boolean isEscaped = false;
-    private String attribute;
+    private Expression attribute;
+    private String attributeName;
     private KeepExpression keep = null;
 
     @Override
@@ -77,7 +78,6 @@ public void setParameters(ExpressionList list) {
      *
      * @return the list of named parameters of the function (if any, else null)
      */
-
     public NamedExpressionList getNamedParameters() {
         return namedParameters;
     }
@@ -99,14 +99,22 @@ public void setEscaped(boolean isEscaped) {
         this.isEscaped = isEscaped;
     }
 
-    public String getAttribute() {
+    public Expression getAttribute() {
         return attribute;
     }
 
-    public void setAttribute(String attribute) {
+    public void setAttribute(Expression attribute) {
         this.attribute = attribute;
     }
 
+    public String getAttributeName() {
+        return attributeName;
+    }
+
+    public void setAttributeName(String attributeName) {
+        this.attributeName = attributeName;
+    }
+
     public KeepExpression getKeep() {
         return keep;
     }
@@ -120,14 +128,14 @@ public String toString() {
         String params;
 
         if (parameters != null || namedParameters != null) {
-            if(parameters != null){
+            if (parameters != null) {
                 params = parameters.toString();
                 if (isDistinct()) {
                     params = params.replaceFirst("\\(", "(DISTINCT ");
                 } else if (isAllColumns()) {
                     params = params.replaceFirst("\\(", "(ALL ");
                 }
-            } else{
+            } else {
                 params = namedParameters.toString();
             }
         } else if (isAllColumns()) {
@@ -139,7 +147,9 @@ public String toString() {
         String ans = name + "" + params + "";
 
         if (attribute != null) {
-            ans += "." + attribute;
+            ans += "." + attribute.toString();
+        } else if (attributeName != null) {
+            ans += "." + attributeName;
         }
 
         if (keep != null) {

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

@@ -9,12 +9,23 @@
  */
 package net.sf.jsqlparser.expression;
 
+import java.util.Objects;
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
 public class IntervalExpression extends ASTNodeAccessImpl implements Expression {
 
     private String parameter = null;
     private String intervalType = null;
+    private final boolean intervalKeyword;
+    private Expression expression = null;
+
+    public IntervalExpression() {
+        this(true);
+    }
+
+    public IntervalExpression(boolean intervalKeyword) {
+        this.intervalKeyword = intervalKeyword;
+    }
 
     public String getParameter() {
         return parameter;
@@ -32,9 +43,19 @@ public void setIntervalType(String intervalType) {
         this.intervalType = intervalType;
     }
 
+    public Expression getExpression() {
+        return expression;
+    }
+
+    public void setExpression(Expression expression) {
+        this.expression = expression;
+    }
+
     @Override
     public String toString() {
-        return "INTERVAL " + parameter + (intervalType != null ? " " + intervalType : "");
+        return (intervalKeyword ? "INTERVAL " : "")
+                + Objects.toString(expression, parameter)
+                + (intervalType != null ? " " + intervalType : "");
     }
 
     @Override

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

@@ -0,0 +1,43 @@
+/*-
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2019 JSQLParser
+ * %%
+ * Dual licensed under GNU LGPL 2.1 or Apache License 2.0
+ * #L%
+ */
+package net.sf.jsqlparser.expression;
+
+import java.util.List;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+public class NextValExpression extends ASTNodeAccessImpl implements Expression {
+
+    private List<String> nameList;
+
+    public NextValExpression(List<String> nameList) {
+        this.nameList = nameList;
+    }
+
+    public String getName() {
+        StringBuilder b = new StringBuilder();
+        for (String name : nameList) {
+            if (b.length() > 0) {
+                b.append(".");
+            }
+            b.append(name);
+        }
+        return b.toString();
+    }
+
+    @Override
+    public String toString() {
+        return "NEXTVAL FOR " + getName();
+    }
+
+    @Override
+    public void accept(ExpressionVisitor expressionVisitor) {
+        expressionVisitor.visit(this);
+    }
+}

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

@@ -15,8 +15,15 @@ public class NotExpression extends ASTNodeAccessImpl implements Expression {
 
     private Expression expression;
 
+    private boolean exclamationMark = false;
+
     public NotExpression(Expression expression) {
+        this(expression, false);
+    }
+
+    public NotExpression(Expression expression, boolean useExclamationMark) {
         setExpression(expression);
+        this.exclamationMark = useExclamationMark;
     }
 
     public Expression getExpression() {
@@ -34,6 +41,14 @@ public void accept(ExpressionVisitor expressionVisitor) {
 
     @Override
     public String toString() {
-        return "NOT " + expression.toString();
+        return (exclamationMark ? "! " : "NOT ") + expression.toString();
+    }
+
+    public boolean isExclamationMark() {
+        return exclamationMark;
+    }
+
+    public void setExclamationMark(boolean exclamationMark) {
+        this.exclamationMark = exclamationMark;
     }
 }

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

@@ -14,8 +14,6 @@
 public class Parenthesis extends ASTNodeAccessImpl implements Expression {
 
     private Expression expression;
-    
-    private boolean not = false;
 
     public Parenthesis() {
     }
@@ -37,16 +35,8 @@ public void accept(ExpressionVisitor expressionVisitor) {
         expressionVisitor.visit(this);
     }
 
-    public void setNot() {
-        not = true;
-    }
-
-    public boolean isNot() {
-        return not;
-    }
-
     @Override
     public String toString() {
-        return (not ? "NOT " : "") + "(" + expression + ")";
+        return "(" + expression + ")";
     }
 }