Merge branch 'master' into fix/binary-operator-ast-span

Author: manticore-projects

build.gradle

@@ -276,7 +276,9 @@ test {
     jvmArgs = ['-Xss4m', '--add-opens=java.base/java.lang=ALL-UNNAMED']
 
     jacoco {
-        excludes = ['net/sf/jsqlparser/parser/CCJSqlParserTokenManager']
+        // the generated parser exceeds the constant-pool limit once instrumented (#2866)
+        excludes = ['net/sf/jsqlparser/parser/CCJSqlParserTokenManager',
+                    'net/sf/jsqlparser/parser/CCJSqlParser']
     }
 }
 
@@ -291,13 +293,23 @@ jacocoTestReport {
         csv.required = false
         html.outputLocation = layout.buildDirectory.dir('reports/jacoco')
     }
+    // the classes that are not instrumented, see test.jacoco
+    afterEvaluate {
+        classDirectories.setFrom(files(classDirectories.files.collect {
+            fileTree(dir: it, exclude: [
+                    "**/parser/CCJSqlParserTokenManager.class",
+                    "**/parser/CCJSqlParser.class"
+            ])
+        }))
+    }
 }
 jacocoTestCoverageVerification {
-    // Jacoco can't handle the TokenManager class
+    // Jacoco can't handle the TokenManager and the generated parser classes
     afterEvaluate {
         classDirectories.setFrom(files(classDirectories.files.collect {
             fileTree(dir: it, exclude: [
-                    "**CCJSqlParserTokenManager**"
+                    "**/parser/CCJSqlParserTokenManager.class",
+                    "**/parser/CCJSqlParser.class"
             ])
         }))
     }

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

@@ -10,6 +10,7 @@
 package net.sf.jsqlparser.expression.operators.relational;
 
 import java.util.Locale;
+import java.util.regex.Pattern;
 import net.sf.jsqlparser.expression.BinaryExpression;
 import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.ExpressionVisitor;
@@ -174,9 +175,11 @@ public LikeExpression withRightExpression(Expression arg0) {
     public enum KeyWord {
         LIKE, ILIKE, RLIKE, REGEXP_LIKE, REGEXP, GLOB, SIMILAR_TO, MATCH_ANY, MATCH_ALL, MATCH_PHRASE, MATCH_PHRASE_PREFIX, MATCH_REGEXP;
 
+        private static final Pattern WHITESPACE = Pattern.compile("\\s+");
+
         public static KeyWord from(String keyword) {
             return Enum.valueOf(KeyWord.class,
-                    keyword.toUpperCase(Locale.ROOT).replaceAll("\\s+", "_"));
+                    WHITESPACE.matcher(keyword.toUpperCase(Locale.ROOT)).replaceAll("_"));
         }
     }
 

src/main/java/net/sf/jsqlparser/statement/StatementFeatureVisitor.java

@@ -85,6 +85,7 @@
 import net.sf.jsqlparser.statement.delete.Delete;
 import net.sf.jsqlparser.statement.drop.Drop;
 import net.sf.jsqlparser.statement.drop.DropPolicy;
+import net.sf.jsqlparser.statement.drop.DropUserMapping;
 import net.sf.jsqlparser.statement.execute.Execute;
 import net.sf.jsqlparser.statement.export.Export;
 import net.sf.jsqlparser.statement.export.ExportDataStatement;
@@ -1365,6 +1366,11 @@ public <S> Void visit(AlterUserMapping statement, S context) {
         return schemaOnly();
     }
 
+    @Override
+    public <S> Void visit(DropUserMapping statement, S context) {
+        return schemaOnly();
+    }
+
     @Override
     public <S> Void visit(CreateRule statement, S context) {
         return schemaOnly();

src/main/java/net/sf/jsqlparser/statement/StatementVisitor.java

@@ -27,6 +27,7 @@
 import net.sf.jsqlparser.statement.alter.AlterTrigger;
 import net.sf.jsqlparser.statement.alter.AlterPolicy;
 import net.sf.jsqlparser.statement.drop.DropPolicy;
+import net.sf.jsqlparser.statement.drop.DropUserMapping;
 import net.sf.jsqlparser.statement.create.statistics.CreateStatistics;
 import net.sf.jsqlparser.statement.alter.AlterStatistics;
 import net.sf.jsqlparser.statement.alter.AlterRelation;
@@ -945,6 +946,14 @@ default void visit(AlterUserMapping statement) {
         visit(statement, null);
     }
 
+    default <S> T visit(DropUserMapping statement, S context) {
+        return null;
+    }
+
+    default void visit(DropUserMapping statement) {
+        visit(statement, null);
+    }
+
     default <S> T visit(CreateAccessMethod statement, S context) {
         return null;
     }

src/main/java/net/sf/jsqlparser/statement/StatementVisitorAdapter.java

@@ -15,6 +15,7 @@
 import net.sf.jsqlparser.statement.alter.AlterRoutine;
 import net.sf.jsqlparser.statement.alter.AlterTrigger;
 import net.sf.jsqlparser.statement.drop.DropPolicy;
+import net.sf.jsqlparser.statement.drop.DropUserMapping;
 import net.sf.jsqlparser.statement.create.statistics.CreateStatistics;
 import net.sf.jsqlparser.statement.create.fdw.CreateForeignDataWrapper;
 import net.sf.jsqlparser.statement.alter.AlterForeignDataWrapper;
@@ -1087,6 +1088,11 @@ public <S> T visit(AlterUserMapping statement, S context) {
         return visitForeignDataStatement(statement, context);
     }
 
+    @Override
+    public <S> T visit(DropUserMapping statement, S context) {
+        return null;
+    }
+
     @Override
     public <S> T visit(CreateRule statement, S context) {
         statement.visitTables(table -> table.accept(fromItemVisitor, context));

src/main/java/net/sf/jsqlparser/statement/create/event/AlterEvent.java

@@ -32,7 +32,9 @@ public <T, S> T accept(StatementVisitor<T> statementVisitor, S context) {
 
     @Override
     public String toString() {
-        StringBuilder builder = new StringBuilder("ALTER EVENT ").append(getEvent());
+        StringBuilder builder = new StringBuilder("ALTER ");
+        appendDefinerAndEvent(builder);
+        builder.append(getEvent());
         appendScheduleAndCompletion(builder);
         if (renameTo != null) {
             builder.append(" RENAME TO ").append(renameTo);

src/main/java/net/sf/jsqlparser/statement/create/event/CreateEvent.java

@@ -31,7 +31,8 @@ public <T, S> T accept(StatementVisitor<T> statementVisitor, S context) {
 
     @Override
     public String toString() {
-        StringBuilder builder = new StringBuilder("CREATE EVENT ");
+        StringBuilder builder = new StringBuilder("CREATE ");
+        appendDefinerAndEvent(builder);
         if (ifNotExists) {
             builder.append("IF NOT EXISTS ");
         }

src/main/java/net/sf/jsqlparser/statement/create/event/EventStatement.java

@@ -12,18 +12,28 @@
 import net.sf.jsqlparser.expression.StringValue;
 import net.sf.jsqlparser.parser.ASTNodeAccessImpl;
 import net.sf.jsqlparser.schema.Table;
+import net.sf.jsqlparser.statement.MySqlDefiner;
 import net.sf.jsqlparser.statement.Statement;
 
 /** Common structured properties of MySQL {@code CREATE EVENT} and {@code ALTER EVENT}. */
 public abstract class EventStatement extends ASTNodeAccessImpl implements Statement {
 
+    private MySqlDefiner definer;
     private Table event;
     private EventSchedule schedule;
     private Boolean onCompletionPreserve;
     private EventStatus status;
     private StringValue comment;
     private Statement body;
 
+    public MySqlDefiner getDefiner() {
+        return definer;
+    }
+
+    public void setDefiner(MySqlDefiner definer) {
+        this.definer = definer;
+    }
+
     public Table getEvent() {
         return event;
     }
@@ -76,6 +86,14 @@ public void setBody(Statement body) {
         this.body = body;
     }
 
+    /** Appends the optional DEFINER clause, followed by EVENT, after CREATE or ALTER. */
+    protected void appendDefinerAndEvent(StringBuilder builder) {
+        if (definer != null) {
+            builder.append("DEFINER = ").append(definer).append(' ');
+        }
+        builder.append("EVENT ");
+    }
+
     protected void appendScheduleAndCompletion(StringBuilder builder) {
         if (schedule != null) {
             builder.append(" ON SCHEDULE ").append(schedule);

src/main/java/net/sf/jsqlparser/statement/create/event/EventStatus.java

@@ -10,7 +10,8 @@
 package net.sf.jsqlparser.statement.create.event;
 
 public enum EventStatus {
-    ENABLE("ENABLE"), DISABLE("DISABLE"), DISABLE_ON_SLAVE("DISABLE ON SLAVE");
+    ENABLE("ENABLE"), DISABLE("DISABLE"), DISABLE_ON_SLAVE("DISABLE ON SLAVE"), DISABLE_ON_REPLICA(
+            "DISABLE ON REPLICA");
 
     private final String sql;
 

src/main/java/net/sf/jsqlparser/statement/create/table/ColDataType.java

@@ -103,9 +103,10 @@ public static ColDataType fromTypeParameters(String dataType, String precision,
     private void setNumericTypeParameters(String parameter, Integer scale) {
         if (parameter != null) {
             maxPrecision = "MAX".equalsIgnoreCase(parameter);
-            precision = maxPrecision ? null : new BigInteger(parameter);
+            // Oracle's NUMBER(*, s) has no precision of its own.
+            precision = maxPrecision || "*".equals(parameter) ? null : new BigInteger(parameter);
             this.scale = scale;
-            dataType += " (" + (maxPrecision ? "MAX" : precision)
+            dataType += " (" + (maxPrecision ? "MAX" : precision != null ? precision : parameter)
                     + (scale != null ? ", " + scale : "") + ")";
         }
     }
@@ -330,9 +331,10 @@ public ColDataType withXmlTypeModifier(XmlTypeModifier xmlTypeModifier) {
      * The first numeric type parameter, e.g. {@code 255} for {@code VARCHAR(255)} or {@code 10} for
      * {@code DECIMAL(10, 2)}. {@code MAX} is reported as {@link Integer#MAX_VALUE}. Returns
      * {@code null} when the type carries no numeric parameters, e.g. {@code INT} or
-     * {@code ENUM('a', 'b')}, or when a numeric length exceeds the integer range. Use
-     * {@link #getNumericPrecision()} for the full range and {@link #isMaxPrecision()} to
-     * distinguish MAX from the numeric value 2147483647.
+     * {@code ENUM('a', 'b')}, when the precision is Oracle's {@code *} as in {@code NUMBER(*, 0)},
+     * or when a numeric length exceeds the integer range. Use {@link #getNumericPrecision()} for
+     * the full range and {@link #isMaxPrecision()} to distinguish MAX from the numeric value
+     * 2147483647.
      */
     public Integer getPrecision() {
         return maxPrecision ? Integer.valueOf(Integer.MAX_VALUE)