mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
druid 1.2.0, improved sql parser.
This commit is contained in:
@@ -37,9 +37,7 @@ import java.util.Properties;
|
||||
import java.util.Set;
|
||||
import java.util.concurrent.CopyOnWriteArrayList;
|
||||
import java.util.concurrent.ScheduledExecutorService;
|
||||
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;
|
||||
@@ -52,6 +50,7 @@ import javax.security.auth.callback.NameCallback;
|
||||
import javax.security.auth.callback.PasswordCallback;
|
||||
import javax.sql.DataSource;
|
||||
|
||||
import com.alibaba.druid.DbType;
|
||||
import com.alibaba.druid.DruidRuntimeException;
|
||||
import com.alibaba.druid.filter.Filter;
|
||||
import com.alibaba.druid.filter.FilterChainImpl;
|
||||
@@ -165,7 +164,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
|
||||
|
||||
protected volatile List<String> connectionInitSqls;
|
||||
|
||||
protected volatile String dbType;
|
||||
protected volatile String dbTypeName;
|
||||
|
||||
protected volatile long timeBetweenConnectErrorMillis = DEFAULT_TIME_BETWEEN_CONNECT_ERROR_MILLIS;
|
||||
|
||||
@@ -661,11 +660,19 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
|
||||
}
|
||||
|
||||
public String getDbType() {
|
||||
return dbType;
|
||||
return dbTypeName;
|
||||
}
|
||||
|
||||
public void setDbType(DbType dbType) {
|
||||
if (dbType == null) {
|
||||
this.dbTypeName = null;
|
||||
} else {
|
||||
this.dbTypeName = dbType.name();
|
||||
}
|
||||
}
|
||||
|
||||
public void setDbType(String dbType) {
|
||||
this.dbType = dbType;
|
||||
this.dbTypeName = dbType;
|
||||
}
|
||||
|
||||
public void addConnectionProperty(String name, String value) {
|
||||
@@ -859,7 +866,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
|
||||
}
|
||||
|
||||
public void setValidationQueryTimeout(int validationQueryTimeout) {
|
||||
if (validationQueryTimeout < 0 && JdbcConstants.SQL_SERVER.equals(dbType)) {
|
||||
if (validationQueryTimeout < 0 && JdbcConstants.SQL_SERVER.equals(dbTypeName)) {
|
||||
LOG.error("validationQueryTimeout should be >= 0");
|
||||
}
|
||||
this.validationQueryTimeout = validationQueryTimeout;
|
||||
@@ -1842,8 +1849,8 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
|
||||
stmt.execute(sql);
|
||||
}
|
||||
|
||||
if (JdbcConstants.MYSQL.equals(dbType)
|
||||
||JdbcConstants.ALIYUN_ADS.equals(dbType)) {
|
||||
DbType dbType = DbType.of(this.dbTypeName);
|
||||
if (dbType == DbType.mysql || dbType == DbType.ads) {
|
||||
if (variables != null) {
|
||||
ResultSet rs = null;
|
||||
try {
|
||||
@@ -2049,7 +2056,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
|
||||
if (connectionInitSqls != null) {
|
||||
to.connectionInitSqls = new ArrayList<String>(this.connectionInitSqls);
|
||||
}
|
||||
to.dbType = this.dbType;
|
||||
to.dbTypeName = this.dbTypeName;
|
||||
to.timeBetweenConnectErrorMillis = this.timeBetweenConnectErrorMillis;
|
||||
to.validConnectionChecker = this.validConnectionChecker;
|
||||
to.connectionErrorRetryAttempts = this.connectionErrorRetryAttempts;
|
||||
|
||||
Reference in New Issue
Block a user