Merge pull request #3 from alibaba/master

同步最新代码

src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/expr/MySqlJSONTableExpr.java

@@ -0,0 +1,164 @@
+package com.alibaba.druid.sql.dialect.mysql.ast.expr;
+
+import com.alibaba.druid.sql.ast.*;
+import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl;
+import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MySqlJSONTableExpr extends MySqlExprImpl {
+    private final List<Column> columns = new ArrayList<Column>();
+    private SQLExpr expr;
+    private SQLExpr path;
+
+    @Override
+    public void accept0(MySqlASTVisitor v) {
+        if (v.visit(this)) {
+            acceptChild(v, expr);
+            acceptChild(v, path);
+            acceptChild(v, columns);
+        }
+        v.endVisit(this);
+    }
+
+    @Override
+    public List<SQLObject> getChildren() {
+        return null;
+    }
+
+    public SQLExpr getExpr() {
+        return expr;
+    }
+
+    public void setExpr(SQLExpr x) {
+        if (x != null) {
+            x.setParent(this);
+        }
+
+        this.expr = x;
+    }
+
+    public SQLExpr getPath() {
+        return path;
+    }
+
+    public void setPath(SQLExpr x) {
+        if (x != null) {
+            x.setParent(this);
+        }
+        this.path = x;
+    }
+
+    public List<Column> getColumns() {
+        return columns;
+    }
+
+    public void addColumn(Column column) {
+        column.setParent(this);
+        this.columns.add(column);
+    }
+
+    public static class Column extends MySqlObjectImpl {
+        private final List<Column> nestedColumns = new ArrayList<Column>();
+        private SQLName name;
+        private SQLDataType dataType;
+        private SQLExpr path;
+        private boolean ordinality;
+        private boolean exists;
+        private SQLExpr onError;
+        private SQLExpr onEmpty;
+
+        @Override
+        public void accept0(MySqlASTVisitor v) {
+            if (v.visit(this)) {
+                acceptChild(v, name);
+                acceptChild(v, dataType);
+                acceptChild(v, path);
+                acceptChild(v, onEmpty);
+                acceptChild(v, onError);
+            }
+            v.endVisit(this);
+        }
+
+        public SQLName getName() {
+            return name;
+        }
+
+        public void setName(SQLName x) {
+            if (x != null) {
+                x.setParent(this);
+            }
+            this.name = x;
+        }
+
+        public SQLDataType getDataType() {
+            return dataType;
+        }
+
+        public void setDataType(SQLDataType x) {
+            if (x != null) {
+                x.setParent(this);
+            }
+            this.dataType = x;
+        }
+
+        public SQLExpr getPath() {
+            return path;
+        }
+
+        public void setPath(SQLExpr x) {
+            if (x != null) {
+                x.setParent(this);
+            }
+            this.path = x;
+        }
+
+        public boolean isOrdinality() {
+            return ordinality;
+        }
+
+        public void setOrdinality(boolean ordinality) {
+            this.ordinality = ordinality;
+        }
+
+        public boolean isExists() {
+            return exists;
+        }
+
+        public void setExists(boolean exists) {
+            this.exists = exists;
+        }
+
+        public SQLExpr getOnError() {
+            return onError;
+        }
+
+        public void setOnError(SQLExpr x) {
+            if (x != null) {
+                x.setParent(this);
+            }
+            this.onError = x;
+        }
+
+        public SQLExpr getOnEmpty() {
+            return onEmpty;
+        }
+
+        public void setOnEmpty(SQLExpr x) {
+            if (x != null) {
+                x.setParent(this);
+            }
+            this.onEmpty = x;
+        }
+
+        public List<Column> getNestedColumns() {
+            return nestedColumns;
+        }
+
+        public void addNestedColumn(Column column) {
+            column.setParent(this);
+            this.nestedColumns.add(column);
+        }
+    }
+}

src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java

@@ -39,6 +39,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectPivot;
 import com.alibaba.druid.sql.dialect.oracle.parser.OracleFunctionDataType;
 import com.alibaba.druid.sql.dialect.oracle.parser.OracleProcedureDataType;
 import com.alibaba.druid.util.FnvHash;
+import com.alibaba.druid.util.JdbcUtils;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -3865,7 +3866,7 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet
 
     @Override
     public boolean visit(SQLSetStatement x) {
-        boolean printSet = x.getAttribute("parser.set") == Boolean.TRUE || DbType.oracle != dbType;
+        boolean printSet = x.getAttribute("parser.set") == Boolean.TRUE || !JdbcUtils.isOracleDbType(dbType);
         if (printSet) {
             print0(ucase ? "SET " : "set ");
         }

src/test/java/com/alibaba/druid/bvt/sql/mysql/create/MySqlCreateProcedureTest15.java

@@ -50,7 +50,7 @@ public class MySqlCreateProcedureTest15 extends MysqlTest {
                 "\tINSERT INTO part_tab\n" +
                 "\tVALUES (v, 'testing partitions', ADDDATE('1995-01-01', RAND(v) * 36520 % 3652));\n" +
                 "\tSET v = v + 1;\n" +
-                "\tEND WHILE\n" +
+                "\tEND WHILE;\n" +
                 "END", SQLUtils.toMySqlString(stmt));
 
         SchemaStatVisitor visitor = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL);