diff --git a/.gitignore b/.gitignore
index beb91a21b0..d618f6f455 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
/derby.log
/src/test/resources/pool_config
/src/test/java/com/alibaba/druid/local_test
+/src/test/java/com/alibaba/druid/pool/mysql/
# IntelliJ Idea
.idea/
out/
diff --git a/druid-spring-boot-starter/pom.xml b/druid-spring-boot-starter/pom.xml
index 3758290c29..5f8aa1ee2c 100644
--- a/druid-spring-boot-starter/pom.xml
+++ b/druid-spring-boot-starter/pom.xml
@@ -4,14 +4,14 @@
4.0.0
com.alibaba
druid-spring-boot-starter
- 1.1.13
+ 1.1.14
jar
druid-spring-boot-starter
Spring Boot with Druid support,help you simplify Druid config in Spring Boot.
https://github.com/alibaba/druid
- 1.1.13
+ 1.1.14
1.5.12.RELEASE
diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceBuilder.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceBuilder.java
index 2e686428e8..7384e2f5d7 100644
--- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceBuilder.java
+++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceBuilder.java
@@ -30,6 +30,9 @@ public class DruidDataSourceBuilder {
/**
* For build multiple DruidDataSource, detail see document.
+ *
+ * -------
+ * The method is history, and now you can use 'new DruidDataSourceWrapper()' instead.
*/
public DruidDataSource build() {
return new DruidDataSourceWrapper();
@@ -40,7 +43,11 @@ public class DruidDataSourceBuilder {
*
* 这是为了兼容 Spring Boot 1.X 中 .properties 内配置属性不能按照配置声明顺序进行绑定,进而导致配置出错(issue #1796 )而提供的方法。
* 如果你不存在上述问题或者使用 .yml 进行配置则不必使用该方法,使用上面的{@link DruidDataSourceBuilder#build}即可,Spring Boot 2.0 修复了该问题,该方法届时也会停用。
+ *
+ * fixed, the method will be removed in future versions.
+ * @see DruidDataSourceWrapper#setMaxEvictableIdleTimeMillis(long)
*/
+ @Deprecated
public DruidDataSource build(Environment env, String prefix) {
DruidDataSource druidDataSource = new DruidDataSourceWrapper();
druidDataSource.setMinEvictableIdleTimeMillis(
diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceWrapper.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceWrapper.java
index 3ba3d9a873..a394c5f293 100644
--- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceWrapper.java
+++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/DruidDataSourceWrapper.java
@@ -15,15 +15,10 @@
*/
package com.alibaba.druid.spring.boot.autoconfigure;
-import com.alibaba.druid.filter.config.ConfigFilter;
-import com.alibaba.druid.filter.encoding.EncodingConvertFilter;
-import com.alibaba.druid.filter.logging.CommonsLogFilter;
-import com.alibaba.druid.filter.logging.Log4j2Filter;
-import com.alibaba.druid.filter.logging.Log4jFilter;
-import com.alibaba.druid.filter.logging.Slf4jLogFilter;
-import com.alibaba.druid.filter.stat.StatFilter;
+import java.util.List;
+
+import com.alibaba.druid.filter.Filter;
import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.wall.WallFilter;
import org.springframework.beans.factory.InitializingBean;
import org.springframework.beans.factory.annotation.Autowired;
@@ -50,51 +45,30 @@ class DruidDataSourceWrapper extends DruidDataSource implements InitializingBean
if (super.getUrl() == null) {
super.setUrl(basicProperties.determineUrl());
}
- if(super.getDriverClassName() == null){
+ if (super.getDriverClassName() == null) {
super.setDriverClassName(basicProperties.getDriverClassName());
}
-
}
@Autowired(required = false)
- public void addStatFilter(StatFilter statFilter) {
- super.filters.add(statFilter);
+ public void autoAddFilters(List filters){
+ super.filters.addAll(filters);
}
- @Autowired(required = false)
- public void addConfigFilter(ConfigFilter configFilter) {
- super.filters.add(configFilter);
+ /**
+ * Ignore the 'maxEvictableIdleTimeMillis < minEvictableIdleTimeMillis' validate,
+ * it will be validated again in {@link DruidDataSource#init()}.
+ *
+ * for fix issue #3084, #2763
+ *
+ * @since 1.1.14
+ */
+ @Override
+ public void setMaxEvictableIdleTimeMillis(long maxEvictableIdleTimeMillis) {
+ try {
+ super.setMaxEvictableIdleTimeMillis(maxEvictableIdleTimeMillis);
+ } catch (IllegalArgumentException ignore) {
+ super.maxEvictableIdleTimeMillis = maxEvictableIdleTimeMillis;
+ }
}
-
- @Autowired(required = false)
- public void addEncodingConvertFilter(EncodingConvertFilter encodingConvertFilter) {
- super.filters.add(encodingConvertFilter);
- }
-
- @Autowired(required = false)
- public void addSlf4jLogFilter(Slf4jLogFilter slf4jLogFilter) {
- super.filters.add(slf4jLogFilter);
- }
-
- @Autowired(required = false)
- public void addLog4jFilter(Log4jFilter log4jFilter) {
- super.filters.add(log4jFilter);
- }
-
- @Autowired(required = false)
- public void addLog4j2Filter(Log4j2Filter log4j2Filter) {
- super.filters.add(log4j2Filter);
- }
-
- @Autowired(required = false)
- public void addCommonsLogFilter(CommonsLogFilter commonsLogFilter) {
- super.filters.add(commonsLogFilter);
- }
-
- @Autowired(required = false)
- public void addWallFilter(WallFilter wallFilter) {
- super.filters.add(wallFilter);
- }
-
-
}
diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/configurer/Issue1796Configurer.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/configurer/Issue1796Configurer.java
index fd59f8b092..8353b2f3b8 100644
--- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/configurer/Issue1796Configurer.java
+++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/demo/configurer/Issue1796Configurer.java
@@ -1,15 +1,14 @@
package com.alibaba.druid.spring.boot.demo.configurer;
-import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.Profile;
-import org.springframework.core.env.Environment;
-
import javax.sql.DataSource;
-@Configuration
-@Profile("issue-1796")
+import com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceBuilder;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.core.env.Environment;
+
+/*@Configuration
+@Profile("issue-1796")*/
public class Issue1796Configurer {
@Bean
diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidFilterTestCase.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidFilterTestCase.java
index ec62ea690d..ca50620fb9 100644
--- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidFilterTestCase.java
+++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/DruidFilterTestCase.java
@@ -5,12 +5,19 @@ import java.util.List;
import javax.annotation.Resource;
import com.alibaba.druid.filter.Filter;
+import com.alibaba.druid.filter.FilterAdapter;
import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
import com.alibaba.druid.spring.boot.demo.DemoApplication;
import org.junit.Test;
import org.junit.runner.RunWith;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.stereotype.Component;
import org.springframework.test.context.ActiveProfiles;
import org.springframework.test.context.junit4.SpringRunner;
@@ -20,7 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* @author lihengming [89921218@qq.com]
*/
@RunWith(SpringRunner.class)
-@SpringBootTest(classes = DemoApplication.class)
+@SpringBootTest(classes = {DemoApplication.class, DruidFilterTestCase.Config.class})
@ActiveProfiles("filter")
public class DruidFilterTestCase {
@Resource
@@ -29,6 +36,34 @@ public class DruidFilterTestCase {
@Test
public void test() {
List filters = dataSource.getProxyFilters();
- assertThat(filters.size()).isEqualTo(3);
+ //配置文件中3个,自定义1个,共4个
+ assertThat(filters.size()).isEqualTo(4);
+ }
+
+ /**
+ * @author dk
+ * 用于此测试的一个配置,仅加入了一个自定义的Filter,此Filter打印出数据库连接url
+ */
+ @Configuration
+ @ComponentScan
+ public static class Config{
+
+ /**
+ * @author dk
+ */
+ @Component
+ public static class SomeCustomFilter extends FilterAdapter {
+
+ private static Logger logger = LoggerFactory.getLogger(SomeCustomFilter.class);
+
+ @Override
+ public void init(DataSourceProxy dataSourceProxy){
+ if (!(dataSourceProxy instanceof DruidDataSource)) {
+ logger.error("ConfigLoader only support DruidDataSource");
+ }
+ DruidDataSource dataSource = (DruidDataSource) dataSourceProxy;
+ logger.info("db configuration: url="+ dataSource.getUrl());
+ }
+ }
}
}
diff --git a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/Issue1796TestCase.java b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/Issue1796TestCase.java
index efa3847c59..4d3a50e118 100644
--- a/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/Issue1796TestCase.java
+++ b/druid-spring-boot-starter/src/test/java/com/alibaba/druid/spring/boot/testcase/Issue1796TestCase.java
@@ -15,6 +15,8 @@ import static org.assertj.core.api.Assertions.assertThat;
/**
* @author lihengming [89921218@qq.com]
+ *
+ * for issue #1796, #3084, #2763
*/
@RunWith(SpringRunner.class)
@SpringBootTest(classes = DemoApplication.class)
diff --git a/druid-spring-boot-starter/src/test/resources/application-issue-1796.properties b/druid-spring-boot-starter/src/test/resources/application-issue-1796.properties
index 7a29d17535..00cf5dc0ca 100644
--- a/druid-spring-boot-starter/src/test/resources/application-issue-1796.properties
+++ b/druid-spring-boot-starter/src/test/resources/application-issue-1796.properties
@@ -5,8 +5,8 @@ spring.datasource.password=sa
# driver-class-name 非必填可根据url推断
spring.datasource.driver-class-name=org.h2.Driver
-spring.datasource.druid.min-evictable-idle-time-millis=100000
spring.datasource.druid.max-evictable-idle-time-millis=200000
+spring.datasource.druid.min-evictable-idle-time-millis=100000
# JPA
spring.jpa.show-sql= true
diff --git a/pom.xml b/pom.xml
index c6e0c7c3f9..a8129009db 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.alibaba
druid
- 1.1.14-preview_1
+ 1.1.16_preview_01
jar
druid
@@ -84,7 +84,7 @@
org.apache.maven.plugins
maven-compiler-plugin
- 3.0
+ 3.8.0
UTF-8
${jdk.version}
@@ -95,7 +95,7 @@
org.apache.maven.plugins
maven-surefire-plugin
- 2.12.4
+ 2.22.1
**/bvt/**/*.java
@@ -106,7 +106,7 @@
org.apache.maven.plugins
maven-source-plugin
- 2.2.1
+ 3.0.1
attach-sources
@@ -122,7 +122,7 @@
maven-javadoc-plugin
- 2.10.3
+ 3.0.1
attach-javadoc
@@ -145,7 +145,7 @@
maven-gpg-plugin
- 1.4
+ 1.6
${gpg.skip}
@@ -196,7 +196,7 @@
org.apache.maven.plugins
maven-jar-plugin
- 2.4
+ 3.1.1
@@ -463,7 +463,7 @@
mysql
mysql-connector-java
- 5.1.45
+ 8.0.15
provided
@@ -729,6 +729,12 @@
${jmh.version}
test
+
+ org.mariadb.jdbc
+ mariadb-java-client
+ 2.4.0
+ test
+
diff --git a/src/main/java/com/alibaba/druid/VERSION.java b/src/main/java/com/alibaba/druid/VERSION.java
index 2701cfddff..3e053ccc44 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 = 1;
public final static int MinorVersion = 1;
- public final static int RevisionVersion = 14;
+ 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/Filter.java b/src/main/java/com/alibaba/druid/filter/Filter.java
index 5319278423..87dd7b5c6b 100644
--- a/src/main/java/com/alibaba/druid/filter/Filter.java
+++ b/src/main/java/com/alibaba/druid/filter/Filter.java
@@ -15,17 +15,6 @@
*/
package com.alibaba.druid.filter;
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.pool.DruidPooledConnection;
-import com.alibaba.druid.proxy.jdbc.CallableStatementProxy;
-import com.alibaba.druid.proxy.jdbc.ClobProxy;
-import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
-import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
-import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy;
-import com.alibaba.druid.proxy.jdbc.ResultSetMetaDataProxy;
-import com.alibaba.druid.proxy.jdbc.ResultSetProxy;
-import com.alibaba.druid.proxy.jdbc.StatementProxy;
-
import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
@@ -56,6 +45,17 @@ import java.util.Calendar;
import java.util.Properties;
import java.util.concurrent.Executor;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.pool.DruidPooledConnection;
+import com.alibaba.druid.proxy.jdbc.CallableStatementProxy;
+import com.alibaba.druid.proxy.jdbc.ClobProxy;
+import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
+import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
+import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy;
+import com.alibaba.druid.proxy.jdbc.ResultSetMetaDataProxy;
+import com.alibaba.druid.proxy.jdbc.ResultSetProxy;
+import com.alibaba.druid.proxy.jdbc.StatementProxy;
+
/**
* @author wenshao [szujobs@hotmail.com]
*/
diff --git a/src/main/java/com/alibaba/druid/filter/FilterAdapter.java b/src/main/java/com/alibaba/druid/filter/FilterAdapter.java
index 6268533953..32f8207ad3 100644
--- a/src/main/java/com/alibaba/druid/filter/FilterAdapter.java
+++ b/src/main/java/com/alibaba/druid/filter/FilterAdapter.java
@@ -15,18 +15,6 @@
*/
package com.alibaba.druid.filter;
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.pool.DruidPooledConnection;
-import com.alibaba.druid.proxy.jdbc.CallableStatementProxy;
-import com.alibaba.druid.proxy.jdbc.ClobProxy;
-import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
-import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
-import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy;
-import com.alibaba.druid.proxy.jdbc.ResultSetMetaDataProxy;
-import com.alibaba.druid.proxy.jdbc.ResultSetProxy;
-import com.alibaba.druid.proxy.jdbc.StatementProxy;
-
-import javax.management.NotificationBroadcasterSupport;
import java.io.InputStream;
import java.io.Reader;
import java.math.BigDecimal;
@@ -53,6 +41,19 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.Executor;
+import javax.management.NotificationBroadcasterSupport;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.pool.DruidPooledConnection;
+import com.alibaba.druid.proxy.jdbc.CallableStatementProxy;
+import com.alibaba.druid.proxy.jdbc.ClobProxy;
+import com.alibaba.druid.proxy.jdbc.ConnectionProxy;
+import com.alibaba.druid.proxy.jdbc.DataSourceProxy;
+import com.alibaba.druid.proxy.jdbc.PreparedStatementProxy;
+import com.alibaba.druid.proxy.jdbc.ResultSetMetaDataProxy;
+import com.alibaba.druid.proxy.jdbc.ResultSetProxy;
+import com.alibaba.druid.proxy.jdbc.StatementProxy;
+
/**
* 提供JdbcFilter的基本实现,使得实现一个JdbcFilter更容易。
*
diff --git a/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java b/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java
index 710da121ee..8ee4397b17 100644
--- a/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java
+++ b/src/main/java/com/alibaba/druid/filter/logging/LogFilter.java
@@ -15,10 +15,7 @@
*/
package com.alibaba.druid.filter.logging;
-import java.sql.ResultSetMetaData;
-import java.sql.SQLException;
-import java.sql.Savepoint;
-import java.sql.Types;
+import java.sql.*;
import java.util.ArrayList;
import java.util.List;
import java.util.Properties;
@@ -36,9 +33,9 @@ import com.alibaba.druid.proxy.jdbc.ResultSetProxy;
import com.alibaba.druid.proxy.jdbc.StatementProxy;
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.SQLUtils.FormatOption;
+import com.alibaba.druid.util.JdbcConstants;
import com.alibaba.druid.util.JdbcUtils;
-
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
+import com.alibaba.druid.util.MySqlUtils;
/**
* @author wenshao [szujobs@hotmail.com]
@@ -371,7 +368,20 @@ public abstract class LogFilter extends FilterEventAdapter implements LogFilterM
}
if (connectionConnectAfterLogEnable && isConnectionLogEnabled()) {
- connectionLog("{conn-" + connection.getId() + "} connected");
+ StringBuilder msg = new StringBuilder(34)
+ .append("{conn-")
+ .append(connection.getId());
+
+ Connection impl = connection.getRawObject();
+ if (JdbcConstants.MYSQL.equals(dataSource.getDbType())) {
+ Long procId = MySqlUtils.getId(impl);
+ if (procId != null) {
+ msg.append(",procId-").append(procId);
+ }
+ }
+
+ msg.append("} connected");
+ connectionLog(msg.toString());
}
}
diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
index 546a04ba66..3da39f81b9 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
@@ -37,7 +37,10 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.atomic.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicIntegerFieldUpdater;
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.atomic.AtomicLongFieldUpdater;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.ReentrantLock;
import java.util.logging.Logger;
@@ -61,7 +64,13 @@ import com.alibaba.druid.stat.JdbcSqlStat;
import com.alibaba.druid.stat.JdbcStatManager;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
-import com.alibaba.druid.util.*;
+import com.alibaba.druid.util.DruidPasswordCallback;
+import com.alibaba.druid.util.Histogram;
+import com.alibaba.druid.util.JdbcConstants;
+import com.alibaba.druid.util.JdbcUtils;
+import com.alibaba.druid.util.MySqlUtils;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.druid.util.Utils;
/**
* @author wenshao [szujobs@hotmail.com]
@@ -258,10 +267,14 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
private boolean asyncCloseConnectionEnable = false;
protected int maxCreateTaskCount = 3;
protected boolean failFast = false;
- protected AtomicBoolean failContinuous = new AtomicBoolean(false);
+ protected volatile int failContinuous = 0;
+ protected volatile long failContinuousTimeMillis = 0L;
protected ScheduledExecutorService destroyScheduler;
protected ScheduledExecutorService createScheduler;
+ final static AtomicLongFieldUpdater failContinuousTimeMillisUpdater = AtomicLongFieldUpdater.newUpdater(DruidAbstractDataSource.class, "failContinuousTimeMillis");
+ final static AtomicIntegerFieldUpdater failContinuousUpdater = AtomicIntegerFieldUpdater.newUpdater(DruidAbstractDataSource.class, "failContinuous");
+
protected boolean initVariants = false;
protected boolean initGlobalVariants = false;
protected volatile boolean onFatalError = false;
@@ -1694,9 +1707,34 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
lock.unlock();
}
}
-
+
+ public boolean isFailContinuous() {
+ return failContinuousUpdater.get(this) == 1;
+ }
+
protected void setFailContinuous(boolean fail) {
- failContinuous.set(fail);
+ if (fail) {
+ failContinuousTimeMillisUpdater.set(this, System.currentTimeMillis());
+ } else {
+ failContinuousTimeMillisUpdater.set(this, 0L);
+ }
+
+ boolean currentState = failContinuousUpdater.get(this) == 1;
+ if (currentState == fail) {
+ return;
+ }
+
+ if (fail) {
+ failContinuousUpdater.set(this, 1);
+ if (LOG.isInfoEnabled()) {
+ LOG.info("{dataSource-" + this.getID() + "} failContinuous is true");
+ }
+ } else {
+ failContinuousUpdater.set(this, 0);
+ if (LOG.isInfoEnabled()) {
+ LOG.info("{dataSource-" + this.getID() + "} failContinuous is false");
+ }
+ }
}
public void initPhysicalConnection(Connection conn) throws SQLException {
diff --git a/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java b/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java
index 95aa5958fc..0778659e07 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidConnectionHolder.java
@@ -69,6 +69,7 @@ public final class DruidConnectionHolder {
protected boolean discard = false;
protected final Map variables;
protected final Map globleVariables;
+ final ReentrantLock lock = new ReentrantLock();
public DruidConnectionHolder(DruidAbstractDataSource dataSource, PhysicalConnectionInfo pyConnectInfo)
throws SQLException{
@@ -192,11 +193,21 @@ public final class DruidConnectionHolder {
}
public void addTrace(DruidPooledStatement stmt) {
- statementTrace.add(stmt);
+ lock.lock();
+ try {
+ statementTrace.add(stmt);
+ } finally {
+ lock.unlock();
+ }
}
public void removeTrace(DruidPooledStatement stmt) {
- statementTrace.remove(stmt);
+ lock.lock();
+ try {
+ statementTrace.remove(stmt);
+ } finally {
+ lock.unlock();
+ }
}
public List getConnectionEventListeners() {
@@ -286,11 +297,17 @@ public final class DruidConnectionHolder {
connectionEventListeners.clear();
statementEventListeners.clear();
- for (Object item : statementTrace.toArray()) {
- Statement stmt = (Statement) item;
- JdbcUtils.close(stmt);
+ lock.lock();
+ try {
+ for (Object item : statementTrace.toArray()) {
+ Statement stmt = (Statement) item;
+ JdbcUtils.close(stmt);
+ }
+
+ statementTrace.clear();
+ } finally {
+ lock.unlock();
}
- statementTrace.clear();
conn.clearWarnings();
}
diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index ccc568a0a6..529255664d 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -23,9 +23,25 @@ import java.security.PrivilegedAction;
import java.sql.Connection;
import java.sql.SQLException;
import java.sql.Statement;
-import java.text.SimpleDateFormat;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.ConcurrentModificationException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.ServiceLoader;
+import java.util.StringTokenizer;
+import java.util.TimeZone;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.Future;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.ScheduledThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLongFieldUpdater;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@@ -78,7 +94,11 @@ import com.alibaba.druid.stat.JdbcSqlStat;
import com.alibaba.druid.stat.JdbcSqlStatValue;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
-import com.alibaba.druid.util.*;
+import com.alibaba.druid.util.JMXUtils;
+import com.alibaba.druid.util.JdbcConstants;
+import com.alibaba.druid.util.JdbcUtils;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.druid.util.Utils;
import com.alibaba.druid.wall.WallFilter;
import com.alibaba.druid.wall.WallProviderStatValue;
@@ -109,7 +129,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
private volatile DruidConnectionHolder[] connections;
private int poolingCount = 0;
private int activeCount = 0;
- private long discardCount = 0;
+ private volatile long discardCount = 0;
private int notEmptyWaitThreadCount = 0;
private int notEmptyWaitThreadPeak = 0;
//
@@ -1659,8 +1679,13 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (requireDiscard) {
if (holder.statementTrace != null) {
- for (Statement stmt : holder.statementTrace) {
- JdbcUtils.close(stmt);
+ holder.lock.lock();
+ try {
+ for (Statement stmt : holder.statementTrace) {
+ JdbcUtils.close(stmt);
+ }
+ } finally {
+ holder.lock.unlock();
}
}
@@ -1970,7 +1995,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
while (poolingCount == 0) {
emptySignal(); // send signal to CreateThread create connection
- if (failFast && failContinuous.get()) {
+ if (failFast && isFailContinuous()) {
throw new DataSourceNotAvailableException(createError);
}
@@ -2010,7 +2035,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (poolingCount == 0) {
emptySignal(); // send signal to CreateThread create connection
- if (failFast && failContinuous.get()) {
+ if (failFast && isFailContinuous()) {
throw new DataSourceNotAvailableException(createError);
}
@@ -2357,8 +2382,10 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (emptyWait) {
// 必须存在线程等待,才创建连接
if (poolingCount >= notEmptyWaitThreadCount //
- && !(keepAlive && activeCount + poolingCount < minIdle)
- && !initTask) {
+ && (!(keepAlive && activeCount + poolingCount < minIdle))
+ && (!initTask)
+ && !isFailContinuous()
+ ) {
createTaskCount--;
return;
}
@@ -2521,7 +2548,9 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
if (emptyWait) {
// 必须存在线程等待,才创建连接
if (poolingCount >= notEmptyWaitThreadCount //
- && !(keepAlive && activeCount + poolingCount < minIdle)) {
+ && (!(keepAlive && activeCount + poolingCount < minIdle))
+ && !isFailContinuous()
+ ) {
empty.await();
}
@@ -2900,15 +2929,32 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
// skip
}
+ boolean discard = !validate;
if (validate) {
holer.lastActiveTimeMillis = System.currentTimeMillis();
- put(holer);
- } else {
+ boolean putOk = put(holer);
+ if (!putOk) {
+ discard = true;
+ }
+ }
+
+ if (discard) {
try {
connection.close();
} catch (Exception e) {
// skip
}
+
+ lock.lock();
+ try {
+ discardCount++;
+
+ if (activeCount <= minIdle) {
+ emptySignal();
+ }
+ } finally {
+ lock.unlock();
+ }
}
}
Arrays.fill(keepAliveConnections, null);
diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java
index 2276983b38..a6b3afbda7 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidPooledConnection.java
@@ -35,7 +35,6 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.concurrent.Executor;
-import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
import javax.sql.ConnectionEvent;
@@ -70,13 +69,14 @@ public class DruidPooledConnection extends PoolableWrapper implements javax.sql.
private volatile boolean abandoned = false;
protected StackTraceElement[] connectStackTrace;
protected Throwable disableError = null;
- public ReentrantLock lock = new ReentrantLock();
+ final ReentrantLock lock;
public DruidPooledConnection(DruidConnectionHolder holder){
super(holder.getConnection());
this.conn = holder.getConnection();
this.holder = holder;
+ this.lock = holder.lock;
dupCloseLogEnable = holder.getDataSource().isDupCloseLogEnable();
ownerThread = Thread.currentThread();
connectedTimeMillis = System.currentTimeMillis();
diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java b/src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java
index 55cf272c2a..5eba33da5c 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidPooledPreparedStatement.java
@@ -40,7 +40,6 @@ import java.util.Calendar;
import com.alibaba.druid.pool.PreparedStatementPool.MethodType;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
-import com.alibaba.druid.util.JdbcConstants;
import com.alibaba.druid.util.OracleUtils;
/**
diff --git a/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java b/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java
index 85667f0226..4884d2319f 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidPooledStatement.java
@@ -15,6 +15,16 @@
*/
package com.alibaba.druid.pool;
+import java.net.SocketTimeoutException;
+import java.sql.Connection;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
+import java.sql.SQLWarning;
+import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.List;
+
import com.alibaba.druid.VERSION;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
@@ -22,11 +32,6 @@ import com.alibaba.druid.util.JdbcConstants;
import com.alibaba.druid.util.JdbcUtils;
import com.alibaba.druid.util.MySqlUtils;
-import java.net.SocketTimeoutException;
-import java.sql.*;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* @author wenshao [szujobs@hotmail.com]
*/
diff --git a/src/main/java/com/alibaba/druid/pool/PoolableWrapper.java b/src/main/java/com/alibaba/druid/pool/PoolableWrapper.java
index 218398eaa7..8a21089213 100644
--- a/src/main/java/com/alibaba/druid/pool/PoolableWrapper.java
+++ b/src/main/java/com/alibaba/druid/pool/PoolableWrapper.java
@@ -15,11 +15,11 @@
*/
package com.alibaba.druid.pool;
-import com.alibaba.druid.proxy.jdbc.WrapperProxy;
-
import java.sql.SQLException;
import java.sql.Wrapper;
+import com.alibaba.druid.proxy.jdbc.WrapperProxy;
+
/**
* @author wenshao [szujobs@hotmail.com]
*/
diff --git a/src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java b/src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java
index 595a89eb36..c49bc7e11c 100644
--- a/src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java
+++ b/src/main/java/com/alibaba/druid/pool/PreparedStatementHolder.java
@@ -15,10 +15,10 @@
*/
package com.alibaba.druid.pool;
-import com.alibaba.druid.pool.DruidPooledPreparedStatement.PreparedStatementKey;
-
import java.sql.PreparedStatement;
+import com.alibaba.druid.pool.DruidPooledPreparedStatement.PreparedStatementKey;
+
/**
* @author wenshao [szujobs@hotmail.com]
*/
diff --git a/src/main/java/com/alibaba/druid/pool/ha/DataSourceCreator.java b/src/main/java/com/alibaba/druid/pool/ha/DataSourceCreator.java
index 23b21cef8c..e8109d1120 100644
--- a/src/main/java/com/alibaba/druid/pool/ha/DataSourceCreator.java
+++ b/src/main/java/com/alibaba/druid/pool/ha/DataSourceCreator.java
@@ -15,11 +15,6 @@
*/
package com.alibaba.druid.pool.ha;
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.support.logging.Log;
-import com.alibaba.druid.support.logging.LogFactory;
-
-import javax.sql.DataSource;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
@@ -32,6 +27,12 @@ import java.util.Properties;
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import javax.sql.DataSource;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.support.logging.Log;
+import com.alibaba.druid.support.logging.LogFactory;
+
/**
* An utility class to create DruidDataSource dynamically.
*
diff --git a/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java b/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java
index 0b305f8395..5390b51a98 100644
--- a/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/ha/HighAvailableDataSource.java
@@ -15,18 +15,6 @@
*/
package com.alibaba.druid.pool.ha;
-import com.alibaba.druid.filter.Filter;
-import com.alibaba.druid.pool.DruidAbstractDataSource;
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.pool.WrapperAdapter;
-import com.alibaba.druid.pool.ha.selector.DataSourceSelector;
-import com.alibaba.druid.pool.ha.selector.DataSourceSelectorEnum;
-import com.alibaba.druid.pool.ha.selector.DataSourceSelectorFactory;
-import com.alibaba.druid.pool.ha.selector.RandomDataSourceSelector;
-import com.alibaba.druid.support.logging.Log;
-import com.alibaba.druid.support.logging.LogFactory;
-
-import javax.sql.DataSource;
import java.io.PrintWriter;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -39,6 +27,18 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.logging.Logger;
+import javax.sql.DataSource;
+
+import com.alibaba.druid.filter.Filter;
+import com.alibaba.druid.pool.DruidAbstractDataSource;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.pool.WrapperAdapter;
+import com.alibaba.druid.pool.ha.selector.DataSourceSelector;
+import com.alibaba.druid.pool.ha.selector.DataSourceSelectorFactory;
+import com.alibaba.druid.pool.ha.selector.RandomDataSourceSelector;
+import com.alibaba.druid.support.logging.Log;
+import com.alibaba.druid.support.logging.LogFactory;
+
/**
* DataSource class which contains multiple DataSource objects.
*
diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/DataSourceSelector.java b/src/main/java/com/alibaba/druid/pool/ha/selector/DataSourceSelector.java
index 301ab7e654..6f1eeab2c9 100644
--- a/src/main/java/com/alibaba/druid/pool/ha/selector/DataSourceSelector.java
+++ b/src/main/java/com/alibaba/druid/pool/ha/selector/DataSourceSelector.java
@@ -16,7 +16,6 @@
package com.alibaba.druid.pool.ha.selector;
import javax.sql.DataSource;
-import java.util.Map;
/**
* Interface for those selector to implement.
diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelector.java b/src/main/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelector.java
index 1ce27a2144..9c485c2118 100644
--- a/src/main/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelector.java
+++ b/src/main/java/com/alibaba/druid/pool/ha/selector/NamedDataSourceSelector.java
@@ -15,10 +15,11 @@
*/
package com.alibaba.druid.pool.ha.selector;
-import com.alibaba.druid.pool.ha.HighAvailableDataSource;
+import java.util.Map;
import javax.sql.DataSource;
-import java.util.Map;
+
+import com.alibaba.druid.pool.ha.HighAvailableDataSource;
/**
* Use the given name in ThreadLocal variable to choose DataSource.
diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceRecoverThread.java b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceRecoverThread.java
index 9d8b447fae..79047017f0 100644
--- a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceRecoverThread.java
+++ b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceRecoverThread.java
@@ -15,14 +15,15 @@
*/
package com.alibaba.druid.pool.ha.selector;
+import java.sql.Connection;
+
+import javax.sql.DataSource;
+
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.JdbcUtils;
-import javax.sql.DataSource;
-import java.sql.Connection;
-
/**
* A Thread trying to test if DataSource in blacklist has been recovered.
*
diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelector.java b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelector.java
index 137d461cdd..e8f5b9fddd 100644
--- a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelector.java
+++ b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceSelector.java
@@ -15,12 +15,6 @@
*/
package com.alibaba.druid.pool.ha.selector;
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.pool.ha.HighAvailableDataSource;
-import com.alibaba.druid.support.logging.Log;
-import com.alibaba.druid.support.logging.LogFactory;
-
-import javax.sql.DataSource;
import java.util.Collection;
import java.util.HashMap;
import java.util.HashSet;
@@ -30,6 +24,13 @@ import java.util.Properties;
import java.util.Random;
import java.util.concurrent.CopyOnWriteArrayList;
+import javax.sql.DataSource;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.pool.ha.HighAvailableDataSource;
+import com.alibaba.druid.support.logging.Log;
+import com.alibaba.druid.support.logging.LogFactory;
+
/**
* A selector which uses java.util.Random to choose DataSource.
*
diff --git a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceValidateThread.java b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceValidateThread.java
index 8a11096c93..2cc268f468 100644
--- a/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceValidateThread.java
+++ b/src/main/java/com/alibaba/druid/pool/ha/selector/RandomDataSourceValidateThread.java
@@ -15,12 +15,6 @@
*/
package com.alibaba.druid.pool.ha.selector;
-import com.alibaba.druid.pool.DruidDataSource;
-import com.alibaba.druid.support.logging.Log;
-import com.alibaba.druid.support.logging.LogFactory;
-import com.alibaba.druid.util.JdbcUtils;
-
-import javax.sql.DataSource;
import java.sql.Connection;
import java.sql.Driver;
import java.sql.SQLException;
@@ -33,6 +27,13 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
+import javax.sql.DataSource;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.support.logging.Log;
+import com.alibaba.druid.support.logging.LogFactory;
+import com.alibaba.druid.util.JdbcUtils;
+
/**
* A Thread trying to test all DataSource provided by HADataSource.
* If a DataSource failed this test for 3 times (default value), it will be put into a blacklist.
diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MockExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/MockExceptionSorter.java
index c0d55a2c78..60ed5dd3a5 100644
--- a/src/main/java/com/alibaba/druid/pool/vendor/MockExceptionSorter.java
+++ b/src/main/java/com/alibaba/druid/pool/vendor/MockExceptionSorter.java
@@ -15,12 +15,12 @@
*/
package com.alibaba.druid.pool.vendor;
-import com.alibaba.druid.mock.MockConnectionClosedException;
-import com.alibaba.druid.pool.ExceptionSorter;
-
import java.sql.SQLException;
import java.util.Properties;
+import com.alibaba.druid.mock.MockConnectionClosedException;
+import com.alibaba.druid.pool.ExceptionSorter;
+
public class MockExceptionSorter implements ExceptionSorter {
private final static MockExceptionSorter instance = new MockExceptionSorter();
diff --git a/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java
index 6406a58754..6cf7cc8e29 100644
--- a/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java
+++ b/src/main/java/com/alibaba/druid/pool/vendor/MySqlExceptionSorter.java
@@ -15,15 +15,13 @@
*/
package com.alibaba.druid.pool.vendor;
-import com.alibaba.druid.pool.ExceptionSorter;
-
-import java.io.IOException;
-import java.net.SocketException;
import java.net.SocketTimeoutException;
import java.sql.SQLException;
import java.sql.SQLRecoverableException;
import java.util.Properties;
+import com.alibaba.druid.pool.ExceptionSorter;
+
public class MySqlExceptionSorter implements ExceptionSorter {
@Override
diff --git a/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java
index 7c91398431..5c2e73964d 100644
--- a/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java
+++ b/src/main/java/com/alibaba/druid/pool/vendor/OracleExceptionSorter.java
@@ -15,10 +15,6 @@
*/
package com.alibaba.druid.pool.vendor;
-import com.alibaba.druid.pool.ExceptionSorter;
-import com.alibaba.druid.support.logging.Log;
-import com.alibaba.druid.support.logging.LogFactory;
-
import java.io.Serializable;
import java.sql.SQLException;
import java.sql.SQLRecoverableException;
@@ -26,6 +22,10 @@ import java.util.HashSet;
import java.util.Properties;
import java.util.Set;
+import com.alibaba.druid.pool.ExceptionSorter;
+import com.alibaba.druid.support.logging.Log;
+import com.alibaba.druid.support.logging.LogFactory;
+
/**
* Implementation of ExceptionSorter for Oracle.
*/
diff --git a/src/main/java/com/alibaba/druid/pool/vendor/SybaseExceptionSorter.java b/src/main/java/com/alibaba/druid/pool/vendor/SybaseExceptionSorter.java
index 0c9351ba09..7f0712b42b 100644
--- a/src/main/java/com/alibaba/druid/pool/vendor/SybaseExceptionSorter.java
+++ b/src/main/java/com/alibaba/druid/pool/vendor/SybaseExceptionSorter.java
@@ -15,13 +15,13 @@
*/
package com.alibaba.druid.pool.vendor;
-import com.alibaba.druid.pool.ExceptionSorter;
-
import java.io.Serializable;
import java.sql.SQLException;
import java.sql.SQLRecoverableException;
import java.util.Properties;
+import com.alibaba.druid.pool.ExceptionSorter;
+
public class SybaseExceptionSorter implements ExceptionSorter, Serializable {
private static final long serialVersionUID = 2742592563671255116L;
diff --git a/src/main/java/com/alibaba/druid/pool/xa/DruidXADataSource.java b/src/main/java/com/alibaba/druid/pool/xa/DruidXADataSource.java
index ed09818cef..795bbdc8c0 100644
--- a/src/main/java/com/alibaba/druid/pool/xa/DruidXADataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/xa/DruidXADataSource.java
@@ -15,6 +15,13 @@
*/
package com.alibaba.druid.pool.xa;
+import java.sql.Connection;
+import java.sql.SQLException;
+
+import javax.sql.XAConnection;
+import javax.sql.XADataSource;
+import javax.transaction.xa.XAException;
+
import com.alibaba.druid.pool.DruidDataSource;
import com.alibaba.druid.pool.DruidPooledConnection;
import com.alibaba.druid.support.logging.Log;
@@ -25,12 +32,6 @@ import com.alibaba.druid.util.MySqlUtils;
import com.alibaba.druid.util.OracleUtils;
import com.alibaba.druid.util.PGUtils;
-import javax.sql.XAConnection;
-import javax.sql.XADataSource;
-import javax.transaction.xa.XAException;
-import java.sql.Connection;
-import java.sql.SQLException;
-
public class DruidXADataSource extends DruidDataSource implements XADataSource {
private final static Log LOG = LogFactory.getLog(DruidXADataSource.class);
diff --git a/src/main/java/com/alibaba/druid/pool/xa/JtdsXAResource.java b/src/main/java/com/alibaba/druid/pool/xa/JtdsXAResource.java
index b6e6179eb5..4e78ba2d3f 100644
--- a/src/main/java/com/alibaba/druid/pool/xa/JtdsXAResource.java
+++ b/src/main/java/com/alibaba/druid/pool/xa/JtdsXAResource.java
@@ -22,11 +22,11 @@ import javax.transaction.xa.XAException;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
-import net.sourceforge.jtds.jdbc.XASupport;
-
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
+import net.sourceforge.jtds.jdbc.XASupport;
+
public class JtdsXAResource implements XAResource {
private final static Log LOG = LogFactory.getLog(JtdsXAResource.class);
diff --git a/src/main/java/com/alibaba/druid/proxy/DruidDriver.java b/src/main/java/com/alibaba/druid/proxy/DruidDriver.java
index b382d70c5a..dee4064d69 100644
--- a/src/main/java/com/alibaba/druid/proxy/DruidDriver.java
+++ b/src/main/java/com/alibaba/druid/proxy/DruidDriver.java
@@ -43,9 +43,9 @@ import com.alibaba.druid.proxy.jdbc.DataSourceProxyImpl;
import com.alibaba.druid.stat.JdbcStatManager;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
-import com.alibaba.druid.util.Utils;
import com.alibaba.druid.util.JMXUtils;
import com.alibaba.druid.util.JdbcUtils;
+import com.alibaba.druid.util.Utils;
/**
* @author wenshao [szujobs@hotmail.com]
diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java
index 1ab3329ffe..2c7544b31d 100644
--- a/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java
+++ b/src/main/java/com/alibaba/druid/proxy/jdbc/ConnectionProxyImpl.java
@@ -15,9 +15,6 @@
*/
package com.alibaba.druid.proxy.jdbc;
-import com.alibaba.druid.filter.FilterChainImpl;
-import com.alibaba.druid.filter.stat.StatFilter;
-
import java.sql.Array;
import java.sql.Blob;
import java.sql.CallableStatement;
@@ -28,7 +25,6 @@ import java.sql.NClob;
import java.sql.PreparedStatement;
import java.sql.SQLClientInfoException;
import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
import java.sql.SQLWarning;
import java.sql.SQLXML;
import java.sql.Savepoint;
@@ -39,6 +35,9 @@ import java.util.Map;
import java.util.Properties;
import java.util.concurrent.Executor;
+import com.alibaba.druid.filter.FilterChainImpl;
+import com.alibaba.druid.filter.stat.StatFilter;
+
/**
* @author wenshao [szujobs@hotmail.com]
*/
diff --git a/src/main/java/com/alibaba/druid/proxy/jdbc/DatabaseMetaDataProxyImpl.java b/src/main/java/com/alibaba/druid/proxy/jdbc/DatabaseMetaDataProxyImpl.java
index 2d4fcf0277..3b569511a5 100644
--- a/src/main/java/com/alibaba/druid/proxy/jdbc/DatabaseMetaDataProxyImpl.java
+++ b/src/main/java/com/alibaba/druid/proxy/jdbc/DatabaseMetaDataProxyImpl.java
@@ -15,7 +15,11 @@
*/
package com.alibaba.druid.proxy.jdbc;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DatabaseMetaData;
+import java.sql.ResultSet;
+import java.sql.RowIdLifetime;
+import java.sql.SQLException;
/**
* Created by wenshao on 26/05/2017.
diff --git a/src/main/java/com/alibaba/druid/sql/PagerUtils.java b/src/main/java/com/alibaba/druid/sql/PagerUtils.java
index 2eef7cc8ec..38703b4f95 100644
--- a/src/main/java/com/alibaba/druid/sql/PagerUtils.java
+++ b/src/main/java/com/alibaba/druid/sql/PagerUtils.java
@@ -16,12 +16,36 @@
package com.alibaba.druid.sql;
import java.util.List;
-import java.util.concurrent.atomic.AtomicInteger;
import com.alibaba.druid.DruidRuntimeException;
-import com.alibaba.druid.sql.ast.*;
-import com.alibaba.druid.sql.ast.expr.*;
-import com.alibaba.druid.sql.ast.statement.*;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLLimit;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLOrderBy;
+import com.alibaba.druid.sql.ast.SQLOver;
+import com.alibaba.druid.sql.ast.SQLSetQuantifier;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.ast.expr.SQLAggregateExpr;
+import com.alibaba.druid.sql.ast.expr.SQLAggregateOption;
+import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr;
+import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
+import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
+import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
+import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
+import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr;
+import com.alibaba.druid.sql.ast.expr.SQLNumberExpr;
+import com.alibaba.druid.sql.ast.expr.SQLNumericLiteralExpr;
+import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
+import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
+import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
+import com.alibaba.druid.sql.ast.statement.SQLSelect;
+import com.alibaba.druid.sql.ast.statement.SQLSelectItem;
+import com.alibaba.druid.sql.ast.statement.SQLSelectQuery;
+import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
+import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
+import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource;
+import com.alibaba.druid.sql.ast.statement.SQLTableSource;
+import com.alibaba.druid.sql.ast.statement.SQLUnionQuery;
import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitorAdapter;
@@ -31,7 +55,6 @@ import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitorAdapter;
import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock;
import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock;
import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerTop;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import com.alibaba.druid.util.JdbcConstants;
import com.alibaba.druid.util.JdbcUtils;
@@ -79,8 +102,6 @@ public class PagerUtils {
}
public static boolean limit(SQLSelect select, String dbType, int offset, int count, boolean check) {
- SQLSelectQuery query = select.getQuery();
-
if (JdbcConstants.ORACLE.equals(dbType)) {
return limitOracle(select, dbType, offset, count, check);
}
@@ -251,8 +272,13 @@ public class PagerUtils {
SQLAggregateExpr aggregateExpr = new SQLAggregateExpr("ROW_NUMBER");
SQLOrderBy orderBy = select.getOrderBy();
- aggregateExpr.setOver(new SQLOver(orderBy));
- select.setOrderBy(null);
+ if (orderBy != null) {
+ aggregateExpr.setOver(new SQLOver(orderBy));
+ select.setOrderBy(null);
+ } else if (queryBlock.getOrderBy() != null){
+ aggregateExpr.setOver(new SQLOver(queryBlock.getOrderBy()));
+ queryBlock.setOrderBy(null);
+ }
queryBlock.getSelectList().add(new SQLSelectItem(aggregateExpr, "ROWNUM"));
diff --git a/src/main/java/com/alibaba/druid/sql/SQLTransformUtils.java b/src/main/java/com/alibaba/druid/sql/SQLTransformUtils.java
index af1ce7ebaf..d321c07a05 100644
--- a/src/main/java/com/alibaba/druid/sql/SQLTransformUtils.java
+++ b/src/main/java/com/alibaba/druid/sql/SQLTransformUtils.java
@@ -15,18 +15,39 @@
*/
package com.alibaba.druid.sql;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLDataType;
import com.alibaba.druid.sql.ast.SQLDataTypeImpl;
import com.alibaba.druid.sql.ast.SQLExpr;
-import com.alibaba.druid.sql.ast.expr.*;
-import com.alibaba.druid.sql.ast.statement.*;
+import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr;
+import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
+import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
+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.SQLIntegerExpr;
+import com.alibaba.druid.sql.ast.expr.SQLIntervalExpr;
+import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
+import com.alibaba.druid.sql.ast.expr.SQLNullExpr;
+import com.alibaba.druid.sql.ast.expr.SQLNumericLiteralExpr;
+import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
+import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType;
+import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
+import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
+import com.alibaba.druid.sql.ast.statement.SQLJoinTableSource;
+import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
+import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource;
+import com.alibaba.druid.sql.ast.statement.SQLTableSource;
+import com.alibaba.druid.sql.ast.statement.SQLWithSubqueryClause;
import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleWithSubqueryEntry;
import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleSysdateExpr;
-import com.alibaba.druid.sql.dialect.oracle.ast.stmt.*;
+import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectJoin;
+import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectQueryBlock;
+import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectSubqueryTableSource;
+import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectTableReference;
import com.alibaba.druid.util.FnvHash;
-import java.util.List;
-
public class SQLTransformUtils {
public static SQLExpr transformDecode(SQLMethodInvokeExpr x) {
if (x == null) {
diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java
index acbded2c43..de448d5caa 100644
--- a/src/main/java/com/alibaba/druid/sql/SQLUtils.java
+++ b/src/main/java/com/alibaba/druid/sql/SQLUtils.java
@@ -18,9 +18,28 @@ package com.alibaba.druid.sql;
import java.util.List;
import java.util.Map;
-import com.alibaba.druid.sql.ast.*;
-import com.alibaba.druid.sql.ast.expr.*;
-import com.alibaba.druid.sql.ast.statement.*;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLReplaceable;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
+import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
+import com.alibaba.druid.sql.ast.expr.SQLInListExpr;
+import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr;
+import com.alibaba.druid.sql.ast.expr.SQLUnaryExpr;
+import com.alibaba.druid.sql.ast.expr.SQLUnaryOperator;
+import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
+import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
+import com.alibaba.druid.sql.ast.statement.SQLDeleteStatement;
+import com.alibaba.druid.sql.ast.statement.SQLSelectItem;
+import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem;
+import com.alibaba.druid.sql.ast.statement.SQLSelectQuery;
+import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
+import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
+import com.alibaba.druid.sql.ast.statement.SQLSetStatement;
+import com.alibaba.druid.sql.ast.statement.SQLUpdateSetItem;
+import com.alibaba.druid.sql.ast.statement.SQLUpdateStatement;
import com.alibaba.druid.sql.dialect.db2.visitor.DB2OutputVisitor;
import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor;
import com.alibaba.druid.sql.dialect.h2.visitor.H2OutputVisitor;
@@ -38,13 +57,25 @@ import com.alibaba.druid.sql.dialect.postgresql.visitor.PGOutputVisitor;
import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor;
import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerOutputVisitor;
import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerSchemaStatVisitor;
-import com.alibaba.druid.sql.parser.*;
+import com.alibaba.druid.sql.parser.Lexer;
+import com.alibaba.druid.sql.parser.ParserException;
+import com.alibaba.druid.sql.parser.SQLExprParser;
+import com.alibaba.druid.sql.parser.SQLParserFeature;
+import com.alibaba.druid.sql.parser.SQLParserUtils;
+import com.alibaba.druid.sql.parser.SQLStatementParser;
+import com.alibaba.druid.sql.parser.Token;
import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
import com.alibaba.druid.sql.visitor.SchemaStatVisitor;
import com.alibaba.druid.sql.visitor.VisitorFeature;
import com.alibaba.druid.support.logging.Log;
import com.alibaba.druid.support.logging.LogFactory;
-import com.alibaba.druid.util.*;
+import com.alibaba.druid.util.FnvHash;
+import com.alibaba.druid.util.JdbcConstants;
+import com.alibaba.druid.util.MySqlUtils;
+import com.alibaba.druid.util.OracleUtils;
+import com.alibaba.druid.util.PGUtils;
+import com.alibaba.druid.util.StringUtils;
+import com.alibaba.druid.util.Utils;
public class SQLUtils {
private final static SQLParserFeature[] FORMAT_DEFAULT_FEATURES = {
@@ -962,7 +993,7 @@ public class SQLUtils {
* @return
*/
public static String sort(String sql, String dbType) {
- List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE);
+ List stmtList = SQLUtils.parseStatements(sql, JdbcConstants.ORACLE);
SQLCreateTableStatement.sort(stmtList);
return SQLUtils.toSQLString(stmtList, dbType);
}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLArrayDataType.java b/src/main/java/com/alibaba/druid/sql/ast/SQLArrayDataType.java
index 5912240905..501fda358c 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/SQLArrayDataType.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/SQLArrayDataType.java
@@ -15,12 +15,12 @@
*/
package com.alibaba.druid.sql.ast;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import com.alibaba.druid.util.FnvHash;
-
import java.util.Collections;
import java.util.List;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.FnvHash;
+
public class SQLArrayDataType extends SQLObjectImpl implements SQLDataType {
private String dbType;
private SQLDataType componentType;
@@ -76,7 +76,7 @@ public class SQLArrayDataType extends SQLObjectImpl implements SQLDataType {
@Override
public void setDbType(String dbType) {
- dbType = dbType;
+ this.dbType = dbType;
}
@Override
diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java b/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java
index bed7c4086a..5acc4e61bc 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/SQLDataTypeImpl.java
@@ -15,14 +15,14 @@
*/
package com.alibaba.druid.sql.ast;
+import java.util.ArrayList;
+import java.util.List;
+
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import com.alibaba.druid.util.FnvHash;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLDataTypeImpl extends SQLObjectImpl implements SQLDataType {
private String name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java b/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java
index 4843db4fe1..347ab276a7 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/SQLExprImpl.java
@@ -15,8 +15,6 @@
*/
package com.alibaba.druid.sql.ast;
-import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
-
import java.util.Collections;
import java.util.List;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLLimit.java b/src/main/java/com/alibaba/druid/sql/ast/SQLLimit.java
index dcdeabf270..abc9d7e8eb 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/SQLLimit.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/SQLLimit.java
@@ -15,9 +15,7 @@
*/
package com.alibaba.druid.sql.ast;
-import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
-import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
/**
diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLMapDataType.java b/src/main/java/com/alibaba/druid/sql/ast/SQLMapDataType.java
index 35a8276545..b56d1647ae 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/SQLMapDataType.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/SQLMapDataType.java
@@ -15,12 +15,12 @@
*/
package com.alibaba.druid.sql.ast;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import com.alibaba.druid.util.FnvHash;
-
import java.util.Collections;
import java.util.List;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.FnvHash;
+
public class SQLMapDataType extends SQLObjectImpl implements SQLDataType {
private String dbType;
private SQLDataType keyType;
@@ -83,7 +83,7 @@ public class SQLMapDataType extends SQLObjectImpl implements SQLDataType {
@Override
public void setDbType(String dbType) {
- dbType = dbType;
+ this.dbType = dbType;
}
@Override
diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLObjectImpl.java b/src/main/java/com/alibaba/druid/sql/ast/SQLObjectImpl.java
index 6422be1496..8e4964d007 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/SQLObjectImpl.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/SQLObjectImpl.java
@@ -20,7 +20,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public abstract class SQLObjectImpl implements SQLObject {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java b/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java
index b45b0d9465..d9c87ca96c 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/SQLOrderBy.java
@@ -15,12 +15,12 @@
*/
package com.alibaba.druid.sql.ast;
-import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-
import java.util.ArrayList;
import java.util.List;
+import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
public final class SQLOrderBy extends SQLObjectImpl {
protected final List items = new ArrayList();
diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java b/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java
index 0e666533a1..f01d562ed7 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java
@@ -1,10 +1,10 @@
package com.alibaba.druid.sql.ast;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-
import java.util.ArrayList;
import java.util.List;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
/*
* Copyright 1999-2018 Alibaba Group Holding Ltd.
*
diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLParameter.java b/src/main/java/com/alibaba/druid/sql/ast/SQLParameter.java
index 3c5e07760e..06565a65c4 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/SQLParameter.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/SQLParameter.java
@@ -15,11 +15,11 @@
*/
package com.alibaba.druid.sql.ast;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-
import java.util.ArrayList;
import java.util.List;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
public final class SQLParameter extends SQLObjectImpl implements SQLObjectWithDataType {
private SQLName name;
private SQLDataType dataType;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLPartition.java b/src/main/java/com/alibaba/druid/sql/ast/SQLPartition.java
index 1fdb576b1c..541b4c56f6 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/SQLPartition.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/SQLPartition.java
@@ -20,8 +20,6 @@ import java.util.List;
import com.alibaba.druid.sql.dialect.oracle.ast.OracleSegmentAttributes;
import com.alibaba.druid.sql.dialect.oracle.ast.OracleSegmentAttributesImpl;
-import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleLobStorageClause;
-import com.alibaba.druid.sql.dialect.oracle.ast.clause.OracleStorageClause;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLPartition extends OracleSegmentAttributesImpl implements OracleSegmentAttributes {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByList.java b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByList.java
index e78d321b18..fa8104e266 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByList.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByList.java
@@ -15,9 +15,6 @@
*/
package com.alibaba.druid.sql.ast;
-import java.util.ArrayList;
-import java.util.List;
-
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLPartitionByList extends SQLPartitionBy {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByRange.java b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByRange.java
index 0e92bd8e06..634a71c995 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByRange.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/SQLPartitionByRange.java
@@ -15,9 +15,6 @@
*/
package com.alibaba.druid.sql.ast;
-import java.util.ArrayList;
-import java.util.List;
-
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLPartitionByRange extends SQLPartitionBy {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLRecordDataType.java b/src/main/java/com/alibaba/druid/sql/ast/SQLRecordDataType.java
index d8bf1d9f38..09215673d0 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/SQLRecordDataType.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/SQLRecordDataType.java
@@ -15,12 +15,12 @@
*/
package com.alibaba.druid.sql.ast;
-import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-
import java.util.ArrayList;
import java.util.List;
+import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
public class SQLRecordDataType extends SQLDataTypeImpl implements SQLDataType {
private final List columns = new ArrayList();
diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLStatementImpl.java b/src/main/java/com/alibaba/druid/sql/ast/SQLStatementImpl.java
index 7cabddef42..a6e63524a7 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/SQLStatementImpl.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/SQLStatementImpl.java
@@ -15,11 +15,11 @@
*/
package com.alibaba.druid.sql.ast;
+import java.util.List;
+
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.List;
-
public abstract class SQLStatementImpl extends SQLObjectImpl implements SQLStatement {
protected String dbType;
protected boolean afterSemi;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLStructDataType.java b/src/main/java/com/alibaba/druid/sql/ast/SQLStructDataType.java
index 760a1703d4..c277dbd151 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/SQLStructDataType.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/SQLStructDataType.java
@@ -15,13 +15,13 @@
*/
package com.alibaba.druid.sql.ast;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import com.alibaba.druid.util.FnvHash;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.FnvHash;
+
public class SQLStructDataType extends SQLObjectImpl implements SQLDataType {
private String dbType;
private List fields = new ArrayList();
@@ -76,7 +76,7 @@ public class SQLStructDataType extends SQLObjectImpl implements SQLDataType {
@Override
public void setDbType(String dbType) {
- dbType = dbType;
+ this.dbType = dbType;
}
@Override
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateExpr.java
index 3f1ce6798e..00c67b74f1 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAggregateExpr.java
@@ -17,11 +17,18 @@ package com.alibaba.druid.sql.ast.expr;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.*;
+import com.alibaba.druid.sql.ast.SQLDataType;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLExprImpl;
+import com.alibaba.druid.sql.ast.SQLKeep;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLOrderBy;
+import com.alibaba.druid.sql.ast.SQLOver;
+import com.alibaba.druid.sql.ast.SQLReplaceable;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import com.alibaba.druid.util.FnvHash;
@@ -298,6 +305,7 @@ public class SQLAggregateExpr extends SQLExprImpl implements Serializable, SQLRe
if (filter == expr) {
this.filter = target;
target.setParent(this);
+ return true;
}
return false;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllColumnExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllColumnExpr.java
index 807fb63518..809dc5d363 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllColumnExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllColumnExpr.java
@@ -15,13 +15,13 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.ast.statement.SQLTableSource;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collections;
-import java.util.List;
-
public final class SQLAllColumnExpr extends SQLExprImpl {
private transient SQLTableSource resolvedTableSource;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllExpr.java
index f33c2eec36..5bccbd0abd 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAllExpr.java
@@ -15,14 +15,14 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.statement.SQLSelect;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collections;
-import java.util.List;
-
public final class SQLAllExpr extends SQLExprImpl {
public SQLSelect subQuery;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAnyExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAnyExpr.java
index 8248a5b026..9305823c89 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAnyExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLAnyExpr.java
@@ -15,6 +15,9 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLDataType;
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.ast.SQLObject;
@@ -23,9 +26,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectItem;
import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collections;
-import java.util.List;
-
public class SQLAnyExpr extends SQLExprImpl {
public SQLSelect subQuery;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBetweenExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBetweenExpr.java
index 10a17447c8..958d9671fa 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBetweenExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBetweenExpr.java
@@ -17,10 +17,13 @@ package com.alibaba.druid.sql.ast.expr;
import java.io.Serializable;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
-import com.alibaba.druid.sql.ast.*;
+import com.alibaba.druid.sql.ast.SQLDataType;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLExprImpl;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLReplaceable;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLBetweenExpr extends SQLExprImpl implements Serializable, SQLReplaceable {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java
index d41df75137..873973454f 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryExpr.java
@@ -15,15 +15,15 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import com.alibaba.druid.util.Utils;
-import java.math.BigInteger;
-import java.util.Collections;
-import java.util.List;
-
public class SQLBinaryExpr extends SQLExprImpl implements SQLLiteralExpr, SQLValuableExpr {
private String text;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java
index 9eddba9ce4..556147ae31 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExpr.java
@@ -18,12 +18,14 @@ package com.alibaba.druid.sql.ast.expr;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.*;
-import com.alibaba.druid.sql.visitor.ParameterizedOutputVisitorUtils;
+import com.alibaba.druid.sql.ast.SQLDataType;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLExprImpl;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLReplaceable;
import com.alibaba.druid.sql.visitor.ParameterizedVisitor;
import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExprGroup.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExprGroup.java
index b50b31433d..2129244044 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExprGroup.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOpExprGroup.java
@@ -15,15 +15,14 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.util.ArrayList;
+import java.util.List;
+
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLExprImpl;
-import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLBinaryOpExprGroup extends SQLExprImpl {
private final SQLBinaryOperator operator;
private final List items = new ArrayList();
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBooleanExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBooleanExpr.java
index 80ddcff8e5..5d98e4c6a5 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBooleanExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBooleanExpr.java
@@ -15,16 +15,15 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLDataType;
import com.alibaba.druid.sql.ast.SQLDataTypeImpl;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLExprImpl;
-import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collections;
-import java.util.List;
-
public final class SQLBooleanExpr extends SQLExprImpl implements SQLExpr, SQLLiteralExpr, SQLValuableExpr {
public static final SQLDataType DEFAULT_DATA_TYPE = new SQLDataTypeImpl(SQLDataType.Constants.BOOLEAN);
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseExpr.java
index 0e73e86e38..d8428c2ea6 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseExpr.java
@@ -17,11 +17,15 @@ package com.alibaba.druid.sql.ast.expr;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.*;
+import com.alibaba.druid.sql.ast.SQLDataType;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLExprImpl;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLObjectImpl;
+import com.alibaba.druid.sql.ast.SQLReplaceable;
import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseStatement.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseStatement.java
index f9f5ae8da5..d26cb1df03 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCaseStatement.java
@@ -15,13 +15,17 @@
*/
package com.alibaba.druid.sql.ast.expr;
-import com.alibaba.druid.sql.ast.*;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLObjectImpl;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
public class SQLCaseStatement extends SQLStatementImpl implements Serializable {
private final List- items = new ArrayList
- ();
private SQLExpr valueExpr;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCastExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCastExpr.java
index bc40f66096..48a36d4d39 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCastExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCastExpr.java
@@ -15,13 +15,16 @@
*/
package com.alibaba.druid.sql.ast.expr;
-import com.alibaba.druid.sql.ast.*;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
+import com.alibaba.druid.sql.ast.SQLDataType;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLExprImpl;
+import com.alibaba.druid.sql.ast.SQLObjectWithDataType;
+import com.alibaba.druid.sql.ast.SQLReplaceable;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
public class SQLCastExpr extends SQLExprImpl implements SQLObjectWithDataType, SQLReplaceable {
protected SQLExpr expr;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCharExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCharExpr.java
index bc1d8a86f4..332659fcc9 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCharExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCharExpr.java
@@ -15,6 +15,9 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLDataType;
import com.alibaba.druid.sql.ast.SQLObject;
@@ -22,10 +25,6 @@ import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType;
import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
public class SQLCharExpr extends SQLTextLiteralExpr implements SQLValuableExpr{
public static final SQLDataType DEFAULT_DATA_TYPE = new SQLCharacterDataType("varchar");
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLContainsExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLContainsExpr.java
index bc8687a758..f2afdae6ab 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLContainsExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLContainsExpr.java
@@ -15,13 +15,17 @@
*/
package com.alibaba.druid.sql.ast.expr;
-import com.alibaba.druid.sql.ast.*;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import com.alibaba.druid.sql.ast.SQLDataType;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLExprImpl;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLReplaceable;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
public final class SQLContainsExpr extends SQLExprImpl implements SQLReplaceable, Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCurrentOfCursorExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCurrentOfCursorExpr.java
index 05df349359..6778b80b3c 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCurrentOfCursorExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCurrentOfCursorExpr.java
@@ -15,14 +15,14 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collections;
-import java.util.List;
-
public class SQLCurrentOfCursorExpr extends SQLExprImpl {
private SQLName cursorName;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateExpr.java
index 2ff70e6104..2207e0e543 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateExpr.java
@@ -15,18 +15,16 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLDataType;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType;
-import com.alibaba.druid.sql.dialect.oracle.ast.expr.OracleExpr;
-import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collections;
-import java.util.List;
-
public class SQLDateExpr extends SQLExprImpl implements SQLLiteralExpr, SQLValuableExpr {
public static final SQLDataType DEFAULT_DATA_TYPE = new SQLCharacterDataType("date");
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDefaultExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDefaultExpr.java
index 26abcd8664..8b913b5d9e 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDefaultExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDefaultExpr.java
@@ -15,14 +15,13 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
public class SQLDefaultExpr extends SQLExprImpl implements SQLLiteralExpr {
@Override
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLFlashbackExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLFlashbackExpr.java
index f3c48a3370..e7606bbdc4 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLFlashbackExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLFlashbackExpr.java
@@ -15,14 +15,14 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collections;
-import java.util.List;
-
/**
* Created by wenshao on 14/06/2017.
*/
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLGroupingSetExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLGroupingSetExpr.java
index c16e4efef1..307ad42d6c 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLGroupingSetExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLGroupingSetExpr.java
@@ -16,13 +16,10 @@
package com.alibaba.druid.sql.ast.expr;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLExprImpl;
-import com.alibaba.druid.sql.ast.SQLObject;
-import com.alibaba.druid.sql.ast.statement.SQLExplainStatement;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLGroupingSetExpr extends SQLExprImpl {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLHexExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLHexExpr.java
index ce5e1f32c6..58b6f5bfb5 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLHexExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLHexExpr.java
@@ -15,13 +15,13 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import com.alibaba.druid.util.HexBin;
-import java.util.Collections;
-import java.util.List;
-
public class SQLHexExpr extends SQLExprImpl implements SQLLiteralExpr, SQLValuableExpr {
private final String hex;
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 628eb7bb45..2955e7bd54 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
@@ -15,15 +15,26 @@
*/
package com.alibaba.druid.sql.ast.expr;
-import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.*;
-import com.alibaba.druid.sql.ast.statement.*;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import com.alibaba.druid.util.FnvHash;
-
import java.util.Collections;
import java.util.List;
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLDataType;
+import com.alibaba.druid.sql.ast.SQLDeclareItem;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLExprImpl;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLParameter;
+import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
+import com.alibaba.druid.sql.ast.statement.SQLSelect;
+import com.alibaba.druid.sql.ast.statement.SQLSelectItem;
+import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
+import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource;
+import com.alibaba.druid.sql.ast.statement.SQLTableSource;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.FnvHash;
+
public final class SQLIdentifierExpr extends SQLExprImpl implements SQLName {
protected String name;
private long hashCode64;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInSubQueryExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInSubQueryExpr.java
index 76bdd98855..eab84fa7dd 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInSubQueryExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLInSubQueryExpr.java
@@ -17,7 +17,6 @@ package com.alibaba.druid.sql.ast.expr;
import java.io.Serializable;
import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
import com.alibaba.druid.sql.SQLUtils;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntegerExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntegerExpr.java
index 180438405b..a2d733b8f1 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntegerExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntegerExpr.java
@@ -19,9 +19,6 @@ import com.alibaba.druid.sql.ast.SQLDataType;
import com.alibaba.druid.sql.ast.SQLDataTypeImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collections;
-import java.util.List;
-
public class SQLIntegerExpr extends SQLNumericLiteralExpr implements SQLValuableExpr{
public static final SQLDataType DEFAULT_DATA_TYPE = new SQLDataTypeImpl("bigint");
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntervalExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntervalExpr.java
index 084a1372c9..dddde3d347 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntervalExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLIntervalExpr.java
@@ -15,13 +15,13 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collections;
-import java.util.List;
-
public class SQLIntervalExpr extends SQLExprImpl {
private SQLExpr value;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLListExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLListExpr.java
index 4f8fbbe842..eca4032508 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLListExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLListExpr.java
@@ -16,12 +16,10 @@
package com.alibaba.druid.sql.ast.expr;
import java.util.ArrayList;
-import java.util.Arrays;
import java.util.List;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLExprImpl;
-import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLListExpr extends SQLExprImpl {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java
index 9ce5e9be31..fb263c7497 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLMethodInvokeExpr.java
@@ -17,11 +17,14 @@ package com.alibaba.druid.sql.ast.expr;
import java.io.Serializable;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.*;
+import com.alibaba.druid.sql.ast.SQLDataType;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLExprImpl;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLReplaceable;
import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import com.alibaba.druid.util.FnvHash;
@@ -107,10 +110,14 @@ public class SQLMethodInvokeExpr extends SQLExprImpl implements SQLReplaceable,
this.from = x;
}
+ public List getArguments() {
+ return this.parameters;
+ }
+
public List getParameters() {
return this.parameters;
}
-
+
public void addParameter(SQLExpr param) {
if (param != null) {
param.setParent(this);
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNullExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNullExpr.java
index 91ad02482b..1d533a7d6d 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNullExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNullExpr.java
@@ -15,13 +15,13 @@
*/
package com.alibaba.druid.sql.ast.expr;
-import com.alibaba.druid.sql.ast.SQLExprImpl;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE_NULL;
import java.util.Collections;
import java.util.List;
-import static com.alibaba.druid.sql.visitor.SQLEvalVisitor.EVAL_VALUE_NULL;
+import com.alibaba.druid.sql.ast.SQLExprImpl;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public final class SQLNullExpr extends SQLExprImpl implements SQLLiteralExpr, SQLValuableExpr {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumberExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumberExpr.java
index fd809bf466..9d668928f6 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumberExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumberExpr.java
@@ -15,14 +15,13 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.math.BigDecimal;
+
import com.alibaba.druid.sql.ast.SQLDataType;
import com.alibaba.druid.sql.ast.SQLDataTypeImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import com.alibaba.druid.util.Utils;
-import java.io.IOException;
-import java.math.BigDecimal;
-
public class SQLNumberExpr extends SQLNumericLiteralExpr implements SQLValuableExpr {
public final static SQLDataType defaultDataType = new SQLDataTypeImpl("number");
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumericLiteralExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumericLiteralExpr.java
index 22adec2b17..38d6239337 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumericLiteralExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLNumericLiteralExpr.java
@@ -15,11 +15,11 @@
*/
package com.alibaba.druid.sql.ast.expr;
-import com.alibaba.druid.sql.ast.SQLExprImpl;
-
import java.util.Collections;
import java.util.List;
+import com.alibaba.druid.sql.ast.SQLExprImpl;
+
public abstract class SQLNumericLiteralExpr extends SQLExprImpl implements SQLLiteralExpr {
public SQLNumericLiteralExpr(){
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 163e61c370..22c19388df 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
@@ -15,15 +15,25 @@
*/
package com.alibaba.druid.sql.ast.expr;
-import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.*;
-import com.alibaba.druid.sql.ast.statement.*;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import com.alibaba.druid.util.FnvHash;
-
import java.util.Collections;
import java.util.List;
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLDataType;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLExprImpl;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
+import com.alibaba.druid.sql.ast.statement.SQLCreateProcedureStatement;
+import com.alibaba.druid.sql.ast.statement.SQLSelect;
+import com.alibaba.druid.sql.ast.statement.SQLSelectItem;
+import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
+import com.alibaba.druid.sql.ast.statement.SQLSubqueryTableSource;
+import com.alibaba.druid.sql.ast.statement.SQLTableSource;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+import com.alibaba.druid.util.FnvHash;
+
public final class SQLPropertyExpr extends SQLExprImpl implements SQLName {
private SQLExpr owner;
private String name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLRealExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLRealExpr.java
index 1fff29973f..4afa7136d0 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLRealExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLRealExpr.java
@@ -15,12 +15,12 @@
*/
package com.alibaba.druid.sql.ast.expr;
-import com.alibaba.druid.sql.ast.SQLObject;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-
import java.util.Collections;
import java.util.List;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
public class SQLRealExpr extends SQLNumericLiteralExpr implements SQLValuableExpr {
private Float value;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSequenceExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSequenceExpr.java
index 2513042644..4a92941606 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSequenceExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSequenceExpr.java
@@ -15,14 +15,14 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collections;
-import java.util.List;
-
public class SQLSequenceExpr extends SQLExprImpl {
private SQLName sequence;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSomeExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSomeExpr.java
index d5cc2cc683..c2e01067f6 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSomeExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLSomeExpr.java
@@ -15,6 +15,9 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLDataType;
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.ast.SQLObject;
@@ -23,10 +26,6 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectItem;
import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-
public final class SQLSomeExpr extends SQLExprImpl {
public SQLSelect subQuery;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTextLiteralExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTextLiteralExpr.java
index fe7a516b7f..65d43c9b64 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTextLiteralExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTextLiteralExpr.java
@@ -15,11 +15,11 @@
*/
package com.alibaba.druid.sql.ast.expr;
-import com.alibaba.druid.sql.ast.SQLExprImpl;
-
import java.util.Collections;
import java.util.List;
+import com.alibaba.druid.sql.ast.SQLExprImpl;
+
public abstract class SQLTextLiteralExpr extends SQLExprImpl implements SQLLiteralExpr {
protected String text;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTimestampExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTimestampExpr.java
index dbf6203e21..05d30deeb4 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTimestampExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLTimestampExpr.java
@@ -15,15 +15,15 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLDataType;
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.ast.statement.SQLCharacterDataType;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collections;
-import java.util.List;
-
public class SQLTimestampExpr extends SQLExprImpl implements SQLValuableExpr {
public static final SQLDataType DEFAULT_DATA_TYPE = new SQLCharacterDataType("datetime");
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLValuesExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLValuesExpr.java
index 1dcaaae30e..a8491e27fd 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLValuesExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLValuesExpr.java
@@ -15,13 +15,13 @@
*/
package com.alibaba.druid.sql.ast.expr;
+import java.util.ArrayList;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLExprImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLValuesExpr extends SQLExprImpl {
private List values = new ArrayList();
diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLVariantRefExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLVariantRefExpr.java
index dee7289067..be52fa8350 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLVariantRefExpr.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLVariantRefExpr.java
@@ -15,15 +15,15 @@
*/
package com.alibaba.druid.sql.ast.expr;
-import com.alibaba.druid.sql.ast.SQLExprImpl;
-import com.alibaba.druid.sql.ast.SQLObject;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import com.alibaba.druid.sql.ast.SQLExprImpl;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
public class SQLVariantRefExpr extends SQLExprImpl {
private String name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterCharacter.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterCharacter.java
index 08dbaf8953..54aa540a6e 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterCharacter.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterCharacter.java
@@ -17,9 +17,6 @@ package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLObjectImpl;
-import com.alibaba.druid.sql.ast.statement.SQLAlterTableItem;
-import com.alibaba.druid.sql.dialect.mysql.ast.MySqlObjectImpl;
-import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLAlterCharacter extends SQLObjectImpl implements SQLAlterTableItem {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterDatabaseStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterDatabaseStatement.java
index d6ebc28bd1..fecdda3370 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterDatabaseStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterDatabaseStatement.java
@@ -15,14 +15,14 @@
*/
package com.alibaba.druid.sql.ast.statement;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collections;
-import java.util.List;
-
public class SQLAlterDatabaseStatement extends SQLStatementImpl implements SQLAlterStatement {
private SQLName name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterProcedureStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterProcedureStatement.java
index 768a43c9e8..444d05767f 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterProcedureStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterProcedureStatement.java
@@ -17,9 +17,6 @@ package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
-import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleAlterStatement;
-import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleStatementImpl;
-import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLAlterProcedureStatement extends SQLStatementImpl implements SQLAlterStatement {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterSequenceStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterSequenceStatement.java
index f59206d20c..c692bfeab9 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterSequenceStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterSequenceStatement.java
@@ -15,6 +15,9 @@
*/
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.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObject;
@@ -22,9 +25,6 @@ import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLAlterSequenceStatement extends SQLStatementImpl implements SQLAlterStatement {
private SQLName name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddIndex.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddIndex.java
index 5ef6cd2b5c..2e33bfc1c8 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddIndex.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTableAddIndex.java
@@ -22,7 +22,6 @@ import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObjectImpl;
import com.alibaba.druid.sql.dialect.mysql.ast.MySqlKey;
-import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUnique;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlTableIndex;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTypeStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTypeStatement.java
index 1c0fa12475..74d742409f 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTypeStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterTypeStatement.java
@@ -15,14 +15,14 @@
*/
package com.alibaba.druid.sql.ast.statement;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collections;
-import java.util.List;
-
public class SQLAlterTypeStatement extends SQLStatementImpl {
private SQLName name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterViewStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterViewStatement.java
index 1181225ef9..8ac773a28d 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterViewStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLAlterViewStatement.java
@@ -15,16 +15,19 @@
*/
package com.alibaba.druid.sql.ast.statement;
+import java.util.ArrayList;
+import java.util.List;
+
import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.*;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr;
import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLAlterViewStatement extends SQLStatementImpl implements SQLCreateStatement {
private boolean force = false;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharacterDataType.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharacterDataType.java
index e4f32aebd5..9e8ad75fd1 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharacterDataType.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCharacterDataType.java
@@ -15,6 +15,8 @@
*/
package com.alibaba.druid.sql.ast.statement;
+import java.util.List;
+
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLCommentHint;
import com.alibaba.druid.sql.ast.SQLDataTypeImpl;
@@ -22,8 +24,6 @@ import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.List;
-
public class SQLCharacterDataType extends SQLDataTypeImpl {
private String charSetName;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCloseStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCloseStatement.java
index ba78bf1134..35594d1637 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCloseStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCloseStatement.java
@@ -15,15 +15,15 @@
*/
package com.alibaba.druid.sql.ast.statement;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collections;
-import java.util.List;
-
/**
*
* MySql cursor close statement
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java
index bb868c9e0a..aec8b980cf 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java
@@ -19,12 +19,16 @@ import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.*;
+import com.alibaba.druid.sql.ast.SQLDataType;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLObjectImpl;
+import com.alibaba.druid.sql.ast.SQLObjectWithDataType;
+import com.alibaba.druid.sql.ast.SQLReplaceable;
import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import com.alibaba.druid.util.JdbcConstants;
public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElement, SQLObjectWithDataType, SQLReplaceable {
protected String dbType;
@@ -45,7 +49,7 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen
protected SQLExpr storage;
protected SQLExpr charsetExpr;
protected SQLExpr asExpr;
- protected boolean sorted = false;
+ protected boolean stored = false;
protected boolean virtual = false;
protected Identity identity;
@@ -208,12 +212,12 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen
this.virtual = virtual;
}
- public boolean isSorted() {
- return sorted;
+ public boolean isStored() {
+ return stored;
}
- public void setSorted(boolean sorted) {
- this.sorted = sorted;
+ public void setStored(boolean stored) {
+ this.stored = stored;
}
public SQLExpr getCharsetExpr() {
@@ -387,7 +391,7 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen
x.setAsExpr(asExpr.clone());
}
- x.sorted = sorted;
+ x.stored = stored;
x.virtual = virtual;
if (identity != null) {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCommentStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCommentStatement.java
index ea54093b06..39d7a41212 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCommentStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCommentStatement.java
@@ -15,12 +15,15 @@
*/
package com.alibaba.druid.sql.ast.statement;
-import com.alibaba.druid.sql.ast.*;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-
import java.util.ArrayList;
import java.util.List;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
public class SQLCommentStatement extends SQLStatementImpl {
public static enum Type {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraintImpl.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraintImpl.java
index 2a9c5792ad..1935f24b5a 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraintImpl.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLConstraintImpl.java
@@ -15,6 +15,8 @@
*/
package com.alibaba.druid.sql.ast.statement;
+import java.util.List;
+
import com.alibaba.druid.sql.SQLUtils;
import com.alibaba.druid.sql.ast.SQLCommentHint;
import com.alibaba.druid.sql.ast.SQLExpr;
@@ -22,8 +24,6 @@ import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObjectImpl;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
-import java.util.List;
-
public abstract class SQLConstraintImpl extends SQLObjectImpl implements SQLConstraint {
protected String dbType;
protected SQLName name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateFunctionStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateFunctionStatement.java
index 5de30b8724..d1fb5faab6 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateFunctionStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateFunctionStatement.java
@@ -15,13 +15,18 @@
*/
package com.alibaba.druid.sql.ast.statement;
-import com.alibaba.druid.sql.ast.*;
-import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-
import java.util.ArrayList;
import java.util.List;
+import com.alibaba.druid.sql.ast.SQLDataType;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLObjectWithDataType;
+import com.alibaba.druid.sql.ast.SQLParameter;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
+import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
/**
* Created by wenshao on 23/05/2017.
*/
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateMaterializedViewStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateMaterializedViewStatement.java
index 02508951c5..ddf7677c46 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateMaterializedViewStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateMaterializedViewStatement.java
@@ -15,6 +15,9 @@
*/
package com.alibaba.druid.sql.ast.statement;
+import java.util.ArrayList;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLPartitionBy;
@@ -22,9 +25,6 @@ import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.dialect.oracle.ast.OracleSegmentAttributes;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* Created by wenshao on 30/06/2017.
*/
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateSequenceStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateSequenceStatement.java
index 5998967a1f..cf6ba5f8c5 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateSequenceStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateSequenceStatement.java
@@ -15,14 +15,16 @@
*/
package com.alibaba.druid.sql.ast.statement;
-import com.alibaba.druid.sql.ast.*;
-import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
-import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-
import java.util.ArrayList;
import java.util.List;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
+import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
/**
* Created by wenshao on 16/9/14.
*/
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateStatement.java
index 891b46757e..7ccaf7b7f6 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateStatement.java
@@ -15,7 +15,5 @@
*/
package com.alibaba.druid.sql.ast.statement;
-import com.alibaba.druid.sql.ast.SQLStatement;
-
public interface SQLCreateStatement extends SQLDDLStatement {
}
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java
index aef97407ce..5eadac2df8 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java
@@ -15,10 +15,21 @@
*/
package com.alibaba.druid.sql.ast.statement;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.*;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLPartitionBy;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr;
import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
@@ -28,7 +39,6 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlTableIndex;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleCreateSynonymStatement;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import com.alibaba.druid.util.FnvHash;
-import com.alibaba.druid.util.JdbcConstants;
import com.alibaba.druid.util.ListDG;
import com.alibaba.druid.util.lang.Consumer;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTriggerStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTriggerStatement.java
index 38e14a496a..e2965a9e85 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTriggerStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTriggerStatement.java
@@ -18,7 +18,11 @@ package com.alibaba.druid.sql.ast.statement;
import java.util.ArrayList;
import java.util.List;
-import com.alibaba.druid.sql.ast.*;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLCreateTriggerStatement extends SQLStatementImpl implements SQLCreateStatement {
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 a617c55006..feab5a73b6 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
@@ -19,7 +19,11 @@ import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.*;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLObjectImpl;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeclareStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeclareStatement.java
index 4dff696d12..afecf526d1 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeclareStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDeclareStatement.java
@@ -18,10 +18,11 @@ package com.alibaba.druid.sql.ast.statement;
import java.util.ArrayList;
import java.util.List;
-import com.alibaba.druid.sql.ast.*;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerObjectImpl;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerStatement;
-import com.alibaba.druid.sql.dialect.sqlserver.visitor.SQLServerASTVisitor;
+import com.alibaba.druid.sql.ast.SQLDataType;
+import com.alibaba.druid.sql.ast.SQLDeclareItem;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLDeclareStatement extends SQLStatementImpl {
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 b79806ff8c..94ba553700 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
@@ -15,17 +15,22 @@
*/
package com.alibaba.druid.sql.ast.statement;
+import java.util.ArrayList;
+import java.util.List;
+
import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.*;
+import com.alibaba.druid.sql.ast.SQLCommentHint;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLReplaceable;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExprGroup;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLDeleteStatement extends SQLStatementImpl implements SQLReplaceable {
protected SQLWithSubqueryClause with;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDescribeStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDescribeStatement.java
index 60df444966..90f065856a 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDescribeStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDescribeStatement.java
@@ -15,16 +15,16 @@
*/
package com.alibaba.druid.sql.ast.statement;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
public class SQLDescribeStatement extends SQLStatementImpl {
protected SQLName object;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropDatabaseStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropDatabaseStatement.java
index b24dc2af58..5ffe1dc9f7 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropDatabaseStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropDatabaseStatement.java
@@ -15,14 +15,14 @@
*/
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.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLDropDatabaseStatement extends SQLStatementImpl implements SQLDropStatement {
private SQLExpr database;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropEventStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropEventStatement.java
index dc765016e3..bcd95a10ac 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropEventStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropEventStatement.java
@@ -15,14 +15,14 @@
*/
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.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLDropEventStatement extends SQLStatementImpl implements SQLDropStatement {
private SQLExpr name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropIndexStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropIndexStatement.java
index fae70b2c9a..b2b517cc71 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropIndexStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropIndexStatement.java
@@ -15,15 +15,15 @@
*/
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.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLDropIndexStatement extends SQLStatementImpl implements SQLDropStatement {
private SQLName indexName;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropLogFileGroupStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropLogFileGroupStatement.java
index e7337d3b4b..8ead63b372 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropLogFileGroupStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropLogFileGroupStatement.java
@@ -15,14 +15,14 @@
*/
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.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLDropLogFileGroupStatement extends SQLStatementImpl implements SQLDropStatement {
private SQLExpr name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropMaterializedViewStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropMaterializedViewStatement.java
index ceb399949a..e607b896a0 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropMaterializedViewStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropMaterializedViewStatement.java
@@ -15,14 +15,14 @@
*/
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.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLDropMaterializedViewStatement extends SQLStatementImpl implements SQLDropStatement {
private SQLExpr name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropSequenceStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropSequenceStatement.java
index 53b6a67260..8c51f2d0fe 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropSequenceStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropSequenceStatement.java
@@ -15,15 +15,15 @@
*/
package com.alibaba.druid.sql.ast.statement;
+import java.util.ArrayList;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLDropSequenceStatement extends SQLStatementImpl implements SQLDropStatement {
private SQLName name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropServerStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropServerStatement.java
index 8f0e32e67c..0198dbbfd6 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropServerStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropServerStatement.java
@@ -15,14 +15,14 @@
*/
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.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLDropServerStatement extends SQLStatementImpl implements SQLDropStatement {
private SQLExpr name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropSynonymStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropSynonymStatement.java
index 75279c28ea..2315b83e43 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropSynonymStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropSynonymStatement.java
@@ -15,15 +15,15 @@
*/
package com.alibaba.druid.sql.ast.statement;
+import java.util.ArrayList;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLDropSynonymStatement extends SQLStatementImpl implements SQLDropStatement {
private SQLName name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableStatement.java
index 404ad12f00..354a8f44c3 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTableStatement.java
@@ -20,9 +20,7 @@ import java.util.List;
import com.alibaba.druid.sql.ast.SQLCommentHint;
import com.alibaba.druid.sql.ast.SQLName;
-import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
-import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLDropTableStatement extends SQLStatementImpl implements SQLDropStatement {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTriggerStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTriggerStatement.java
index 1af6d88cde..e47a6b1ea9 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTriggerStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTriggerStatement.java
@@ -1,5 +1,8 @@
package com.alibaba.druid.sql.ast.statement;
+import java.util.ArrayList;
+import java.util.List;
+
/*
* Copyright 1999-2018 Alibaba Group Holding Ltd.
*
@@ -20,9 +23,6 @@ import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLDropTriggerStatement extends SQLStatementImpl implements SQLDropStatement {
private SQLName name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTypeStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTypeStatement.java
index eba245e719..d284522d4f 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTypeStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropTypeStatement.java
@@ -15,14 +15,14 @@
*/
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.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLDropTypeStatement extends SQLStatementImpl implements SQLDropStatement {
private SQLExpr name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropUserStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropUserStatement.java
index 44cb2d933c..e1c2e3e481 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropUserStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropUserStatement.java
@@ -19,7 +19,6 @@ import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.ast.SQLExpr;
-import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropViewStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropViewStatement.java
index d535b2a3ad..687429f15c 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropViewStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLDropViewStatement.java
@@ -19,7 +19,6 @@ import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.ast.SQLName;
-import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprStatement.java
index fca83948bf..deae9acf73 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExprStatement.java
@@ -17,8 +17,6 @@ package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
-import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleStatementImpl;
-import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLExprStatement extends SQLStatementImpl {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExternalRecordFormat.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExternalRecordFormat.java
index a47b25a703..92920f1781 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExternalRecordFormat.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLExternalRecordFormat.java
@@ -17,8 +17,6 @@ package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLObjectImpl;
-import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObjectImpl;
-import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLExternalRecordFormat extends SQLObjectImpl {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java
index e275e1f750..af2fe4c54e 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLInsertStatement.java
@@ -19,7 +19,11 @@ import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.*;
+import com.alibaba.druid.sql.ast.SQLCommentHint;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLObjectImpl;
+import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLInsertStatement extends SQLInsertInto implements SQLStatement {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLLoopStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLLoopStatement.java
index fa3a1cf2bf..c29020d686 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLLoopStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLLoopStatement.java
@@ -18,7 +18,6 @@ package com.alibaba.druid.sql.ast.statement;
import java.util.ArrayList;
import java.util.List;
-import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLNotNullConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLNotNullConstraint.java
index 93fe1b7b96..772e33f6d9 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLNotNullConstraint.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLNotNullConstraint.java
@@ -15,11 +15,8 @@
*/
package com.alibaba.druid.sql.ast.statement;
-import com.alibaba.druid.sql.ast.SQLCommentHint;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.List;
-
public class SQLNotNullConstraint extends SQLConstraintImpl implements SQLColumnConstraint {
public SQLNotNullConstraint(){
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLOpenStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLOpenStatement.java
index e0116b049e..5a232a4a4a 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLOpenStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLOpenStatement.java
@@ -15,15 +15,15 @@
*/
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.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
/**
*
* @author zz [455910092@qq.com]
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReleaseSavePointStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReleaseSavePointStatement.java
index fb1cecdd56..1b6c14d0fc 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReleaseSavePointStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReleaseSavePointStatement.java
@@ -15,14 +15,14 @@
*/
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.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLReleaseSavePointStatement extends SQLStatementImpl {
private SQLExpr name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReplaceStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReplaceStatement.java
index 08f4a103df..3e1630278c 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReplaceStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReplaceStatement.java
@@ -15,15 +15,15 @@
*/
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.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLReplaceStatement extends SQLStatementImpl {
protected boolean lowPriority = false;
protected boolean delayed = false;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReturnStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReturnStatement.java
index 9e4adcaaa8..2caa26414f 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReturnStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLReturnStatement.java
@@ -15,14 +15,14 @@
*/
package com.alibaba.druid.sql.ast.statement;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collections;
-import java.util.List;
-
public class SQLReturnStatement extends SQLStatementImpl {
private SQLExpr expr;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRollbackStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRollbackStatement.java
index 98acac99c4..4c4b49ee8a 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRollbackStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLRollbackStatement.java
@@ -15,15 +15,15 @@
*/
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.ast.SQLName;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLRollbackStatement extends SQLStatementImpl {
private SQLName to;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSavePointStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSavePointStatement.java
index f1aa90a5bc..db1cd30eb9 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSavePointStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSavePointStatement.java
@@ -15,14 +15,14 @@
*/
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.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class SQLSavePointStatement extends SQLStatementImpl {
private SQLExpr name;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLScriptCommitStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLScriptCommitStatement.java
index 40191b8ab0..da47ae0b37 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLScriptCommitStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLScriptCommitStatement.java
@@ -16,7 +16,6 @@
package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
-import com.alibaba.druid.sql.dialect.oracle.visitor.OracleASTVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLScriptCommitStatement extends SQLStatementImpl {
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java
index 8f28cc3b32..26a43a008c 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelect.java
@@ -19,7 +19,12 @@ import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.*;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLHint;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLObjectImpl;
+import com.alibaba.druid.sql.ast.SQLOrderBy;
+import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr;
import com.alibaba.druid.sql.dialect.oracle.ast.OracleSQLObject;
import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor;
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 c4a2dcee60..852d1b3ca7 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
@@ -16,7 +16,10 @@
package com.alibaba.druid.sql.ast.statement;
import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.*;
+import com.alibaba.druid.sql.ast.SQLDataType;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLObjectImpl;
+import com.alibaba.druid.sql.ast.SQLReplaceable;
import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
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 a009cac403..477b429476 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
@@ -19,8 +19,20 @@ import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.*;
-import com.alibaba.druid.sql.ast.expr.*;
+import com.alibaba.druid.sql.ast.SQLCommentHint;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLLimit;
+import com.alibaba.druid.sql.ast.SQLObjectImpl;
+import com.alibaba.druid.sql.ast.SQLOrderBy;
+import com.alibaba.druid.sql.ast.SQLReplaceable;
+import com.alibaba.druid.sql.ast.SQLWindow;
+import com.alibaba.druid.sql.ast.expr.SQLAllColumnExpr;
+import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
+import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExprGroup;
+import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
+import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
+import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
+import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
import com.alibaba.druid.util.FnvHash;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectStatement.java
index ffce0197e2..2480670a62 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectStatement.java
@@ -15,15 +15,15 @@
*/
package com.alibaba.druid.sql.ast.statement;
+import java.util.Collections;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLCommentHint;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.Collections;
-import java.util.List;
-
public class SQLSelectStatement extends SQLStatementImpl {
protected SQLSelect select;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSetStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSetStatement.java
index 33f3ac8a02..c6d0d3633e 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSetStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSetStatement.java
@@ -18,7 +18,10 @@ package com.alibaba.druid.sql.ast.statement;
import java.util.ArrayList;
import java.util.List;
-import com.alibaba.druid.sql.ast.*;
+import com.alibaba.druid.sql.ast.SQLCommentHint;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLStartTransactionStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLStartTransactionStatement.java
index 5d529a0d38..a10b0c9c48 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLStartTransactionStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLStartTransactionStatement.java
@@ -18,9 +18,10 @@ package com.alibaba.druid.sql.ast.statement;
import java.util.Collections;
import java.util.List;
-import com.alibaba.druid.sql.ast.*;
-import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlStatementImpl;
-import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
+import com.alibaba.druid.sql.ast.SQLCommentHint;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
public class SQLStartTransactionStatement extends SQLStatementImpl {
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 f045f124c6..5e69a29af7 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
@@ -19,7 +19,6 @@ import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.ast.SQLName;
-import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraint.java
index 73906a9460..72d8a200cc 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraint.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraint.java
@@ -17,8 +17,6 @@ package com.alibaba.druid.sql.ast.statement;
import java.util.List;
-import com.alibaba.druid.sql.ast.SQLExpr;
-
public interface SQLUniqueConstraint extends SQLConstraint {
List getColumns();
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 5497074175..8c76ef23a3 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
@@ -19,7 +19,13 @@ import java.util.ArrayList;
import java.util.List;
import com.alibaba.druid.sql.SQLUtils;
-import com.alibaba.druid.sql.ast.*;
+import com.alibaba.druid.sql.ast.SQLExpr;
+import com.alibaba.druid.sql.ast.SQLHint;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLOrderBy;
+import com.alibaba.druid.sql.ast.SQLReplaceable;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExprGroup;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUseStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUseStatement.java
index 4289cc3706..be00712212 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUseStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUseStatement.java
@@ -15,15 +15,14 @@
*/
package com.alibaba.druid.sql.ast.statement;
-import com.alibaba.druid.sql.ast.SQLName;
-import com.alibaba.druid.sql.ast.SQLObject;
-import com.alibaba.druid.sql.ast.SQLStatement;
-import com.alibaba.druid.sql.ast.SQLStatementImpl;
-import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-
import java.util.Collections;
import java.util.List;
+import com.alibaba.druid.sql.ast.SQLName;
+import com.alibaba.druid.sql.ast.SQLObject;
+import com.alibaba.druid.sql.ast.SQLStatementImpl;
+import com.alibaba.druid.sql.visitor.SQLASTVisitor;
+
public class SQLUseStatement extends SQLStatementImpl {
private SQLName database;
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLValuesTableSource.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLValuesTableSource.java
index b8c9f3422f..ce7cf8a27f 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLValuesTableSource.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLValuesTableSource.java
@@ -15,14 +15,14 @@
*/
package com.alibaba.druid.sql.ast.statement;
+import java.util.ArrayList;
+import java.util.List;
+
import com.alibaba.druid.sql.ast.SQLHint;
import com.alibaba.druid.sql.ast.SQLName;
import com.alibaba.druid.sql.ast.expr.SQLListExpr;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* Created by wenshao on 23/02/2017.
*/
diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWhileStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWhileStatement.java
index 55b5918817..1937bc1b7d 100644
--- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWhileStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLWhileStatement.java
@@ -22,8 +22,6 @@ import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLObject;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.SQLStatementImpl;
-import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlStatementImpl;
-import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlASTVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
/**
diff --git a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLSelectBuilderImpl.java b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLSelectBuilderImpl.java
index bb51d43993..3a49dc48f3 100644
--- a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLSelectBuilderImpl.java
+++ b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLSelectBuilderImpl.java
@@ -23,7 +23,6 @@ import com.alibaba.druid.sql.ast.SQLOrderBy;
import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
-import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
import com.alibaba.druid.sql.ast.statement.SQLSelect;
import com.alibaba.druid.sql.ast.statement.SQLSelectGroupByClause;
@@ -33,14 +32,10 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectQuery;
import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
import com.alibaba.druid.sql.builder.SQLSelectBuilder;
-import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock;
import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock;
-import com.alibaba.druid.sql.ast.SQLLimit;
-import com.alibaba.druid.sql.dialect.odps.ast.OdpsSelectQueryBlock;
import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectQueryBlock;
import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock;
import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock;
-import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerTop;
import com.alibaba.druid.util.JdbcConstants;
public class SQLSelectBuilderImpl implements SQLSelectBuilder {
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2CreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2CreateTableStatement.java
index bae3c14206..5959189e37 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2CreateTableStatement.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/ast/stmt/DB2CreateTableStatement.java
@@ -21,9 +21,6 @@ import com.alibaba.druid.sql.dialect.db2.ast.DB2Statement;
import com.alibaba.druid.sql.dialect.db2.visitor.DB2ASTVisitor;
import com.alibaba.druid.sql.visitor.SQLASTVisitor;
-import java.util.ArrayList;
-import java.util.List;
-
public class DB2CreateTableStatement extends SQLCreateTableStatement implements DB2Statement {
private boolean dataCaptureNone;
private boolean dataCaptureChanges;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2CreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2CreateTableParser.java
index a455f63d10..5c0da12eb7 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2CreateTableParser.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2CreateTableParser.java
@@ -16,16 +16,19 @@
package com.alibaba.druid.sql.dialect.db2.parser;
import com.alibaba.druid.sql.ast.SQLName;
-import com.alibaba.druid.sql.ast.SQLPartitionBy;
import com.alibaba.druid.sql.ast.SQLPartitionByHash;
-import com.alibaba.druid.sql.ast.statement.*;
+import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
+import com.alibaba.druid.sql.ast.statement.SQLConstraint;
+import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
+import com.alibaba.druid.sql.ast.statement.SQLExprTableSource;
+import com.alibaba.druid.sql.ast.statement.SQLSelect;
+import com.alibaba.druid.sql.ast.statement.SQLTableElement;
import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2CreateTableStatement;
import com.alibaba.druid.sql.parser.ParserException;
import com.alibaba.druid.sql.parser.SQLCreateTableParser;
import com.alibaba.druid.sql.parser.SQLExprParser;
import com.alibaba.druid.sql.parser.Token;
import com.alibaba.druid.util.FnvHash;
-import com.alibaba.druid.util.JdbcConstants;
public class DB2CreateTableParser extends SQLCreateTableParser {
public DB2CreateTableParser(String sql) {
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2ExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2ExprParser.java
index 71073ecb81..5260014e06 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2ExprParser.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2ExprParser.java
@@ -15,16 +15,24 @@
*/
package com.alibaba.druid.sql.dialect.db2.parser;
+import java.util.Arrays;
+
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.SQLName;
-import com.alibaba.druid.sql.ast.expr.*;
+import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr;
+import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr;
+import com.alibaba.druid.sql.ast.expr.SQLIntervalExpr;
+import com.alibaba.druid.sql.ast.expr.SQLIntervalUnit;
+import com.alibaba.druid.sql.ast.expr.SQLSequenceExpr;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
-import com.alibaba.druid.sql.parser.*;
+import com.alibaba.druid.sql.parser.Lexer;
+import com.alibaba.druid.sql.parser.ParserException;
+import com.alibaba.druid.sql.parser.SQLExprParser;
+import com.alibaba.druid.sql.parser.SQLParserFeature;
+import com.alibaba.druid.sql.parser.Token;
import com.alibaba.druid.util.FnvHash;
import com.alibaba.druid.util.JdbcConstants;
-import java.util.Arrays;
-
public class DB2ExprParser extends SQLExprParser {
public final static String[] AGGREGATE_FUNCTIONS;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2SelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2SelectParser.java
index add6c0db2b..c9b957aa76 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2SelectParser.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2SelectParser.java
@@ -22,7 +22,11 @@ import com.alibaba.druid.sql.ast.SQLSetQuantifier;
import com.alibaba.druid.sql.ast.statement.SQLSelectQuery;
import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock;
import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock.Isolation;
-import com.alibaba.druid.sql.parser.*;
+import com.alibaba.druid.sql.parser.ParserException;
+import com.alibaba.druid.sql.parser.SQLExprParser;
+import com.alibaba.druid.sql.parser.SQLSelectListCache;
+import com.alibaba.druid.sql.parser.SQLSelectParser;
+import com.alibaba.druid.sql.parser.Token;
import com.alibaba.druid.util.JdbcConstants;
public class DB2SelectParser extends SQLSelectParser {
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParser.java
index b9a60f2799..28b647ecfb 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParser.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2StatementParser.java
@@ -23,7 +23,12 @@ import com.alibaba.druid.sql.ast.SQLStatement;
import com.alibaba.druid.sql.ast.statement.SQLAlterTableAlterColumn;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2ValuesStatement;
-import com.alibaba.druid.sql.parser.*;
+import com.alibaba.druid.sql.parser.Lexer;
+import com.alibaba.druid.sql.parser.ParserException;
+import com.alibaba.druid.sql.parser.SQLCreateTableParser;
+import com.alibaba.druid.sql.parser.SQLParserFeature;
+import com.alibaba.druid.sql.parser.SQLStatementParser;
+import com.alibaba.druid.sql.parser.Token;
import com.alibaba.druid.util.FnvHash;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitor.java
index 802f8212df..14b4cc31b3 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitor.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/visitor/DB2OutputVisitor.java
@@ -22,7 +22,6 @@ import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator;
import com.alibaba.druid.sql.ast.expr.SQLIntervalExpr;
import com.alibaba.druid.sql.ast.expr.SQLIntervalUnit;
import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition;
-import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement;
import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock;
import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2CreateTableStatement;
import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2ExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2ExprParser.java
index 7a89559445..e17683861c 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2ExprParser.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2ExprParser.java
@@ -15,13 +15,13 @@
*/
package com.alibaba.druid.sql.dialect.h2.parser;
+import java.util.Arrays;
+
import com.alibaba.druid.sql.parser.Lexer;
import com.alibaba.druid.sql.parser.SQLExprParser;
import com.alibaba.druid.sql.parser.SQLParserFeature;
import com.alibaba.druid.util.FnvHash;
-import java.util.Arrays;
-
public class H2ExprParser extends SQLExprParser {
private final static String[] AGGREGATE_FUNCTIONS;
private final static long[] AGGREGATE_FUNCTIONS_CODES;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2Lexer.java b/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2Lexer.java
index 45670cc270..c7c4ef9fe7 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2Lexer.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2Lexer.java
@@ -15,14 +15,14 @@
*/
package com.alibaba.druid.sql.dialect.h2.parser;
+import java.util.HashMap;
+import java.util.Map;
+
import com.alibaba.druid.sql.parser.Keywords;
import com.alibaba.druid.sql.parser.Lexer;
import com.alibaba.druid.sql.parser.SQLParserFeature;
import com.alibaba.druid.sql.parser.Token;
-import java.util.HashMap;
-import java.util.Map;
-
public class H2Lexer extends Lexer {
public final static Keywords DEFAULT_H2_KEYWORDS;
diff --git a/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2EvalVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2EvalVisitor.java
index 463b762a65..99f5ad5368 100644
--- a/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2EvalVisitor.java
+++ b/src/main/java/com/alibaba/druid/sql/dialect/h2/visitor/H2EvalVisitor.java
@@ -15,16 +15,27 @@
*/
package com.alibaba.druid.sql.dialect.h2.visitor;
-import com.alibaba.druid.sql.ast.expr.*;
-import com.alibaba.druid.sql.visitor.SQLEvalVisitor;
-import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils;
-import com.alibaba.druid.sql.visitor.functions.Function;
-
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+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.visitor.SQLEvalVisitor;
+import com.alibaba.druid.sql.visitor.SQLEvalVisitorUtils;
+import com.alibaba.druid.sql.visitor.functions.Function;
+
public class H2EvalVisitor extends H2ASTVisitorAdapter implements SQLEvalVisitor {
private Map functions = new HashMap();
private List