Assorted Fixes #8

.github/workflows/gradle.yml

@@ -0,0 +1,34 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will build a Java project with Gradle and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-gradle
+
+name: Java CI with Gradle
+
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+
+permissions:
+  contents: read
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up JDK 11
+      uses: actions/setup-java@v3
+      with:
+        java-version: '11'
+        distribution: 'temurin'
+    - name: Build with Gradle
+      uses: gradle/gradle-build-action@v2.4.2
+      with:
+        arguments: check

.github/workflows/sphinx.yml

@@ -9,7 +9,7 @@ jobs:
       - name: Install XSLT Processor
         run: sudo apt-get install xsltproc sphinx-common
       - name: Install dependencies
-        run: pip install furo sphinx_rtd_theme sphinx-book-theme myst_parser sphinx-prompt sphinx_substitution_extensions sphinx_issues sphinx_inline_tabs pygments
+        run: pip install furo myst_parser sphinx-prompt sphinx_substitution_extensions sphinx_issues sphinx_inline_tabs pygments
       - name: Checkout project sources
         uses: actions/checkout@v2
         with:

README.md

@@ -18,14 +18,14 @@ SELECT 1 FROM dual WHERE a = b
 ```
 
 ```text
- SQL Text
-   └─Statements: net.sf.jsqlparser.statement.select.Select
-       ├─selectItems -> Collection<SelectItem>
-       │  └─LongValue: 1
-       ├─Table: dual
-       └─where: net.sf.jsqlparser.expression.operators.relational.EqualsTo
-          ├─Column: a
-          └─Column: b
+SQL Text
+ └─Statements: statement.select.PlainSelect
+    ├─selectItems: statement.select.SelectItem
+    │  └─LongValue: 1
+    ├─Table: dual
+    └─where: expression.operators.relational.EqualsTo
+       ├─Column: a
+       └─Column: b
 ```
 
 ```java

build.gradle

@@ -7,6 +7,7 @@ plugins {
 
     id "ca.coglinc2.javacc" version "latest.release"
     id 'jacoco'
+    id 'com.github.kt3k.coveralls' version "latest.release"
     id "com.github.spotbugs" version "latest.release"
     id "com.diffplug.spotless" version "latest.release"
     id 'pmd'
@@ -179,6 +180,10 @@ test {
     maxHeapSize = "1G"
 }
 
+coveralls {
+    jacocoReportPath 'build/reports/jacoco/test/jacocoTestReport.xml'
+}
+
 jacocoTestReport {
     dependsOn test // tests are required to run before generating the report
     reports {
@@ -272,9 +277,7 @@ spotbugs {
 }
 
 pmd {
-    consoleOutput = false
-    //toolVersion = "6.46.0"
-
+    consoleOutput = true
     sourceSets = [sourceSets.main]
 
     // clear the ruleset in order to use configured rules only
@@ -436,23 +439,6 @@ xslt  {
 tasks.register('sphinx', Exec) {
     dependsOn(gitChangelogTask, renderRR, xslt, updateKeywords, xmldoc)
 
-//    doFirst() {
-//        exec {
-//            args = [
-//                    "install"
-//                    , "sphinx_rtd_theme"
-//                    , "sphinx-book-theme"
-//                    , "myst_parser"
-//                    , "sphinx-prompt"
-//                    , "sphinx_substitution_extensions"
-//                    , "sphinx_issues"
-//                    , "sphinx_inline_tabs"
-//                    , "pygments"
-//            ]
-//            executable "pip"
-//        }
-//    }
-
     String PROLOG = """
 .. |_| unicode:: U+00A0
     :trim:
@@ -555,7 +541,7 @@ publishing {
         maven {
             name = "GitHubPackages"
 
-            url = uri("https://maven.pkg.github.com/manticore-projects/jsqlparser")
+            url = uri("https://maven.pkg.github.com/JSQLParser/jsqlparser")
             credentials(PasswordCredentials)
         }
     }

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

@@ -44,7 +44,6 @@
 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.SimilarToExpression;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.select.AllColumns;
@@ -168,8 +167,6 @@ public interface ExpressionVisitor {
 
     void visit(JsonOperator jsonExpr);
 
-    void visit(RegExpMySQLOperator regExpMySQLOperator);
-
     void visit(UserVariable var);
 
     void visit(NumericBind bind);

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

@@ -44,7 +44,6 @@
 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.SimilarToExpression;
 import net.sf.jsqlparser.schema.Column;
 import net.sf.jsqlparser.statement.select.AllColumns;
@@ -433,11 +432,6 @@ public void visit(JsonOperator expr) {
         visitBinaryExpression(expr);
     }
 
-    @Override
-    public void visit(RegExpMySQLOperator expr) {
-        visitBinaryExpression(expr);
-    }
-
     @Override
     public void visit(UserVariable var) {
 

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

@@ -9,9 +9,10 @@
  */
 package net.sf.jsqlparser.expression;
 
-import java.util.Objects;
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 
+import java.util.Objects;
+
 public class IntervalExpression extends ASTNodeAccessImpl implements Expression {
 
     private String parameter = null;
@@ -27,6 +28,10 @@ public IntervalExpression(boolean intervalKeyword) {
         this.intervalKeyword = intervalKeyword;
     }
 
+    public boolean isUsingIntervalKeyword() {
+        return intervalKeyword;
+    }
+
     public String getParameter() {
         return parameter;
     }

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

@@ -96,7 +96,7 @@ public void accept(ExpressionVisitor expressionVisitor) {
         expressionVisitor.visit(this);
     }
 
-    StringBuilder appendTo(StringBuilder builder) {
+    public StringBuilder appendTo(StringBuilder builder) {
         builder.append("Trim(");
 
         if (trimSpecification != null) {

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

@@ -74,7 +74,7 @@ public ExpressionList withExpressions(T... expressions) {
         return addExpressions(expressions);
     }
 
-    public ExpressionList withExpressions(Collection<T> expressions) {
+    public ExpressionList<?> withExpressions(Collection<T> expressions) {
         this.clear();
         return addExpressions(expressions);
     }

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

@@ -18,6 +18,7 @@ public class IsNullExpression extends ASTNodeAccessImpl implements Expression {
     private Expression leftExpression;
     private boolean not = false;
     private boolean useIsNull = false;
+    private boolean useNotNull = false;
 
     public Expression getLeftExpression() {
         return leftExpression;
@@ -43,14 +44,25 @@ public void setUseIsNull(boolean useIsNull) {
         this.useIsNull = useIsNull;
     }
 
+    public boolean isUseNotNull() {
+        return useNotNull;
+    }
+
+    public IsNullExpression setUseNotNull(boolean useNotNull) {
+        this.useNotNull = useNotNull;
+        return this;
+    }
+
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
         expressionVisitor.visit(this);
     }
 
     @Override
     public String toString() {
-        if (isUseIsNull()) {
+        if (useNotNull) {
+            return leftExpression + " NOTNULL";
+        } else if (useIsNull) {
             return leftExpression + (not ? " NOT" : "") + " ISNULL";
         } else {
             return leftExpression + " IS " + (not ? "NOT " : "") + "NULL";

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

@@ -14,10 +14,18 @@
 import net.sf.jsqlparser.expression.ExpressionVisitor;
 
 public class LikeExpression extends BinaryExpression {
+    public enum KeyWord {
+        LIKE, ILIKE, RLIKE, REGEXP;
+
+        public static KeyWord from(String keyword) {
+            return Enum.valueOf(KeyWord.class, keyword.toUpperCase());
+        }
+    }
 
     private boolean not = false;
+    private boolean useBinary = false;
     private Expression escapeExpression = null;
-    private boolean caseInsensitive = false;
+    private KeyWord likeKeyWord = KeyWord.LIKE;
 
     public boolean isNot() {
         return not;
@@ -27,23 +35,33 @@ public void setNot(boolean b) {
         not = b;
     }
 
+    public boolean isUseBinary() {
+        return useBinary;
+    }
+
+    public LikeExpression setUseBinary(boolean useBinary) {
+        this.useBinary = useBinary;
+        return this;
+    }
+
     @Override
     public void accept(ExpressionVisitor expressionVisitor) {
         expressionVisitor.visit(this);
     }
 
+    @Deprecated
     @Override
     public String getStringExpression() {
-        return caseInsensitive ? "ILIKE" : "LIKE";
+        return likeKeyWord.toString();
     }
 
     @Override
     public String toString() {
-        String retval = getLeftExpression() + " " + (not ? "NOT " : "") + getStringExpression() + " " + getRightExpression();
+        String retval = getLeftExpression() + " " + (not ? "NOT " : "")
+                + likeKeyWord + " " + (useBinary ? "BINARY " : "") + getRightExpression();
         if (escapeExpression != null) {
-            retval += " ESCAPE "  + escapeExpression ;
+            retval += " ESCAPE " + escapeExpression;
         }
-
         return retval;
     }
 
@@ -55,19 +73,36 @@ public void setEscape(Expression escapeExpression) {
         this.escapeExpression = escapeExpression;
     }
 
+    @Deprecated
     public boolean isCaseInsensitive() {
-        return caseInsensitive;
+        return likeKeyWord == KeyWord.ILIKE;
     }
 
+    @Deprecated
     public void setCaseInsensitive(boolean caseInsensitive) {
-        this.caseInsensitive = caseInsensitive;
+        this.likeKeyWord = KeyWord.ILIKE;
+    }
+
+    public KeyWord getLikeKeyWord() {
+        return likeKeyWord;
+    }
+
+    public LikeExpression setLikeKeyWord(KeyWord likeKeyWord) {
+        this.likeKeyWord = likeKeyWord;
+        return this;
+    }
+
+    public LikeExpression setLikeKeyWord(String likeKeyWord) {
+        this.likeKeyWord = KeyWord.from(likeKeyWord);
+        return this;
     }
 
     public LikeExpression withEscape(Expression escape) {
         this.setEscape(escape);
         return this;
     }
 
+    @Deprecated
     public LikeExpression withCaseInsensitive(boolean caseInsensitive) {
         this.setCaseInsensitive(caseInsensitive);
         return this;