diff --git a/README b/README
index 8fce5e2d1b..6a7fc3c292 100644
--- a/README
+++ b/README
@@ -1,6 +1,10 @@
Introduction
---
-* git clone https://github.com/AlibabaTech/druid.git
+* git clone https://github.com/alibaba/druid.git
* cd druid && mvn install
* have fun.
+Doucumentation
+---
+中文 https://github.com/alibaba/druid/wiki/%E5%B8%B8%E8%A7%81%E9%97%AE%E9%A2%98
+English https://github.com/alibaba/druid/wiki/FAQ
diff --git a/pom.xml b/pom.xml
index d4bee6fefb..8385cae505 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
com.alibaba
druid
- 0.2.12-SNAPSHOT
+ 0.2.16-SNAPSHOT
jar
druid
@@ -131,6 +131,7 @@
+ true
public
UTF-8
UTF-8
diff --git a/src/main/java/com/alibaba/druid/VERSION.java b/src/main/java/com/alibaba/druid/VERSION.java
index 4f63632830..c45969dfdb 100644
--- a/src/main/java/com/alibaba/druid/VERSION.java
+++ b/src/main/java/com/alibaba/druid/VERSION.java
@@ -19,7 +19,7 @@ public final class VERSION {
public final static int MajorVersion = 0;
public final static int MinorVersion = 2;
- public final static int RevisionVersion = 11;
+ public final static int RevisionVersion = 16;
public static String getVersionNumber() {
return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion;
diff --git a/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java b/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java
index 9fa5e095a7..58760be896 100644
--- a/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java
+++ b/src/main/java/com/alibaba/druid/filter/config/ConfigFilter.java
@@ -279,8 +279,8 @@ public class ConfigFilter extends FilterAdapter {
}
}
- @SuppressWarnings("resource")
- private InputStream getFileAsStream(String filePath) throws FileNotFoundException {
+ @SuppressWarnings("resource")
+ private InputStream getFileAsStream(String filePath) throws FileNotFoundException {
InputStream inStream = null;
File file = new File(filePath);
if (file.exists()) {
diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index 4cda1552a8..eff24fb1c9 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -77,6 +77,7 @@ import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.IOUtils;
import com.alibaba.druid.util.JMXUtils;
import com.alibaba.druid.util.JdbcUtils;
+import com.alibaba.druid.wall.WallFilter;
/**
* @author ljw
@@ -584,12 +585,6 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
oracleValidationQueryCheck();
- } else if (JdbcUtils.MYSQL.equals(this.dbType)) {
- if (!this.isTestWhileIdle()) {
- if (LOG.isWarnEnabled()) {
- LOG.warn("Your dbType is mysql, recommend set testWhileIdle is true");
- }
- }
} else if (JdbcUtils.DB2.equals(dbType)) {
db2ValidationQueryCheck();
}
@@ -875,7 +870,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
}
}
this.discardConnection(holder.getConnection());
- pooledConnection.disable();
+ pooledConnection.disable(t);
}
throw sqlEx;
@@ -1440,8 +1435,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
ref.add(new StringRefAddr("instanceKey", instanceKey));
ref.add(new StringRefAddr("url", this.getUrl()));
ref.add(new StringRefAddr("username", this.getUsername()));
- ref.add(new StringRefAddr("password",this.getPassword()));
- //TODO ADD OTHER PROPERTIES
+ ref.add(new StringRefAddr("password", this.getPassword()));
+ // TODO ADD OTHER PROPERTIES
return ref;
}
@@ -1946,6 +1941,17 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
return this.getDataSourceStat().getSqlStatMap();
}
+ public Map getWallStatMap() {
+ for (Filter filter : this.filters) {
+ if (filter instanceof WallFilter) {
+ WallFilter wallFilter = (WallFilter) filter;
+ return wallFilter.getProvider().getStatsMap();
+ }
+ }
+
+ return null;
+ }
+
public Lock getLock() {
return lock;
}
diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java
index 4557d28468..d4d8bed89e 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java
@@ -53,24 +53,28 @@ import com.alibaba.druid.support.logging.LogFactory;
*/
public class DruidPooledConnection extends PoolableWrapper implements javax.sql.PooledConnection, Connection {
- private final static Log LOG = LogFactory.getLog(DruidPooledConnection.class);
+ private final static Log LOG = LogFactory.getLog(DruidPooledConnection.class);
+
+ public static final int MAX_RECORD_SQL_COUNT = 10;
protected Connection conn;
protected volatile DruidConnectionHolder holder;
protected TransactionInfo transactionInfo;
private final boolean dupCloseLogEnable;
- private volatile boolean traceEnable = false;
- private boolean disable = false;
- private boolean closed = false;
+ private volatile boolean traceEnable = false;
+ private boolean disable = false;
+ private boolean closed = false;
private final Thread ownerThread;
private long connectedTimeNano;
- private volatile boolean running = false;
+ private volatile boolean running = false;
- private volatile boolean abandoned = false;
+ private volatile boolean abandoned = false;
private StackTraceElement[] connectStackTrace;
+ private Throwable disableError = null;
+
public DruidPooledConnection(DruidConnectionHolder holder){
super(holder.getConnection());
@@ -148,7 +152,7 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
if (rawStatement.getConnection().isClosed()) {
return;
}
-
+
LOG.error("clear parameter error", ex);
}
}
@@ -179,10 +183,15 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
}
public void disable() {
+ disable(null);
+ }
+
+ public void disable(Throwable error) {
this.traceEnable = false;
this.holder = null;
this.transactionInfo = null;
this.disable = true;
+ this.disableError = error;
}
public boolean isDisable() {
@@ -679,7 +688,10 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
}
if (transactionInfo != null) {
- transactionInfo.getSqlList().add(sql);
+ List sqlList = transactionInfo.getSqlList();
+ if (sqlList.size() < MAX_RECORD_SQL_COUNT) {
+ sqlList.add(sql);
+ }
}
}
@@ -1012,8 +1024,16 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
}
public void checkState() throws SQLException {
- if (holder == null || closed || disable) {
- throw new SQLException("connection is closed");
+ if (holder == null) {
+ throw new SQLException("connection holder is null");
+ }
+
+ if (closed) {
+ throw new SQLException("connection closed");
+ }
+
+ if (disable) {
+ throw new SQLException("connection disabled", disableError);
}
}
diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java
index 10a36ef8dd..664118193e 100644
--- a/src/main/java/com/alibaba/druid/sql/SQLUtils.java
+++ b/src/main/java/com/alibaba/druid/sql/SQLUtils.java
@@ -31,7 +31,6 @@ import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerOutputVisitor;
import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerSchemaStatVisitor;
import com.alibaba.druid.sql.parser.ParserException;
import com.alibaba.druid.sql.parser.SQLExprParser;
-import com.alibaba.druid.sql.parser.SQLParseException;
import com.alibaba.druid.sql.parser.SQLParserUtils;
import com.alibaba.druid.sql.parser.SQLStatementParser;
import com.alibaba.druid.sql.parser.Token;
@@ -150,9 +149,6 @@ public class SQLUtils {
List statementList = toStatementList(sql, dbType);
return toSQLString(statementList, dbType, parameters);
- } catch (SQLParseException ex) {
- LOG.warn("format error", ex);
- return sql;
} catch (ParserException ex) {
LOG.warn("format error", ex);
return sql;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java
index b371006492..294f3ff4a3 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java
@@ -38,7 +38,6 @@ public enum SQLBinaryOperator {
BitwiseAnd("&", 90),
BitwiseOr("|", 100),
- InvertBits("~", 100),
GreaterThan(">", 110),
GreaterThanOrEqual(">=", 110),
@@ -71,12 +70,9 @@ public enum SQLBinaryOperator {
BooleanOr("OR", 160),
Assignment(":=", 169),
+ PostgresStyleTypeCast("::", 20),
;
-
-
-
-
public static int getPriority(SQLBinaryOperator operator) {
return 0;
}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIdentifierExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIdentifierExpr.java
index 4ce5c14321..e8cb662198 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIdentifierExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIdentifierExpr.java
@@ -25,15 +25,16 @@ public class SQLIdentifierExpr extends SQLExprImpl implements SQLName {
private String name;
+ private transient String lowerName;
+
public SQLIdentifierExpr(){
}
public SQLIdentifierExpr(String name){
-
this.name = name;
}
-
+
public String getSimleName() {
return name;
}
@@ -44,6 +45,18 @@ public class SQLIdentifierExpr extends SQLExprImpl implements SQLName {
public void setName(String name) {
this.name = name;
+ this.lowerName = null;
+ }
+
+ public String getLowerName() {
+ if (lowerName == null && name != null) {
+ lowerName = name.toLowerCase();
+ }
+ return lowerName;
+ }
+
+ public void setLowerName(String lowerName) {
+ this.lowerName = lowerName;
}
public void output(StringBuffer buf) {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLPropertyExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLPropertyExpr.java
index 5220ff9cef..69b0ad7fa3 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLPropertyExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLPropertyExpr.java
@@ -28,7 +28,9 @@ public class SQLPropertyExpr extends SQLExprImpl implements SQLName {
private String name;
public SQLPropertyExpr(SQLExpr owner, String name){
-
+ if (owner != null) {
+ owner.setParent(this);
+ }
this.owner = owner;
this.name = name;
}
@@ -46,6 +48,9 @@ public class SQLPropertyExpr extends SQLExprImpl implements SQLName {
}
public void setOwner(SQLExpr owner) {
+ if (owner != null) {
+ owner.setParent(this);
+ }
this.owner = owner;
}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAlterColumn.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAlterColumn.java
new file mode 100644
index 0000000000..a2c2de7ab9
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAlterColumn.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.alibaba.druid.sql.ast.statement;
+
+import com.alibaba.druid.sql.ast.SQLObjectImpl;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
+public class SQLAlterTableAlterColumn extends SQLObjectImpl implements SQLAlterTableItem {
+
+ private static final long serialVersionUID = 1L;
+
+ private SQLColumnDefinition column;
+
+ @Override
+ protected void accept0(SQLASTVisitor visitor) {
+ if (visitor.visit(this)) {
+ acceptChild(visitor, column);
+ }
+ visitor.endVisit(this);
+ }
+
+ public SQLColumnDefinition getColumn() {
+ return column;
+ }
+
+ public void setColumn(SQLColumnDefinition column) {
+ this.column = column;
+ }
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableKeys.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableKeys.java
new file mode 100644
index 0000000000..d526e09368
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDisableKeys.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.sql.ast.statement;
+
+import com.alibaba.druid.sql.ast.SQLObjectImpl;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
+public class SQLAlterTableDisableKeys extends SQLObjectImpl implements SQLAlterTableItem {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void accept0(SQLASTVisitor visitor) {
+ visitor.visit(this);
+ visitor.endVisit(this);
+ }
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeinKey.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeinKey.java
new file mode 100644
index 0000000000..cc2603d069
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropForeinKey.java
@@ -0,0 +1,44 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.sql.ast.statement;
+
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLObjectImpl;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
+public class SQLAlterTableDropForeinKey extends SQLObjectImpl implements SQLAlterTableItem {
+
+ private static final long serialVersionUID = 1L;
+
+ private SQLName indexName;
+
+ public SQLName getIndexName() {
+ return indexName;
+ }
+
+ public void setIndexName(SQLName indexName) {
+ this.indexName = indexName;
+ }
+
+ @Override
+ protected void accept0(SQLASTVisitor visitor) {
+ if (visitor.visit(this)) {
+ acceptChild(visitor, indexName);
+ }
+ visitor.endVisit(this);
+ }
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropPrimaryKey.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropPrimaryKey.java
new file mode 100644
index 0000000000..3c5617c17a
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableDropPrimaryKey.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.sql.ast.statement;
+
+import com.alibaba.druid.sql.ast.SQLObjectImpl;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
+public class SQLAlterTableDropPrimaryKey extends SQLObjectImpl implements SQLAlterTableItem {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void accept0(SQLASTVisitor visitor) {
+ visitor.visit(this);
+ visitor.endVisit(this);
+ }
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableEnableKeys.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableEnableKeys.java
new file mode 100644
index 0000000000..af73924f05
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableEnableKeys.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.sql.ast.statement;
+
+import com.alibaba.druid.sql.ast.SQLObjectImpl;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
+public class SQLAlterTableEnableKeys extends SQLObjectImpl implements SQLAlterTableItem {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void accept0(SQLASTVisitor visitor) {
+ visitor.visit(this);
+ visitor.endVisit(this);
+ }
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableStatement.java
index 0361be89d6..eb159a7b8c 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableStatement.java
@@ -20,6 +20,7 @@ import java.util.List;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLAlterTableStatement extends SQLStatementImpl implements SQLDDLStatement {
@@ -54,4 +55,13 @@ public class SQLAlterTableStatement extends SQLStatementImpl implements SQLDDLSt
public void setName(SQLName name) {
this.setTableSource(new SQLExprTableSource(name));
}
+
+ @Override
+ protected void accept0(SQLASTVisitor visitor) {
+ if (visitor.visit(this)) {
+ acceptChild(visitor, getTableSource());
+ acceptChild(visitor, getItems());
+ }
+ visitor.endVisit(this);
+ }
}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCheck.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCheck.java
new file mode 100644
index 0000000000..72af8193eb
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCheck.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.sql.ast.statement;
+
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
+public class SQLCheck extends SQLConstaintImpl implements SQLTableElement {
+
+ private static final long serialVersionUID = 1L;
+
+ private SQLExpr expr;
+
+ public SQLExpr getExpr() {
+ return expr;
+ }
+
+ public void setExpr(SQLExpr expr) {
+ this.expr = expr;
+ }
+
+ @Override
+ protected void accept0(SQLASTVisitor visitor) {
+ if (visitor.visit(this)) {
+ acceptChild(visitor, this.getName());
+ acceptChild(visitor, this.getExpr());
+ }
+ visitor.endVisit(this);
+ }
+
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateViewStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateViewStatement.java
index 6e1c20beb9..b363021e90 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateViewStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateViewStatement.java
@@ -26,6 +26,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLCreateViewStatement extends SQLStatementImpl implements SQLDDLStatement {
private static final long serialVersionUID = 1L;
+ private boolean orReplace = false;
protected SQLName name;
protected SQLSelect subQuery;
@@ -37,6 +38,14 @@ public class SQLCreateViewStatement extends SQLStatementImpl implements SQLDDLSt
}
+ public boolean isOrReplace() {
+ return orReplace;
+ }
+
+ public void setOrReplace(boolean orReplace) {
+ this.orReplace = orReplace;
+ }
+
public SQLName getName() {
return name;
}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java
index efb3607131..330f524444 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeleteStatement.java
@@ -44,6 +44,9 @@ public class SQLDeleteStatement extends SQLStatementImpl {
}
public void setTableSource(SQLTableSource tableSource) {
+ if (tableSource != null) {
+ tableSource.setParent(this);
+ }
this.tableSource = tableSource;
}
@@ -64,6 +67,9 @@ public class SQLDeleteStatement extends SQLStatementImpl {
}
public void setWhere(SQLExpr where) {
+ if (where != null) {
+ where.setParent(this);
+ }
this.where = where;
}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyConstraint.java
index cc85d568e5..a1147a2d81 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyConstraint.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyConstraint.java
@@ -19,7 +19,7 @@ import java.util.List;
import com.alibaba.druid.sql.ast.SQLName;
-public interface SQLForeignKeyConstraint extends SQLConstaint {
+public interface SQLForeignKeyConstraint extends SQLConstaint, SQLTableElement {
List getReferencingColumns();
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyImpl.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyImpl.java
new file mode 100644
index 0000000000..73db9f4b5d
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyImpl.java
@@ -0,0 +1,50 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.sql.ast.statement;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import com.alibaba.druid.sql.ast.SQLName;
+
+public abstract class SQLForeignKeyImpl extends SQLConstaintImpl implements SQLForeignKeyConstraint {
+
+ private static final long serialVersionUID = 1L;
+ private SQLName referencedTableName;
+ private List referencingColumns = new ArrayList();
+ private List referencedColumns = new ArrayList();
+
+ @Override
+ public List getReferencingColumns() {
+ return referencingColumns;
+ }
+
+ @Override
+ public SQLName getReferencedTableName() {
+ return referencedTableName;
+ }
+
+ @Override
+ public void setReferencedTableName(SQLName value) {
+ this.referencedTableName = value;
+ }
+
+ @Override
+ public List getReferencedColumns() {
+ return referencedColumns;
+ }
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertInto.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertInto.java
index 9acb59dfaf..6396ae3985 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertInto.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertInto.java
@@ -49,6 +49,9 @@ public abstract class SQLInsertInto extends SQLObjectImpl {
}
public void setTableSource(SQLExprTableSource tableSource) {
+ if (tableSource != null) {
+ tableSource.setParent(this);
+ }
this.tableSource = tableSource;
}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLJoinTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLJoinTableSource.java
index 0668977fcf..1af33c8274 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLJoinTableSource.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLJoinTableSource.java
@@ -15,17 +15,21 @@
*/
package com.alibaba.druid.sql.ast.statement;
+import java.util.ArrayList;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLJoinTableSource extends SQLTableSourceImpl {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- protected SQLTableSource left;
- protected JoinType joinType;
- protected SQLTableSource right;
- protected SQLExpr condition;
+ protected SQLTableSource left;
+ protected JoinType joinType;
+ protected SQLTableSource right;
+ protected SQLExpr condition;
+ protected final List using = new ArrayList();
public SQLJoinTableSource(String alias){
super(alias);
@@ -40,6 +44,7 @@ public class SQLJoinTableSource extends SQLTableSourceImpl {
acceptChild(visitor, this.left);
acceptChild(visitor, this.right);
acceptChild(visitor, this.condition);
+ acceptChild(visitor, this.using);
}
visitor.endVisit(this);
@@ -58,6 +63,9 @@ public class SQLJoinTableSource extends SQLTableSourceImpl {
}
public void setLeft(SQLTableSource left) {
+ if (left != null) {
+ left.setParent(this);
+ }
this.left = left;
}
@@ -66,6 +74,9 @@ public class SQLJoinTableSource extends SQLTableSourceImpl {
}
public void setRight(SQLTableSource right) {
+ if (right != null) {
+ right.setParent(this);
+ }
this.right = right;
}
@@ -74,9 +85,16 @@ public class SQLJoinTableSource extends SQLTableSourceImpl {
}
public void setCondition(SQLExpr condition) {
+ if (condition != null) {
+ condition.setParent(this);
+ }
this.condition = condition;
}
+ public List getUsing() {
+ return this.using;
+ }
+
public void output(StringBuffer buf) {
this.left.output(buf);
buf.append(' ');
@@ -91,15 +109,13 @@ public class SQLJoinTableSource extends SQLTableSourceImpl {
}
public static enum JoinType {
- COMMA(","), //
+ COMMA(","), //
JOIN("JOIN"), //
- INNER_JOIN("INNER JOIN"), //
- CROSS_JOIN("CROSS JOIN"), //
- NATURAL_JOIN("NATURAL JOIN"), //
- NATURAL_INNER_JOIN("NATURAL INNER JOIN"), //
- LEFT_OUTER_JOIN("LEFT JOIN"),
- RIGHT_OUTER_JOIN("RIGHT JOIN"),
- FULL_OUTER_JOIN("FULL JOIN"),
+ INNER_JOIN("INNER JOIN"), //
+ CROSS_JOIN("CROSS JOIN"), //
+ NATURAL_JOIN("NATURAL JOIN"), //
+ NATURAL_INNER_JOIN("NATURAL INNER JOIN"), //
+ LEFT_OUTER_JOIN("LEFT JOIN"), RIGHT_OUTER_JOIN("RIGHT JOIN"), FULL_OUTER_JOIN("FULL JOIN"),
STRAIGHT_JOIN("STRAIGHT_JOIN");
public final String name;
@@ -107,6 +123,7 @@ public class SQLJoinTableSource extends SQLTableSourceImpl {
JoinType(String name){
this.name = name;
}
+
public static String toString(JoinType joinType) {
return joinType.name;
}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectItem.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectItem.java
index 68b60494ec..5d78228a68 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectItem.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectItem.java
@@ -35,9 +35,12 @@ public class SQLSelectItem extends SQLObjectImpl {
}
public SQLSelectItem(SQLExpr expr, String alias){
-
this.expr = expr;
this.alias = alias;
+
+ if (expr != null) {
+ expr.setParent(this);
+ }
}
public SQLExpr getExpr() {
@@ -46,6 +49,9 @@ public class SQLSelectItem extends SQLObjectImpl {
public void setExpr(SQLExpr expr) {
this.expr = expr;
+ if (expr != null) {
+ expr.setParent(this);
+ }
}
public String getAlias() {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java
index b2cb7b96bf..30abaf4596 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java
@@ -43,10 +43,13 @@ public class SQLSelectQueryBlock extends SQLSelectQuery {
}
public void setInto(SQLExpr into) {
- this.into = new SQLExprTableSource(into);
+ this.setInto(new SQLExprTableSource(into));
}
public void setInto(SQLExprTableSource into) {
+ if (into != null) {
+ into.setParent(this);
+ }
this.into = into;
}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTruncateStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTruncateStatement.java
index 3a70032ac2..2ba1b69b61 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTruncateStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLTruncateStatement.java
@@ -36,7 +36,9 @@ public class SQLTruncateStatement extends SQLStatementImpl {
}
public void addTableSource(SQLName name) {
- this.tableSources.add(new SQLExprTableSource(name));
+ SQLExprTableSource tableSource = new SQLExprTableSource(name);
+ tableSource.setParent(this);
+ this.tableSources.add(tableSource);
}
@Override
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUpdateStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUpdateStatement.java
index ae582b381a..8590529c23 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUpdateStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUpdateStatement.java
@@ -45,6 +45,9 @@ public class SQLUpdateStatement extends SQLStatementImpl {
}
public void setTableSource(SQLTableSource tableSource) {
+ if (tableSource != null) {
+ tableSource.setParent(this);
+ }
this.tableSource = tableSource;
}
@@ -61,6 +64,9 @@ public class SQLUpdateStatement extends SQLStatementImpl {
}
public void setWhere(SQLExpr where) {
+ if (where != null) {
+ where.setParent(this);
+ }
this.where = where;
}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWithSubqueryClause.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWithSubqueryClause.java
index afc34684ad..b198529845 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWithSubqueryClause.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWithSubqueryClause.java
@@ -55,7 +55,7 @@ public class SQLWithSubqueryClause extends SQLObjectImpl {
private static final long serialVersionUID = 1L;
protected SQLIdentifierExpr name;
protected final List columns = new ArrayList();
- protected SQLSelectQuery subQuery;
+ protected SQLSelect subQuery;
@Override
protected void accept0(SQLASTVisitor visitor) {
@@ -75,11 +75,11 @@ public class SQLWithSubqueryClause extends SQLObjectImpl {
this.name = name;
}
- public SQLSelectQuery getSubQuery() {
+ public SQLSelect getSubQuery() {
return subQuery;
}
- public void setSubQuery(SQLSelectQuery subQuery) {
+ public void setSubQuery(SQLSelect subQuery) {
this.subQuery = subQuery;
}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlForeignKey.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlForeignKey.java
new file mode 100644
index 0000000000..1250d1b158
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlForeignKey.java
@@ -0,0 +1,45 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.sql.dialect.mysql.ast;
+
+import com.alibaba.druid.sql.ast.statement.SQLForeignKeyConstraint;
+import com.alibaba.druid.sql.ast.statement.SQLForeignKeyImpl;
+import com.alibaba.druid.sql.ast.statement.SQLTableElement;
+import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
+public class MySqlForeignKey extends SQLForeignKeyImpl implements SQLForeignKeyConstraint, SQLTableElement {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void accept0(SQLASTVisitor visitor) {
+ if (visitor instanceof MySqlASTVisitor) {
+ accept0((MySqlASTVisitor) visitor);
+ }
+ }
+
+ protected void accept0(MySqlASTVisitor visitor) {
+ if (visitor.visit(this)) {
+ acceptChild(visitor, this.getName());
+ acceptChild(visitor, this.getReferencedTableName());
+ acceptChild(visitor, this.getReferencingColumns());
+ acceptChild(visitor, this.getReferencedColumns());
+ }
+ visitor.endVisit(this);
+ }
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlUnique.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlUnique.java
new file mode 100644
index 0000000000..cb80911516
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/MySqlUnique.java
@@ -0,0 +1,35 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.sql.dialect.mysql.ast;
+
+import com.alibaba.druid.sql.ast.statement.SQLPrimaryKey;
+import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
+
+@SuppressWarnings("serial")
+public class MySqlUnique extends MySqlKey implements SQLPrimaryKey {
+
+ public MySqlUnique(){
+
+ }
+
+ protected void accept0(MySqlASTVisitor visitor) {
+ if (visitor.visit(this)) {
+ acceptChild(visitor, this.getName());
+ acceptChild(visitor, this.getColumns());
+ }
+ visitor.endVisit(this);
+ }
+}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableChangeColumn.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableChangeColumn.java
index 3947ce73da..55fafc03f4 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableChangeColumn.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableChangeColumn.java
@@ -40,7 +40,7 @@ public class MySqlAlterTableChangeColumn extends MySqlObjectImpl implements SQLA
if (visitor.visit(this)) {
acceptChild(visitor, columnName);
acceptChild(visitor, newColumnDefinition);
-
+
acceptChild(visitor, firstColumn);
acceptChild(visitor, afterColumn);
}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableDiscardTablespace.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableDiscardTablespace.java
new file mode 100644
index 0000000000..f8c5d2dc6e
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableDiscardTablespace.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.sql.dialect.mysql.ast.statement;
+
+import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddIndex;
+import com.alibaba.druid.sql.ast.statement.SQLAlterTableItem;
+import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObject;
+import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
+public class MySqlAlterTableDiscardTablespace extends SQLAlterTableAddIndex implements SQLAlterTableItem, MySqlObject {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void accept0(SQLASTVisitor visitor) {
+ if (visitor instanceof MySqlASTVisitor) {
+ accept0((MySqlASTVisitor) visitor);
+ } else {
+ throw new IllegalArgumentException("not support visitor type : " + visitor.getClass().getName());
+ }
+ }
+
+ public void accept0(MySqlASTVisitor visitor) {
+ visitor.visit(this);
+ visitor.endVisit(this);
+ }
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableImportTablespace.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableImportTablespace.java
new file mode 100644
index 0000000000..6eaa054983
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableImportTablespace.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.sql.dialect.mysql.ast.statement;
+
+import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddIndex;
+import com.alibaba.druid.sql.ast.statement.SQLAlterTableItem;
+import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObject;
+import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
+public class MySqlAlterTableImportTablespace extends SQLAlterTableAddIndex implements SQLAlterTableItem, MySqlObject {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void accept0(SQLASTVisitor visitor) {
+ if (visitor instanceof MySqlASTVisitor) {
+ accept0((MySqlASTVisitor) visitor);
+ } else {
+ throw new IllegalArgumentException("not support visitor type : " + visitor.getClass().getName());
+ }
+ }
+
+ public void accept0(MySqlASTVisitor visitor) {
+ visitor.visit(this);
+ visitor.endVisit(this);
+ }
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableModifyColumn.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableModifyColumn.java
new file mode 100644
index 0000000000..25044436e7
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableModifyColumn.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.sql.dialect.mysql.ast.statement;
+
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.statement.SQLAlterTableItem;
+import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
+import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl;
+import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
+
+public class MySqlAlterTableModifyColumn extends MySqlObjectImpl implements SQLAlterTableItem {
+
+ private static final long serialVersionUID = 1L;
+
+
+ private SQLColumnDefinition newColumnDefinition;
+
+ private boolean first;
+
+ private SQLExpr firstColumn;
+ private SQLExpr afterColumn;
+
+ @Override
+ public void accept0(MySqlASTVisitor visitor) {
+ if (visitor.visit(this)) {
+ acceptChild(visitor, newColumnDefinition);
+
+ acceptChild(visitor, firstColumn);
+ acceptChild(visitor, afterColumn);
+ }
+ }
+
+ public SQLExpr getFirstColumn() {
+ return firstColumn;
+ }
+
+ public void setFirstColumn(SQLExpr firstColumn) {
+ this.firstColumn = firstColumn;
+ }
+
+ public SQLExpr getAfterColumn() {
+ return afterColumn;
+ }
+
+ public void setAfterColumn(SQLExpr afterColumn) {
+ this.afterColumn = afterColumn;
+ }
+
+ public SQLColumnDefinition getNewColumnDefinition() {
+ return newColumnDefinition;
+ }
+
+ public void setNewColumnDefinition(SQLColumnDefinition newColumnDefinition) {
+ this.newColumnDefinition = newColumnDefinition;
+ }
+
+ public boolean isFirst() {
+ return first;
+ }
+
+ public void setFirst(boolean first) {
+ this.first = first;
+ }
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableOption.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableOption.java
index f5e50a037d..4ab8be82ec 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableOption.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlAlterTableOption.java
@@ -24,9 +24,9 @@ public class MySqlAlterTableOption extends MySqlObjectImpl implements SQLAlterTa
private static final long serialVersionUID = 1L;
private String name;
- private String value;
+ private Object value;
- public MySqlAlterTableOption(String name, String value){
+ public MySqlAlterTableOption(String name, Object value){
this.name = name;
this.value = value;
}
@@ -48,11 +48,11 @@ public class MySqlAlterTableOption extends MySqlObjectImpl implements SQLAlterTa
this.name = name;
}
- public String getValue() {
+ public Object getValue() {
return value;
}
- public void setValue(String value) {
+ public void setValue(Object value) {
this.value = value;
}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowAuthorsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowAuthorsStatement.java
index 376304e5fc..7b0fdaa673 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowAuthorsStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowAuthorsStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowAuthorsStatement extends MySqlStatementImpl {
+public class MySqlShowAuthorsStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinLogEventsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinLogEventsStatement.java
index 8f2dc2699d..5080bef506 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinLogEventsStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinLogEventsStatement.java
@@ -19,7 +19,7 @@ import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock.Limit;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowBinLogEventsStatement extends MySqlStatementImpl {
+public class MySqlShowBinLogEventsStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinaryLogsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinaryLogsStatement.java
index 16c44c1765..f18b3479e0 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinaryLogsStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowBinaryLogsStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowBinaryLogsStatement extends MySqlStatementImpl {
+public class MySqlShowBinaryLogsStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCharacterSetStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCharacterSetStatement.java
index 9010892e58..32137ca4c1 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCharacterSetStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCharacterSetStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowCharacterSetStatement extends MySqlStatementImpl {
+public class MySqlShowCharacterSetStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCollationStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCollationStatement.java
index 961c53b02c..c6d56c8833 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCollationStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCollationStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowCollationStatement extends MySqlStatementImpl {
+public class MySqlShowCollationStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowColumnsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowColumnsStatement.java
index d765617ec1..3fc96fa099 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowColumnsStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowColumnsStatement.java
@@ -21,7 +21,7 @@ import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowColumnsStatement extends MySqlStatementImpl {
+public class MySqlShowColumnsStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowContributorsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowContributorsStatement.java
index 8023dac9b2..7163b9415f 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowContributorsStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowContributorsStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowContributorsStatement extends MySqlStatementImpl {
+public class MySqlShowContributorsStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateDatabaseStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateDatabaseStatement.java
index fd67aaf519..0b79f7facf 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateDatabaseStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateDatabaseStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowCreateDatabaseStatement extends MySqlStatementImpl {
+public class MySqlShowCreateDatabaseStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateEventStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateEventStatement.java
index 34ec26ec6e..a2445e28d7 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateEventStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateEventStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowCreateEventStatement extends MySqlStatementImpl {
+public class MySqlShowCreateEventStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateFunctionStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateFunctionStatement.java
index 291989ed43..9442970ddf 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateFunctionStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateFunctionStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowCreateFunctionStatement extends MySqlStatementImpl {
+public class MySqlShowCreateFunctionStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateProcedureStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateProcedureStatement.java
index 14c3026801..9b80c7b3fd 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateProcedureStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateProcedureStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowCreateProcedureStatement extends MySqlStatementImpl {
+public class MySqlShowCreateProcedureStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateTableStatement.java
index 3055dd6033..a0c8b4d097 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateTableStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateTableStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowCreateTableStatement extends MySqlStatementImpl {
+public class MySqlShowCreateTableStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateTriggerStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateTriggerStatement.java
index ac5460fd23..2e9611c8cb 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateTriggerStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateTriggerStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowCreateTriggerStatement extends MySqlStatementImpl {
+public class MySqlShowCreateTriggerStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateViewStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateViewStatement.java
index 40f5c4dd91..5596f08ab0 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateViewStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowCreateViewStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowCreateViewStatement extends MySqlStatementImpl {
+public class MySqlShowCreateViewStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDatabasesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDatabasesStatement.java
index 96491082ec..a48e64e8af 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDatabasesStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowDatabasesStatement.java
@@ -19,7 +19,7 @@ import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowDatabasesStatement extends MySqlStatementImpl {
+public class MySqlShowDatabasesStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEngineStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEngineStatement.java
index 378c8131ad..b4cef94d1a 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEngineStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEngineStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowEngineStatement extends MySqlStatementImpl {
+public class MySqlShowEngineStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEnginesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEnginesStatement.java
index 386efc01c4..37cfd208a8 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEnginesStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEnginesStatement.java
@@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowEnginesStatement extends MySqlStatementImpl {
+public class MySqlShowEnginesStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
private boolean storage = false;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowErrorsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowErrorsStatement.java
index 0ba9db8a1e..5ffa444e8f 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowErrorsStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowErrorsStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock.Limit;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowErrorsStatement extends MySqlStatementImpl {
+public class MySqlShowErrorsStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEventsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEventsStatement.java
index 1b067482be..3656d7bdde 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEventsStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowEventsStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowEventsStatement extends MySqlStatementImpl {
+public class MySqlShowEventsStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowFunctionCodeStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowFunctionCodeStatement.java
index a1a7e8b2c2..68e12e900a 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowFunctionCodeStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowFunctionCodeStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowFunctionCodeStatement extends MySqlStatementImpl {
+public class MySqlShowFunctionCodeStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowFunctionStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowFunctionStatusStatement.java
index 12378b3c2b..53edb1910b 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowFunctionStatusStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowFunctionStatusStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowFunctionStatusStatement extends MySqlStatementImpl {
+public class MySqlShowFunctionStatusStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowGrantsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowGrantsStatement.java
index 768f9a522b..30754e44c1 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowGrantsStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowGrantsStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowGrantsStatement extends MySqlStatementImpl {
+public class MySqlShowGrantsStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowIndexesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowIndexesStatement.java
index 5eff5a0a35..b2e5e99371 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowIndexesStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowIndexesStatement.java
@@ -20,7 +20,7 @@ import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowIndexesStatement extends MySqlStatementImpl {
+public class MySqlShowIndexesStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowKeysStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowKeysStatement.java
index aabdbf7f50..63af10c844 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowKeysStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowKeysStatement.java
@@ -20,7 +20,7 @@ import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowKeysStatement extends MySqlStatementImpl {
+public class MySqlShowKeysStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterLogsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterLogsStatement.java
index 7477f926b1..5e5ee43361 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterLogsStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterLogsStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowMasterLogsStatement extends MySqlStatementImpl {
+public class MySqlShowMasterLogsStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterStatusStatement.java
index b1389ababd..a99b49e88f 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterStatusStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowMasterStatusStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowMasterStatusStatement extends MySqlStatementImpl {
+public class MySqlShowMasterStatusStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowOpenTablesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowOpenTablesStatement.java
index 3637e27b4d..e2c1629773 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowOpenTablesStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowOpenTablesStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowOpenTablesStatement extends MySqlStatementImpl {
+public class MySqlShowOpenTablesStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPluginsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPluginsStatement.java
index 3dd093b413..19415b19a1 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPluginsStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPluginsStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowPluginsStatement extends MySqlStatementImpl {
+public class MySqlShowPluginsStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPrivilegesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPrivilegesStatement.java
index ad172b1c98..08f4b6f0d1 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPrivilegesStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowPrivilegesStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowPrivilegesStatement extends MySqlStatementImpl {
+public class MySqlShowPrivilegesStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcedureCodeStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcedureCodeStatement.java
index c827f6ee0a..8df39c6d7b 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcedureCodeStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcedureCodeStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowProcedureCodeStatement extends MySqlStatementImpl {
+public class MySqlShowProcedureCodeStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcedureStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcedureStatusStatement.java
index 6ad9403429..3ae6fce5a1 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcedureStatusStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcedureStatusStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowProcedureStatusStatement extends MySqlStatementImpl {
+public class MySqlShowProcedureStatusStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcessListStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcessListStatement.java
index 6a2bb5af8f..e2a3da1607 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcessListStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProcessListStatement.java
@@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowProcessListStatement extends MySqlStatementImpl {
+public class MySqlShowProcessListStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProfileStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProfileStatement.java
index eb9023457b..fdbdf1151b 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProfileStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProfileStatement.java
@@ -22,7 +22,7 @@ import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock.Limit;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowProfileStatement extends MySqlStatementImpl {
+public class MySqlShowProfileStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProfilesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProfilesStatement.java
index 822e7fb324..7b2174f1dc 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProfilesStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowProfilesStatement.java
@@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowProfilesStatement extends MySqlStatementImpl {
+public class MySqlShowProfilesStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowRelayLogEventsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowRelayLogEventsStatement.java
index a36e058655..5aa49da5f9 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowRelayLogEventsStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowRelayLogEventsStatement.java
@@ -19,7 +19,7 @@ import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock.Limit;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowRelayLogEventsStatement extends MySqlStatementImpl {
+public class MySqlShowRelayLogEventsStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlaveHostsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlaveHostsStatement.java
index d5539fe704..8ebce36046 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlaveHostsStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlaveHostsStatement.java
@@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowSlaveHostsStatement extends MySqlStatementImpl {
+public class MySqlShowSlaveHostsStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlaveStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlaveStatusStatement.java
index 239d763bfe..3d0065082e 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlaveStatusStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowSlaveStatusStatement.java
@@ -17,7 +17,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowSlaveStatusStatement extends MySqlStatementImpl {
+public class MySqlShowSlaveStatusStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowStatement.java
new file mode 100644
index 0000000000..b4227d9086
--- /dev/null
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowStatement.java
@@ -0,0 +1,21 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.alibaba.druid.sql.dialect.mysql.ast.statement;
+
+
+public interface MySqlShowStatement {
+
+}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowStatusStatement.java
index 38328172e7..028f2f814e 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowStatusStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowStatusStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowStatusStatement extends MySqlStatementImpl {
+public class MySqlShowStatusStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTableStatusStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTableStatusStatement.java
index e420148831..58f750fe9a 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTableStatusStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTableStatusStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowTableStatusStatement extends MySqlStatementImpl {
+public class MySqlShowTableStatusStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTablesStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTablesStatement.java
index 43aa955026..ed917d31e0 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTablesStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTablesStatement.java
@@ -19,7 +19,7 @@ import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowTablesStatement extends MySqlStatementImpl {
+public class MySqlShowTablesStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTriggersStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTriggersStatement.java
index 0217f27022..edfba267df 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTriggersStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowTriggersStatement.java
@@ -19,7 +19,7 @@ import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowTriggersStatement extends MySqlStatementImpl {
+public class MySqlShowTriggersStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowVariantsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowVariantsStatement.java
index 6afdec2cd0..eb781472af 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowVariantsStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowVariantsStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowVariantsStatement extends MySqlStatementImpl {
+public class MySqlShowVariantsStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowWarningsStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowWarningsStatement.java
index 34b82409d7..5cde0ee01a 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowWarningsStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlShowWarningsStatement.java
@@ -18,7 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.ast.statement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock.Limit;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
-public class MySqlShowWarningsStatement extends MySqlStatementImpl {
+public class MySqlShowWarningsStatement extends MySqlStatementImpl implements MySqlShowStatement {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java
index 461baf6788..8a065445fb 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java
@@ -16,10 +16,12 @@
package com.alibaba.druid.sql.dialect.mysql.parser;
import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.statement.SQLCheck;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
import com.alibaba.druid.sql.ast.statement.SQLSelect;
import com.alibaba.druid.sql.ast.statement.SQLTableConstaint;
+import com.alibaba.druid.sql.dialect.mysql.ast.MySqlForeignKey;
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlKey;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByKey;
@@ -43,6 +45,10 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
return parseCrateTable(true);
}
+ public MySqlExprParser getExprParser() {
+ return (MySqlExprParser) exprParser;
+ }
+
public MySqlCreateTableStatement parseCrateTable(boolean acceptCreate) {
if (acceptCreate) {
accept(Token.CREATE);
@@ -73,7 +79,10 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
if (lexer.token() == Token.IDENTIFIER) {
SQLColumnDefinition column = this.exprParser.parseColumn();
stmt.getTableElementList().add(column);
- } else if (lexer.token() == (Token.CONSTRAINT)) {
+ } else if (lexer.token() == Token.CONSTRAINT //
+ || lexer.token() == Token.PRIMARY //
+ || lexer.token() == Token.UNIQUE
+ ) {
stmt.getTableElementList().add(parseConstraint());
} else if (lexer.token() == (Token.INDEX)) {
lexer.nextToken();
@@ -108,6 +117,32 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
stmt.getTableElementList().add(parseConstraint());
} else if (lexer.token() == (Token.PRIMARY)) {
stmt.getTableElementList().add(parseConstraint());
+ } else if (lexer.token() == (Token.FOREIGN)) {
+ lexer.nextToken();
+ accept(Token.KEY);
+
+ MySqlForeignKey fk = new MySqlForeignKey();
+
+ accept(Token.LPAREN);
+ this.exprParser.names(fk.getReferencingColumns());
+ accept(Token.RPAREN);
+
+ accept(Token.REFERENCES);
+
+ fk.setReferencedTableName(this.exprParser.name());
+
+ accept(Token.LPAREN);
+ this.exprParser.names(fk.getReferencedColumns());
+ accept(Token.RPAREN);
+
+ stmt.getTableElementList().add(fk);
+ } else if (lexer.token() == Token.CHECK) {
+ lexer.nextToken();
+ SQLCheck check = new SQLCheck();
+ accept(Token.LPAREN);
+ check.setExpr(this.exprParser.expr());
+ accept(Token.RPAREN);
+ stmt.getTableElementList().add(check);
}
if (!(lexer.token() == (Token.COMMA))) {
@@ -165,6 +200,26 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
}
}
+ if (lexer.token() == Token.DEFAULT) {
+ lexer.nextToken();
+ if (identifierEquals("CHARACTER")) {
+ lexer.nextToken();
+ accept(Token.SET);
+ if (lexer.token() == Token.EQ) {
+ lexer.nextToken();
+ }
+ stmt.getTableOptions().put("CHARACTER SET", lexer.stringVal());
+ lexer.nextToken();
+ } else if (identifierEquals("CHARSET")) {
+ lexer.nextToken();
+ if (lexer.token() == Token.EQ) {
+ lexer.nextToken();
+ }
+ stmt.getTableOptions().put("CHARSET", lexer.stringVal());
+ lexer.nextToken();
+ }
+ }
+
break;
}
@@ -215,7 +270,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
}
}
accept(Token.RPAREN);
-
+
if (name != null) {
key.setName(name);
}
@@ -227,6 +282,10 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
return (SQLTableConstaint) this.exprParser.parsePrimaryKey();
}
+ if (lexer.token() == (Token.UNIQUE)) {
+ return (SQLTableConstaint) this.getExprParser().parseUnique();
+ }
+
throw new ParserException("TODO");
}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java
index 0b3d672990..f04194e9c9 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlExprParser.java
@@ -31,6 +31,7 @@ import com.alibaba.druid.sql.ast.statement.SQLAssignItem;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
import com.alibaba.druid.sql.ast.statement.SQLPrimaryKey;
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlPrimaryKey;
+import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUnique;
import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlBinaryExpr;
import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlBooleanExpr;
import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlCharExpr;
@@ -56,7 +57,7 @@ public class MySqlExprParser extends SQLExprParser {
super(lexer);
}
- public MySqlExprParser(String sql) {
+ public MySqlExprParser(String sql){
this(new MySqlLexer(sql));
this.lexer.nextToken();
}
@@ -70,7 +71,7 @@ public class MySqlExprParser extends SQLExprParser {
return new SQLBinaryOpExpr(expr, SQLBinaryOperator.RegExp, rightExp);
}
-
+
if (identifierEquals("RLIKE")) {
lexer.nextToken();
SQLExpr rightExp = equality();
@@ -105,7 +106,7 @@ public class MySqlExprParser extends SQLExprParser {
return new SQLBinaryOpExpr(expr, SQLBinaryOperator.NotRegExp, rightExp);
}
-
+
if (identifierEquals("RLIKE")) {
lexer.nextToken();
SQLExpr rightExp = primary();
@@ -120,14 +121,14 @@ public class MySqlExprParser extends SQLExprParser {
public SQLExpr primary() {
final Token tok = lexer.token();
-
+
if (identifierEquals("outfile")) {
lexer.nextToken();
SQLExpr file = primary();
SQLExpr expr = new MySqlOutFileExpr(file);
-
+
return primaryRest(expr);
-
+
}
switch (tok) {
@@ -154,7 +155,7 @@ public class MySqlExprParser extends SQLExprParser {
} else if (varRefExpr.getName().equals("@@") && lexer.token() == Token.LITERAL_CHARS) {
varRefExpr.setName("@@'" + lexer.stringVal() + "'");
lexer.nextToken();
- }
+ }
return primaryRest(varRefExpr);
case VALUES:
lexer.nextToken();
@@ -164,8 +165,15 @@ public class MySqlExprParser extends SQLExprParser {
return this.methodRest(new SQLIdentifierExpr("VALUES"), true);
case BINARY:
lexer.nextToken();
- SQLUnaryExpr binaryExpr = new SQLUnaryExpr(SQLUnaryOperator.BINARY, expr());
- return primaryRest(binaryExpr);
+ if (lexer.token() == Token.COMMA || lexer.token() == Token.SEMI || lexer.token() == Token.EOF) {
+ return new SQLIdentifierExpr("BINARY");
+ } else {
+ SQLUnaryExpr binaryExpr = new SQLUnaryExpr(SQLUnaryOperator.BINARY, expr());
+ return primaryRest(binaryExpr);
+ }
+ case GROUP:
+ lexer.nextToken();
+ return primaryRest(new SQLIdentifierExpr(lexer.stringVal()));
default:
return super.primary();
}
@@ -318,12 +326,12 @@ public class MySqlExprParser extends SQLExprParser {
} else if (lexer.token() == Token.FROM) {
lexer.nextToken();
SQLExpr from = expr();
- methodInvokeExpr.putAttribute("FROM", from);
+ methodInvokeExpr.getParameters().add(from);
if (lexer.token() == Token.FOR) {
lexer.nextToken();
SQLExpr forExpr = expr();
- methodInvokeExpr.putAttribute("FOR", forExpr);
+ methodInvokeExpr.getParameters().add(forExpr);
}
break;
} else if (lexer.token() == Token.RPAREN) {
@@ -399,6 +407,10 @@ public class MySqlExprParser extends SQLExprParser {
} else {
matchAgainstExpr.setSearchModifier(SearchModifier.IN_NATURAL_LANGUAGE_MODE);
}
+ } else if (identifierEquals("BOOLEAN")) {
+ lexer.nextToken();
+ acceptIdentifier("MODE");
+ matchAgainstExpr.setSearchModifier(SearchModifier.IN_BOOLEAN_MODE);
} else {
throw new ParserException("TODO");
}
@@ -436,16 +448,16 @@ public class MySqlExprParser extends SQLExprParser {
return primaryRest(expr);
}
}
-
+
if (lexer.token() == Token.VARIANT && "@".equals(lexer.stringVal())) {
lexer.nextToken();
MySqlUserName userName = new MySqlUserName();
if (expr instanceof SQLCharExpr) {
- userName.setUserName(((SQLCharExpr)expr).toString());
+ userName.setUserName(((SQLCharExpr) expr).toString());
} else {
- userName.setUserName(((SQLIdentifierExpr)expr).getName());
+ userName.setUserName(((SQLIdentifierExpr) expr).getName());
}
-
+
if (lexer.token() == Token.LITERAL_CHARS) {
userName.setHost("'" + lexer.stringVal() + "'");
} else {
@@ -493,7 +505,7 @@ public class MySqlExprParser extends SQLExprParser {
return intervalExpr;
}
}
-
+
public SQLColumnDefinition parseColumn() {
MySqlSQLColumnDefinition column = new MySqlSQLColumnDefinition();
column.setName(name());
@@ -510,7 +522,7 @@ public class MySqlExprParser extends SQLExprParser {
}
return parseColumnRest(column);
}
-
+
if (identifierEquals("PARTITION")) {
throw new ParserException("syntax error " + lexer.token() + " " + lexer.stringVal());
}
@@ -518,7 +530,7 @@ public class MySqlExprParser extends SQLExprParser {
return column;
}
-
+
public SQLExpr orRest(SQLExpr expr) {
for (;;) {
@@ -539,44 +551,57 @@ public class MySqlExprParser extends SQLExprParser {
return expr;
}
-
+
public SQLAssignItem parseAssignItem() {
SQLAssignItem item = new SQLAssignItem();
-
+
SQLExpr var = primary();
-
+
+ String ident = null;
if (var instanceof SQLIdentifierExpr) {
- String ident = ((SQLIdentifierExpr) var).getName();
-
+ ident = ((SQLIdentifierExpr) var).getName();
+
if ("GLOBAL".equalsIgnoreCase(ident)) {
ident = lexer.stringVal();
lexer.nextToken();
var = new SQLVariantRefExpr(ident, true);
} else if ("SESSION".equalsIgnoreCase(ident)) {
- ident = lexer.stringVal();
- lexer.nextToken();
- var = new SQLVariantRefExpr(ident, false);
+ ident = lexer.stringVal();
+ lexer.nextToken();
+ var = new SQLVariantRefExpr(ident, false);
} else {
var = new SQLVariantRefExpr(ident);
}
}
- item.setTarget(var);
- if (lexer.token() == Token.COLONEQ) {
- lexer.nextToken();
- } else {
- accept(Token.EQ);
- }
- item.setValue(expr());
+ if ("NAMES".equalsIgnoreCase(ident)) {
+ // skip
+ } else if ("CHARACTER".equalsIgnoreCase(ident)) {
+ var = new SQLIdentifierExpr("CHARACTER SET");
+ accept(Token.SET);
+ if (lexer.token() == Token.EQ) {
+ lexer.nextToken();
+ }
+ } else {
+ if (lexer.token() == Token.COLONEQ) {
+ lexer.nextToken();
+ } else {
+ accept(Token.EQ);
+ }
+ }
+
+ item.setValue(this.expr());
+
+ item.setTarget(var);
return item;
}
-
+
public SQLName nameRest(SQLName name) {
if (lexer.token() == Token.VARIANT && "@".equals(lexer.stringVal())) {
lexer.nextToken();
MySqlUserName userName = new MySqlUserName();
- userName.setUserName(((SQLIdentifierExpr)name).getName());
-
+ userName.setUserName(((SQLIdentifierExpr) name).getName());
+
if (lexer.token() == Token.LITERAL_CHARS) {
userName.setHost("'" + lexer.stringVal() + "'");
} else {
@@ -587,7 +612,7 @@ public class MySqlExprParser extends SQLExprParser {
}
return super.nameRest(name);
}
-
+
public Limit parseLimit() {
if (lexer.token() == Token.LIMIT) {
lexer.nextToken();
@@ -638,4 +663,29 @@ public class MySqlExprParser extends SQLExprParser {
return primaryKey;
}
+
+ public MySqlUnique parseUnique() {
+ accept(Token.UNIQUE);
+
+ MySqlUnique primaryKey = new MySqlUnique();
+
+ if (identifierEquals("USING")) {
+ lexer.nextToken();
+ primaryKey.setIndexType(lexer.stringVal());
+ lexer.nextToken();
+ }
+
+ accept(Token.LPAREN);
+ for (;;) {
+ primaryKey.getColumns().add(this.expr());
+ if (!(lexer.token() == (Token.COMMA))) {
+ break;
+ } else {
+ lexer.nextToken();
+ }
+ }
+ accept(Token.RPAREN);
+
+ return primaryKey;
+ }
}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java
index 0b70649d41..a295bc1a84 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java
@@ -27,7 +27,6 @@ import com.alibaba.druid.sql.parser.Keywords;
import com.alibaba.druid.sql.parser.Lexer;
import com.alibaba.druid.sql.parser.NotAllowCommentException;
import com.alibaba.druid.sql.parser.ParserException;
-import com.alibaba.druid.sql.parser.SQLParseException;
import com.alibaba.druid.sql.parser.Token;
public class MySqlLexer extends Lexer {
@@ -64,7 +63,7 @@ public class MySqlLexer extends Lexer {
public void scanVariable() {
if (ch != '@' && ch != ':' && ch != '#' && ch != '$') {
- throw new SQLParseException("illegal variable");
+ throw new ParserException("illegal variable");
}
mark = pos;
@@ -87,7 +86,7 @@ public class MySqlLexer extends Lexer {
ch = charAt(++pos);
break;
} else if (ch == EOI) {
- throw new SQLParseException("illegal identifier");
+ throw new ParserException("illegal identifier");
}
bufPos++;
@@ -110,7 +109,7 @@ public class MySqlLexer extends Lexer {
ch = charAt(++pos);
break;
} else if (ch == EOI) {
- throw new SQLParseException("illegal identifier");
+ throw new ParserException("illegal identifier");
}
bufPos++;
@@ -156,7 +155,7 @@ public class MySqlLexer extends Lexer {
ch = charAt(++pos);
break;
} else if (ch == EOI) {
- throw new SQLParseException("illegal identifier");
+ throw new ParserException("illegal identifier");
}
bufPos++;
@@ -176,7 +175,7 @@ public class MySqlLexer extends Lexer {
final boolean firstFlag = isFirstIdentifierChar(first);
if (!firstFlag) {
- throw new SQLParseException("illegal identifier");
+ throw new ParserException("illegal identifier");
}
mark = pos;
@@ -204,12 +203,12 @@ public class MySqlLexer extends Lexer {
}
}
}
-
+
protected final void scanString() {
{
boolean hasSpecial = false;
int startIndex = pos + 1;
- int endIndex = -1; //text.indexOf('\'', startIndex);
+ int endIndex = -1; // text.indexOf('\'', startIndex);
for (int i = startIndex; i < text.length(); ++i) {
final char ch = text.charAt(i);
if (ch == '\\') {
@@ -220,13 +219,13 @@ public class MySqlLexer extends Lexer {
break;
}
}
-
+
if (endIndex == -1) {
throw new ParserException("unclosed str");
}
String stringVal = subString(startIndex, endIndex - startIndex);
-// hasSpecial = stringVal.indexOf('\\') != -1;
+ // hasSpecial = stringVal.indexOf('\\') != -1;
if (!hasSpecial) {
this.stringVal = stringVal;
@@ -329,6 +328,8 @@ public class MySqlLexer extends Lexer {
}
public void scanComment() {
+ Token lastToken = this.token;
+
if (ch != '/' && ch != '-') {
throw new IllegalStateException();
}
@@ -356,6 +357,10 @@ public class MySqlLexer extends Lexer {
}
for (;;) {
+ if (ch == EOI) {
+ this.token = Token.ERROR;
+ return;
+ }
if (ch == '*' && charAt(pos + 1) == '/') {
bufPos += 2;
scanChar();
@@ -375,8 +380,14 @@ public class MySqlLexer extends Lexer {
token = Token.MULTI_LINE_COMMENT;
}
- if (token != Token.HINT && !isAllowComment()) {
- throw new NotAllowCommentException();
+ if (token != Token.HINT) {
+ if (commentHandler != null && commentHandler.handle(lastToken, stringVal)) {
+ return;
+ }
+
+ if (!isAllowComment()) {
+ throw new NotAllowCommentException();
+ }
}
return;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java
index bb39281bd1..10d1f4c99e 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlSelectParser.java
@@ -17,6 +17,7 @@ package com.alibaba.druid.sql.dialect.mysql.parser;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLSetQuantifier;
+import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr;
import com.alibaba.druid.sql.ast.statement.SQLSelectGroupByClause;
import com.alibaba.druid.sql.ast.statement.SQLSelectQuery;
@@ -44,7 +45,7 @@ public class MySqlSelectParser extends SQLSelectParser {
super(exprParser);
}
- public MySqlSelectParser(String sql) {
+ public MySqlSelectParser(String sql){
this(new MySqlExprParser(sql));
}
@@ -64,9 +65,14 @@ public class MySqlSelectParser extends SQLSelectParser {
if (lexer.token() == Token.SELECT) {
lexer.nextToken();
+
if (lexer.token() == Token.HINT) {
this.exprParser.parseHints(queryBlock.getHints());
}
+
+ if (lexer.token() == Token.COMMENT) {
+ lexer.nextToken();
+ }
if (lexer.token() == (Token.DISTINCT)) {
queryBlock.setDistionOption(SQLSetQuantifier.DISTINCT);
@@ -260,7 +266,7 @@ public class MySqlSelectParser extends SQLSelectParser {
return tableSource;
}
- if (identifierEquals("USE")) {
+ if (lexer.token() == Token.USE) {
lexer.nextToken();
MySqlUseIndexHint hint = new MySqlUseIndexHint();
parseIndexHint(hint);
@@ -273,7 +279,7 @@ public class MySqlSelectParser extends SQLSelectParser {
parseIndexHint(hint);
tableSource.getHints().add(hint);
}
-
+
if (identifierEquals("FORCE")) {
lexer.nextToken();
MySqlForceIndexHint hint = new MySqlForceIndexHint();
@@ -290,10 +296,10 @@ public class MySqlSelectParser extends SQLSelectParser {
} else {
accept(Token.KEY);
}
-
+
if (lexer.token() == Token.FOR) {
lexer.nextToken();
-
+
if (lexer.token() == Token.JOIN) {
lexer.nextToken();
hint.setOption(MySqlIndexHint.Option.JOIN);
@@ -307,9 +313,14 @@ public class MySqlSelectParser extends SQLSelectParser {
hint.setOption(MySqlIndexHint.Option.GROUP_BY);
}
}
-
+
accept(Token.LPAREN);
- this.exprParser.names(hint.getIndexList());
+ if (lexer.token() == Token.PRIMARY) {
+ lexer.nextToken();
+ hint.getIndexList().add(new SQLIdentifierExpr("PRIMARY"));
+ } else {
+ this.exprParser.names(hint.getIndexList());
+ }
accept(Token.RPAREN);
}
@@ -326,6 +337,6 @@ public class MySqlSelectParser extends SQLSelectParser {
}
public Limit parseLimit() {
- return ((MySqlExprParser)this.exprParser) .parseLimit();
+ return ((MySqlExprParser) this.exprParser).parseLimit();
}
}
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
index 1a0b0991b4..29fddfbff3 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java
@@ -30,8 +30,13 @@ import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr;
import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddPrimaryKey;
+import com.alibaba.druid.sql.ast.statement.SQLAlterTableAlterColumn;
+import com.alibaba.druid.sql.ast.statement.SQLAlterTableDisableKeys;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropColumnItem;
+import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropForeinKey;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropIndex;
+import com.alibaba.druid.sql.ast.statement.SQLAlterTableDropPrimaryKey;
+import com.alibaba.druid.sql.ast.statement.SQLAlterTableEnableKeys;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
import com.alibaba.druid.sql.ast.statement.SQLCreateDatabaseStatement;
import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
@@ -53,6 +58,9 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableAddIndex
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableAddUnique;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableChangeColumn;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableCharacter;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableDiscardTablespace;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableImportTablespace;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableModifyColumn;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableOption;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlBinlogStatement;
@@ -130,42 +138,42 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUnlockTablesStatem
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlUpdateStatement;
import com.alibaba.druid.sql.parser.Lexer;
import com.alibaba.druid.sql.parser.ParserException;
-import com.alibaba.druid.sql.parser.SQLParseException;
import com.alibaba.druid.sql.parser.SQLSelectParser;
import com.alibaba.druid.sql.parser.SQLStatementParser;
import com.alibaba.druid.sql.parser.Token;
public class MySqlStatementParser extends SQLStatementParser {
- private static final String COLLATE2 = "COLLATE";
- private static final String CASCADE = "CASCADE";
- private static final String RESTRICT = "RESTRICT";
- private static final String CHAIN = "CHAIN";
- private static final String ENGINES = "ENGINES";
- private static final String ENGINE = "ENGINE";
- private static final String BINLOG = "BINLOG";
- private static final String EVENTS = "EVENTS";
- private static final String CHARACTER = "CHARACTER";
- private static final String SESSION = "SESSION";
- private static final String GLOBAL = "GLOBAL";
- private static final String VARIABLES = "VARIABLES";
- private static final String ERRORS = "ERRORS";
- private static final String STATUS = "STATUS";
- private static final String IGNORE = "IGNORE";
- private static final String RESET = "RESET";
- private static final String DESCRIBE = "DESCRIBE";
- private static final String DESC = "DESC";
- private static final String WRITE = "WRITE";
- private static final String READ = "READ";
- private static final String LOCAL = "LOCAL";
- private static final String TABLES = "TABLES";
- private static final String TEMPORARY = "TEMPORARY";
- private static final String USER = "USER";
- private static final String SPATIAL = "SPATIAL";
- private static final String FULLTEXT = "FULLTEXT";
- private static final String REPLACE = "REPLACE";
- private static final String DELAYED = "DELAYED";
- private static final String LOW_PRIORITY = "LOW_PRIORITY";
+ private static final String AUTO_INCREMENT = "AUTO_INCREMENT";
+ private static final String COLLATE2 = "COLLATE";
+ private static final String CASCADE = "CASCADE";
+ private static final String RESTRICT = "RESTRICT";
+ private static final String CHAIN = "CHAIN";
+ private static final String ENGINES = "ENGINES";
+ private static final String ENGINE = "ENGINE";
+ private static final String BINLOG = "BINLOG";
+ private static final String EVENTS = "EVENTS";
+ private static final String CHARACTER = "CHARACTER";
+ private static final String SESSION = "SESSION";
+ private static final String GLOBAL = "GLOBAL";
+ private static final String VARIABLES = "VARIABLES";
+ private static final String ERRORS = "ERRORS";
+ private static final String STATUS = "STATUS";
+ private static final String IGNORE = "IGNORE";
+ private static final String RESET = "RESET";
+ private static final String DESCRIBE = "DESCRIBE";
+ private static final String DESC = "DESC";
+ private static final String WRITE = "WRITE";
+ private static final String READ = "READ";
+ private static final String LOCAL = "LOCAL";
+ private static final String TABLES = "TABLES";
+ private static final String TEMPORARY = "TEMPORARY";
+ private static final String USER = "USER";
+ private static final String SPATIAL = "SPATIAL";
+ private static final String FULLTEXT = "FULLTEXT";
+ private static final String REPLACE = "REPLACE";
+ private static final String DELAYED = "DELAYED";
+ private static final String LOW_PRIORITY = "LOW_PRIORITY";
public MySqlStatementParser(String sql){
super(new MySqlExprParser(sql));
@@ -181,7 +189,8 @@ public class MySqlStatementParser extends SQLStatementParser {
}
public SQLSelectStatement parseSelect() {
- return new SQLSelectStatement(new MySqlSelectParser(this.exprParser).select());
+ MySqlSelectParser selectParser = new MySqlSelectParser(this.exprParser);
+ return new SQLSelectStatement(selectParser.select());
}
public SQLUpdateStatement parseUpdateStatement() {
@@ -228,6 +237,10 @@ public class MySqlStatementParser extends SQLStatementParser {
if (lexer.token() == Token.DELETE) {
lexer.nextToken();
+ if (lexer.token() == Token.COMMENT) {
+ lexer.nextToken();
+ }
+
if (identifierEquals(LOW_PRIORITY)) {
deleteStatement.setLowPriority(true);
lexer.nextToken();
@@ -283,11 +296,24 @@ public class MySqlStatementParser extends SQLStatementParser {
}
public SQLStatement parseCreate() {
+ char markChar = lexer.current();
+ int markBp = lexer.bp();
+
accept(Token.CREATE);
+ boolean replace = false;
+ if (lexer.token() == Token.OR) {
+ lexer.nextToken();
+ acceptIdentifier("REPLACE");
+ replace = true;
+ }
+
List hints = this.exprParser.parseHints();
if (lexer.token() == Token.TABLE || identifierEquals(TEMPORARY)) {
+ if (replace) {
+ lexer.reset(markBp, markChar, Token.CREATE);
+ }
MySqlCreateTableParser parser = new MySqlCreateTableParser(this.exprParser);
MySqlCreateTableStatement stmt = parser.parseCrateTable(false);
stmt.setHints(hints);
@@ -295,18 +321,35 @@ public class MySqlStatementParser extends SQLStatementParser {
}
if (lexer.token() == Token.DATABASE) {
+ if (replace) {
+ lexer.reset(markBp, markChar, Token.CREATE);
+ }
return parseCreateDatabase();
}
if (lexer.token() == Token.UNIQUE || lexer.token() == Token.INDEX || identifierEquals(FULLTEXT)
|| identifierEquals(SPATIAL)) {
+ if (replace) {
+ lexer.reset(markBp, markChar, Token.CREATE);
+ }
return parseCreateIndex();
}
if (identifierEquals(USER)) {
+ if (replace) {
+ lexer.reset(markBp, markChar, Token.CREATE);
+ }
return parseCreateUser();
}
+ if (lexer.token() == Token.VIEW) {
+ if (replace) {
+ lexer.reset(markBp, markChar, Token.CREATE);
+ }
+
+ return parseCreateView();
+ }
+
throw new ParserException("TODO " + lexer.token());
}
@@ -596,20 +639,23 @@ public class MySqlStatementParser extends SQLStatementParser {
public SQLStatement parseShow() {
acceptIdentifier("SHOW");
+ boolean full = false;
if (lexer.token() == Token.FULL) {
lexer.nextToken();
+ }
- if (identifierEquals("PROCESSLIST")) {
- lexer.nextToken();
- MySqlShowProcessListStatement stmt = new MySqlShowProcessListStatement();
- stmt.setFull(true);
- return stmt;
- }
+ if (identifierEquals("PROCESSLIST")) {
+ lexer.nextToken();
+ MySqlShowProcessListStatement stmt = new MySqlShowProcessListStatement();
+ stmt.setFull(full);
+ return stmt;
+ }
- acceptIdentifier("COLUMNS");
+ if (identifierEquals("COLUMNS")) {
+ lexer.nextToken();
MySqlShowColumnsStatement stmt = parseShowColumns();
- stmt.setFull(true);
+ stmt.setFull(full);
return stmt;
}
@@ -626,6 +672,7 @@ public class MySqlStatementParser extends SQLStatementParser {
lexer.nextToken();
MySqlShowTablesStatement stmt = parseShowTabless();
+ stmt.setFull(full);
return stmt;
}
@@ -1489,7 +1536,7 @@ public class MySqlStatementParser extends SQLStatementParser {
if (lexer.token() == Token.VALUES || identifierEquals("VALUE")) {
lexer.nextToken();
-
+
parseValueClause(stmt.getValuesList(), 0);
} else if (lexer.token() == Token.SELECT) {
SQLQueryExpr queryExpr = (SQLQueryExpr) this.exprParser.expr();
@@ -1821,7 +1868,7 @@ public class MySqlStatementParser extends SQLStatementParser {
private void parseValueClause(List valueClauseList, int columnSize) {
for (;;) {
if (lexer.token() != Token.LPAREN) {
- throw new SQLParseException("syntax error, expect ')'");
+ throw new ParserException("syntax error, expect ')'");
}
lexer.nextTokenValue();
@@ -1866,7 +1913,7 @@ public class MySqlStatementParser extends SQLStatementParser {
}
}
}
-
+
SQLInsertStatement.ValuesClause values = new SQLInsertStatement.ValuesClause(valueExprList);
valueClauseList.add(values);
} else {
@@ -1875,7 +1922,7 @@ public class MySqlStatementParser extends SQLStatementParser {
}
if (lexer.token() != Token.RPAREN) {
- throw new SQLParseException("syntax error");
+ throw new ParserException("syntax error");
}
lexer.nextTokenComma();
@@ -2197,7 +2244,20 @@ public class MySqlStatementParser extends SQLStatementParser {
} else if (lexer.token() == Token.KEY) {
throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
} else if (lexer.token() == Token.CONSTRAINT) {
- throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
+ lexer.nextToken();
+ SQLName constraintName = this.exprParser.name();
+
+ if (lexer.token() == Token.PRIMARY) {
+ SQLPrimaryKey primaryKey = ((MySqlExprParser) this.exprParser).parsePrimaryKey();
+
+ primaryKey.setName(constraintName);
+
+ SQLAlterTableAddPrimaryKey item = new SQLAlterTableAddPrimaryKey();
+ item.setPrimaryKey(primaryKey);
+ stmt.getItems().add(item);
+ } else {
+ throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
+ }
} else if (identifierEquals(FULLTEXT)) {
throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
} else if (identifierEquals(SPATIAL)) {
@@ -2212,8 +2272,17 @@ public class MySqlStatementParser extends SQLStatementParser {
}
stmt.getItems().add(item);
}
- } else if (identifierEquals("ALTER")) {
- throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
+ } else if (lexer.token() == Token.ALTER) {
+ lexer.nextToken();
+ if (identifierEquals("COLUMN")) {
+ lexer.nextToken();
+ }
+
+ SQLAlterTableAlterColumn alterColumn = new SQLAlterTableAlterColumn();
+ SQLColumnDefinition columnDef = this.exprParser.parseColumn();
+ alterColumn.setColumn(columnDef);
+
+ stmt.getItems().add(alterColumn);
} else if (identifierEquals("CHANGE")) {
lexer.nextToken();
if (identifierEquals("COLUMN")) {
@@ -2235,7 +2304,24 @@ public class MySqlStatementParser extends SQLStatementParser {
}
stmt.getItems().add(item);
} else if (identifierEquals("MODIFY")) {
- throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
+ lexer.nextToken();
+ if (identifierEquals("COLUMN")) {
+ lexer.nextToken();
+ }
+ MySqlAlterTableModifyColumn item = new MySqlAlterTableModifyColumn();
+ item.setNewColumnDefinition(this.exprParser.parseColumn());
+ if (identifierEquals("AFTER")) {
+ lexer.nextToken();
+ item.setAfterColumn(this.exprParser.name());
+ } else if (identifierEquals("FIRST")) {
+ lexer.nextToken();
+ if (lexer.token() == Token.IDENTIFIER) {
+ item.setFirstColumn(this.exprParser.name());
+ } else {
+ item.setFirst(true);
+ }
+ }
+ stmt.getItems().add(item);
} else if (lexer.token() == Token.DROP) {
lexer.nextToken();
if (lexer.token() == Token.INDEX) {
@@ -2244,6 +2330,18 @@ public class MySqlStatementParser extends SQLStatementParser {
SQLAlterTableDropIndex item = new SQLAlterTableDropIndex();
item.setIndexName(indexName);
stmt.getItems().add(item);
+ } else if (lexer.token() == Token.FOREIGN) {
+ lexer.nextToken();
+ accept(Token.KEY);
+ SQLName indexName = this.exprParser.name();
+ SQLAlterTableDropForeinKey item = new SQLAlterTableDropForeinKey();
+ item.setIndexName(indexName);
+ stmt.getItems().add(item);
+ } else if (lexer.token() == Token.PRIMARY) {
+ lexer.nextToken();
+ accept(Token.KEY);
+ SQLAlterTableDropPrimaryKey item = new SQLAlterTableDropPrimaryKey();
+ stmt.getItems().add(item);
} else {
if (identifierEquals("COLUMN")) {
lexer.nextToken();
@@ -2253,9 +2351,15 @@ public class MySqlStatementParser extends SQLStatementParser {
stmt.getItems().add(item);
}
} else if (identifierEquals("DISABLE")) {
- throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
+ lexer.nextToken();
+ acceptIdentifier("KEYS");
+ SQLAlterTableDisableKeys item = new SQLAlterTableDisableKeys();
+ stmt.getItems().add(item);
} else if (identifierEquals("ENABLE")) {
- throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
+ lexer.nextToken();
+ acceptIdentifier("KEYS");
+ SQLAlterTableEnableKeys item = new SQLAlterTableEnableKeys();
+ stmt.getItems().add(item);
} else if (identifierEquals("RENAME")) {
lexer.nextToken();
MySqlRenameTableStatement renameStmt = new MySqlRenameTableStatement();
@@ -2272,9 +2376,15 @@ public class MySqlStatementParser extends SQLStatementParser {
} else if (lexer.token() == Token.DEFAULT) {
throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
} else if (identifierEquals("DISCARD")) {
- throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
+ lexer.nextToken();
+ acceptIdentifier("TABLESPACE");
+ MySqlAlterTableDiscardTablespace item = new MySqlAlterTableDiscardTablespace();
+ stmt.getItems().add(item);
} else if (identifierEquals("IMPORT")) {
- throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
+ lexer.nextToken();
+ acceptIdentifier("TABLESPACE");
+ MySqlAlterTableImportTablespace item = new MySqlAlterTableImportTablespace();
+ stmt.getItems().add(item);
} else if (identifierEquals("FORCE")) {
throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal());
} else if (identifierEquals("TRUNCATE")) {
@@ -2303,6 +2413,11 @@ public class MySqlStatementParser extends SQLStatementParser {
accept(Token.EQ);
stmt.getItems().add(new MySqlAlterTableOption(ENGINE, lexer.stringVal()));
lexer.nextToken();
+ } else if (identifierEquals(AUTO_INCREMENT)) {
+ lexer.nextToken();
+ accept(Token.EQ);
+ stmt.getItems().add(new MySqlAlterTableOption(AUTO_INCREMENT, lexer.integerValue()));
+ lexer.nextToken();
} else if (identifierEquals(COLLATE2)) {
lexer.nextToken();
accept(Token.EQ);
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java
index 3036e3e181..edb597fb17 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitor.java
@@ -16,9 +16,11 @@
package com.alibaba.druid.sql.dialect.mysql.visitor;
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlForceIndexHint;
+import com.alibaba.druid.sql.dialect.mysql.ast.MySqlForeignKey;
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlIgnoreIndexHint;
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlKey;
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlPrimaryKey;
+import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUnique;
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUseIndexHint;
import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlBinaryExpr;
import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlBooleanExpr;
@@ -34,6 +36,9 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableAddIndex
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableAddUnique;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableChangeColumn;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableCharacter;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableDiscardTablespace;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableImportTablespace;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableModifyColumn;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableOption;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlBinlogStatement;
@@ -136,6 +141,10 @@ public interface MySqlASTVisitor extends SQLASTVisitor {
void endVisit(MySqlPrimaryKey x);
+ boolean visit(MySqlUnique x);
+
+ void endVisit(MySqlUnique x);
+
void endVisit(MySqlIntervalExpr x);
boolean visit(MySqlIntervalExpr x);
@@ -451,68 +460,84 @@ public interface MySqlASTVisitor extends SQLASTVisitor {
boolean visit(MySqlRenameTableStatement.Item x);
void endVisit(MySqlRenameTableStatement.Item x);
-
+
boolean visit(MySqlRenameTableStatement x);
-
+
void endVisit(MySqlRenameTableStatement x);
-
+
boolean visit(MySqlDropViewStatement x);
-
+
void endVisit(MySqlDropViewStatement x);
-
+
boolean visit(MySqlUnionQuery x);
-
+
void endVisit(MySqlUnionQuery x);
-
+
boolean visit(MySqlUseIndexHint x);
-
+
void endVisit(MySqlUseIndexHint x);
-
+
boolean visit(MySqlIgnoreIndexHint x);
-
+
void endVisit(MySqlIgnoreIndexHint x);
-
+
boolean visit(MySqlLockTableStatement x);
-
+
void endVisit(MySqlLockTableStatement x);
-
+
boolean visit(MySqlUnlockTablesStatement x);
-
+
void endVisit(MySqlUnlockTablesStatement x);
-
+
boolean visit(MySqlForceIndexHint x);
-
+
void endVisit(MySqlForceIndexHint x);
-
+
boolean visit(MySqlAlterTableChangeColumn x);
-
+
void endVisit(MySqlAlterTableChangeColumn x);
-
+
boolean visit(MySqlAlterTableCharacter x);
-
+
void endVisit(MySqlAlterTableCharacter x);
-
+
boolean visit(MySqlAlterTableAddIndex x);
-
+
void endVisit(MySqlAlterTableAddIndex x);
-
+
boolean visit(MySqlAlterTableOption x);
-
+
void endVisit(MySqlAlterTableOption x);
-
+
boolean visit(MySqlCreateTableStatement x);
-
+
void endVisit(MySqlCreateTableStatement x);
-
+
boolean visit(MySqlHelpStatement x);
-
+
void endVisit(MySqlHelpStatement x);
-
+
boolean visit(MySqlCharExpr x);
-
+
void endVisit(MySqlCharExpr x);
-
+
boolean visit(MySqlAlterTableAddUnique x);
-
+
void endVisit(MySqlAlterTableAddUnique x);
-}
+
+ boolean visit(MySqlForeignKey x);
+
+ void endVisit(MySqlForeignKey x);
+
+ boolean visit(MySqlAlterTableModifyColumn x);
+
+ void endVisit(MySqlAlterTableModifyColumn x);
+
+ boolean visit(MySqlAlterTableDiscardTablespace x);
+
+ void endVisit(MySqlAlterTableDiscardTablespace x);
+
+ boolean visit(MySqlAlterTableImportTablespace x);
+
+ void endVisit(MySqlAlterTableImportTablespace x);
+} //
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java
index 62f2af8633..1c98aade48 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlASTVisitorAdapter.java
@@ -16,9 +16,11 @@
package com.alibaba.druid.sql.dialect.mysql.visitor;
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlForceIndexHint;
+import com.alibaba.druid.sql.dialect.mysql.ast.MySqlForeignKey;
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlIgnoreIndexHint;
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlKey;
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlPrimaryKey;
+import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUnique;
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUseIndexHint;
import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlBinaryExpr;
import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlBooleanExpr;
@@ -34,6 +36,9 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableAddIndex
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableAddUnique;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableChangeColumn;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableCharacter;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableDiscardTablespace;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableImportTablespace;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableModifyColumn;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableOption;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlAlterTableStatement;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlBinlogStatement;
@@ -1138,4 +1143,54 @@ public class MySqlASTVisitorAdapter extends SQLASTVisitorAdapter implements
public void endVisit(MySqlAlterTableAddUnique x) {
}
-}
+
+ @Override
+ public boolean visit(MySqlUnique x) {
+ return true;
+ }
+
+ @Override
+ public void endVisit(MySqlUnique x) {
+
+ }
+
+ @Override
+ public boolean visit(MySqlForeignKey x) {
+ return true;
+ }
+
+ @Override
+ public void endVisit(MySqlForeignKey x) {
+
+ }
+
+ @Override
+ public boolean visit(MySqlAlterTableModifyColumn x) {
+ return true;
+ }
+
+ @Override
+ public void endVisit(MySqlAlterTableModifyColumn x) {
+
+ }
+
+ @Override
+ public boolean visit(MySqlAlterTableDiscardTablespace x) {
+ return true;
+ }
+
+ @Override
+ public void endVisit(MySqlAlterTableDiscardTablespace x) {
+
+ }
+
+ @Override
+ public boolean visit(MySqlAlterTableImportTablespace x) {
+ return true;
+ }
+
+ @Override
+ public void endVisit(MySqlAlterTableImportTablespace x) {
+
+ }
+} //
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlEvalVisitorImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlEvalVisitorImpl.java
index 78f3dacbfc..d479e2a50d 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlEvalVisitorImpl.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlEvalVisitorImpl.java
@@ -16,30 +16,36 @@
package com.alibaba.druid.sql.dialect.mysql.visitor;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import com.alibaba.druid.sql.ast.expr.SQLBetweenExpr;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
import com.alibaba.druid.sql.ast.expr.SQLCaseExpr;
import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
+import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLInListExpr;
import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
import com.alibaba.druid.sql.ast.expr.SQLNullExpr;
import com.alibaba.druid.sql.ast.expr.SQLNumberExpr;
import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
+import com.alibaba.druid.sql.ast.expr.SQLUnaryExpr;
import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
import com.alibaba.druid.sql.dialect.mysql.ast.expr.MySqlBooleanExpr;
import com.alibaba.druid.sql.visitor.SQLEvalVisitor;
import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils;
+import com.alibaba.druid.sql.visitor.functions.Function;
public class MySqlEvalVisitorImpl extends MySqlASTVisitorAdapter implements SQLEvalVisitor {
- private List