Merge pull request #2 from JSQLParser/master

periodic sync from JSqlParser repository

Author: tomershay

README.md

@@ -2,6 +2,8 @@
 
 [![Build Status](https://travis-ci.org/JSQLParser/JSqlParser.svg?branch=master)](https://travis-ci.org/JSQLParser/JSqlParser)   [![Coverage Status](https://coveralls.io/repos/JSQLParser/JSqlParser/badge.svg?branch=master)](https://coveralls.io/r/JSQLParser/JSqlParser?branch=master)
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/00b2d91995764ae4805b55627aca8d39)](https://www.codacy.com/app/wumpz/JSqlParser?utm_source=github.com&utm_medium=referral&utm_content=JSQLParser/JSqlParser&utm_campaign=Badge_Grade)
+[![Maven Central](https://maven-badges.herokuapp.com/maven-central/com.github.jsqlparser/jsqlparser/badge.svg)](http://maven-badges.herokuapp.com/maven-central/com.github.jsqlparser/jsqlparser)
+[![Javadocs](https://www.javadoc.io/badge/com.github.jsqlparser/jsqlparser.svg)](https://www.javadoc.io/doc/com.github.jsqlparser/jsqlparser)
 
 [![PayPal donate button](http://img.shields.io/paypal/donate.png?color=blue)](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=64CCN9JJANZXA "Help this JSqlParser version using Paypal")  
 
@@ -15,6 +17,7 @@ JSqlParser is dual licensed under **LGPL V2.1** and **Apache Software License, V
 
 
 ## News
+* Released version **1.2** of JSqlParser
 * breaking **API** change: merge of *within group* and *over* (window expressions)
 * Released version **1.1** of JSqlParser. 
 * JSqlParser has now a build in checkstyle configuration to introduce source code conventions.
@@ -42,27 +45,12 @@ To help JSqlParsers development you are encouraged to provide
 
 Also I would like to know about needed examples or documentation stuff.
 
-## Extensions in the latest SNAPSHOT version 1.2
-
-* support for single quoted aliases ___select col1 as 'alias'___
-* support for Unicode string literal like **N'test'** or **U'test'**
-* support for bitwise not **~**
-* support for **drop view**
-* support for indexed JDBC parameters at multiple places
-* allowed **index** as object name
-* switched to JavaCC **modern template**
-* switched to JDK 1.7 
-* introduced more AST node links
-* support for aliased table in **insert into** statement
-* **SQL_CALC_FOUND_ROWS** support
-* support for more complex expressions within **case expr when expr then expr end**.
-* support for **<<** and **>>** left and right shift operations
-* breaking **API** change: merge of *within group* and *over* (window expressions)
-* first support for *use* statements
-* first support for *call* statements
-* create table allows now quoted identifiers within primary key definition
-* introduced alias for subquery in combination with a pivot definition (this **changes** alias handling within the library for pivot sqls)
-* force the parser to fully parse a String using parseCondExpression or parseExpression
+## Extensions in the latest SNAPSHOT version 1.3
+
+* corrected ISNULL regression (issue #610)
+* refactored statement test classes to the class corresponding packages
+* allowed nested postgresql casts (e.g. col::bigint::int)
+
 
 ## Extensions of JSqlParser releases
 
@@ -130,7 +118,7 @@ And this is the dependency declaration in your pom:
 <dependency>
 	<groupId>com.github.jsqlparser</groupId>
 	<artifactId>jsqlparser</artifactId>
-	<version>1.1</version>
+	<version>1.2</version>
 </dependency>
 ```
 

nb-configuration.xml

@@ -13,10 +13,12 @@
 		That way multiple projects can share the same settings (useful for formatting rules for example).
 		Any value defined here will override the pom.xml file value but is only applicable to the current project.
 		-->
-        <netbeans.compile.on.save>none</netbeans.compile.on.save>
+        <netbeans.compile.on.save>all</netbeans.compile.on.save>
         <com-junichi11-netbeans-changelf.enable>false</com-junichi11-netbeans-changelf.enable>
         <com-junichi11-netbeans-changelf.use-project>true</com-junichi11-netbeans-changelf.use-project>
         <com-junichi11-netbeans-changelf.lf-kind>LF</com-junichi11-netbeans-changelf.lf-kind>
         <com-junichi11-netbeans-changelf.use-global>false</com-junichi11-netbeans-changelf.use-global>
+        <org-netbeans-modules-javascript2-requirejs.enabled>true</org-netbeans-modules-javascript2-requirejs.enabled>
+        <netbeans.hint.jdkPlatform>JDK_1.8</netbeans.hint.jdkPlatform>
     </properties>
 </project-shared-configuration>

pom.xml

@@ -2,7 +2,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.github.jsqlparser</groupId>
     <artifactId>jsqlparser</artifactId>
-    <version>1.2-SNAPSHOT</version>
+    <version>1.3-SNAPSHOT</version>
     <name>JSQLParser library</name>
     <inceptionYear>2004</inceptionYear>
     <organization>
@@ -46,7 +46,7 @@
         <dependency>
             <groupId>org.mockito</groupId>
             <artifactId>mockito-core</artifactId>
-            <version>2.7.22</version>
+            <version>2.16.0</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -106,11 +106,6 @@
                         </goals>
                     </execution>
                 </executions>
-                <configuration>
-                    <nodeDefaultVoid>true</nodeDefaultVoid>
-                    <visitor>true</visitor>
-                    <trackTokens>true</trackTokens>
-                </configuration>
                 <dependencies>
                     <dependency>
                         <groupId>net.java.dev.javacc</groupId>
@@ -182,7 +177,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>2.4</version>
+                <version>3.0.1</version>
                 <executions>
                     <execution>
                         <id>attach-sources</id>

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

@@ -48,6 +48,7 @@ public class AnalyticExpression extends ASTNodeAccessImpl implements Expression
     private WindowElement windowElement;
     private KeepExpression keep = null;
     private AnalyticType type = AnalyticType.OVER;
+    private boolean distinct = false;
 
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
@@ -126,11 +127,22 @@ public void setType(AnalyticType type) {
         this.type = type;
     }
 
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
     @Override
     public String toString() {
         StringBuilder b = new StringBuilder();
 
         b.append(name).append("(");
+        if (isDistinct()) {
+            b.append("DISTINCT ");
+        }
         if (expression != null) {
             b.append(expression.toString());
             if (offset != null) {
@@ -146,7 +158,7 @@ public String toString() {
         if (keep != null) {
             b.append(keep.toString()).append(" ");
         }
-        
+
         switch (type) {
             case WITHIN_GROUP:
                 b.append("WITHIN GROUP");

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

@@ -167,6 +167,8 @@ public interface ExpressionVisitor {
     void visit(KeepExpression aexpr);
 
     void visit(MySQLGroupConcat groupConcat);
+    
+    void visit(ValueListExpression valueList);
 
     void visit(RowConstructor rowConstructor);
 

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

@@ -416,6 +416,13 @@ public void visit(MySQLGroupConcat groupConcat) {
             }
         }
     }
+    
+    @Override
+    public void visit(ValueListExpression valueListExpression) {
+        for (Expression expr : valueListExpression.getExpressionList().getExpressions()) {
+            expr.accept(this);
+        }
+    }
 
     @Override
     public void visit(Pivot pivot) {

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

@@ -29,6 +29,7 @@
 public class Parenthesis extends ASTNodeAccessImpl implements Expression {
 
     private Expression expression;
+    
     private boolean not = false;
 
     public Parenthesis() {

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

@@ -0,0 +1,60 @@
+/*
+ * #%L
+ * JSQLParser library
+ * %%
+ * Copyright (C) 2004 - 2018 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.expression;
+
+import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
+import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
+
+/**
+ * Models a list of expressions usable as condition.<br>
+ * This allows for instance the following expression : 
+ * <code>"[WHERE] (a, b) [OPERATOR] (c, d)"</code>
+ * where "(a, b)" and "(c, d)" are instances of this class.
+ * 
+ * @author adriil
+ */
+public class ValueListExpression extends ASTNodeAccessImpl implements Expression {
+
+    private ExpressionList expressionList;
+    
+    public ExpressionList getExpressionList() {
+        return expressionList;
+    }
+
+    public void setExpressionList(ExpressionList expressionList) {
+        this.expressionList = expressionList;
+    }
+
+    @Override
+    public void accept(ExpressionVisitor expressionVisitor) {
+        expressionVisitor.visit(this);
+    }
+    
+    @Override
+    public String toString() {
+        return expressionList.toString();
+    }
+
+}

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

@@ -21,6 +21,7 @@
  */
 package net.sf.jsqlparser.expression.operators.relational;
 
+import java.util.Arrays;
 import java.util.List;
 
 import net.sf.jsqlparser.expression.Expression;
@@ -39,6 +40,10 @@ public ExpressionList() {
     public ExpressionList(List<Expression> expressions) {
         this.expressions = expressions;
     }
+    
+    public ExpressionList(Expression ... expressions) {
+        this.expressions = Arrays.asList(expressions);
+    }
 
     public List<Expression> getExpressions() {
         return expressions;

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

@@ -29,6 +29,7 @@ public class IsNullExpression extends ASTNodeAccessImpl implements Expression {
 
     private Expression leftExpression;
     private boolean not = false;
+    private boolean useIsNull = false;
 
     public Expression getLeftExpression() {
         return leftExpression;
@@ -46,13 +47,25 @@ public void setNot(boolean b) {
         not = b;
     }
 
+    public boolean isUseIsNull() {
+        return useIsNull;
+    }
+
+    public void setUseIsNull(boolean useIsNull) {
+        this.useIsNull = useIsNull;
+    }
+
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
         expressionVisitor.visit(this);
     }
 
     @Override
     public String toString() {
-        return leftExpression + " IS " + (not ? "NOT " : "") + "NULL";
+        if (isUseIsNull()) {
+            return leftExpression + (not ? " NOT" : "") + " ISNULL";
+        } else {
+            return leftExpression + " IS " + (not ? "NOT " : "") + "NULL";
+        }
     }
 }