diff --git a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java
index ee1697b05e..ad04ab620b 100644
--- a/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java
+++ b/druid-spring-boot-starter/src/main/java/com/alibaba/druid/spring/boot/autoconfigure/stat/DruidSpringAopConfiguration.java
@@ -42,6 +42,7 @@ public class DruidSpringAopConfiguration {
}
@Bean
+ @ConditionalOnProperty(name = "spring.aop.auto",havingValue = "false")
public DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator() {
DefaultAdvisorAutoProxyCreator advisorAutoProxyCreator = new DefaultAdvisorAutoProxyCreator();
advisorAutoProxyCreator.setProxyTargetClass(true);
diff --git a/pom.xml b/pom.xml
index 4d4db226ae..975492683e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
jar
druid
- An JDBC datasource implementation.
+ A JDBC datasource implementation.
https://github.com/alibaba/druid
2013
diff --git a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
index ae2daeddf5..8e76d8a970 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidAbstractDataSource.java
@@ -340,7 +340,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
}
public boolean isUseUnfairLock() {
- return lock.isFair();
+ return !lock.isFair();
}
public void setUseUnfairLock(boolean useUnfairLock) {
@@ -795,7 +795,7 @@ public abstract class DruidAbstractDataSource extends WrapperAdapter implements
LOG.error("maxEvictableIdleTimeMillis should be greater than 30000");
}
- if (maxEvictableIdleTimeMillis < minEvictableIdleTimeMillis) {
+ if (inited && maxEvictableIdleTimeMillis < minEvictableIdleTimeMillis) {
throw new IllegalArgumentException("maxEvictableIdleTimeMillis must be grater than minEvictableIdleTimeMillis");
}
diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
index 5f67fa7b3d..05291f2077 100644
--- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java
@@ -884,24 +884,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
initFromSPIServiceLoader();
- if (this.driver == null) {
- if (this.driverClass == null || this.driverClass.isEmpty()) {
- this.driverClass = JdbcUtils.getDriverClassName(this.jdbcUrl);
- }
-
- if (MockDriver.class.getName().equals(driverClass)) {
- driver = MockDriver.instance;
- } else {
- if (jdbcUrl == null && (driverClass == null || driverClass.length() == 0)) {
- throw new SQLException("url not set");
- }
- driver = JdbcUtils.createDriver(driverClassLoader, driverClass);
- }
- } else {
- if (this.driverClass == null) {
- this.driverClass = driver.getClass().getName();
- }
- }
+ resolveDriver();
initCheck();
@@ -1214,6 +1197,27 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
LOG.error(errorMessage + "validationQuery not set");
}
+ protected void resolveDriver() throws SQLException {
+ if (this.driver == null) {
+ if (this.driverClass == null || this.driverClass.isEmpty()) {
+ this.driverClass = JdbcUtils.getDriverClassName(this.jdbcUrl);
+ }
+
+ if (MockDriver.class.getName().equals(driverClass)) {
+ driver = MockDriver.instance;
+ } else {
+ if (jdbcUrl == null && (driverClass == null || driverClass.length() == 0)) {
+ throw new SQLException("url not set");
+ }
+ driver = JdbcUtils.createDriver(driverClassLoader, driverClass);
+ }
+ } else {
+ if (this.driverClass == null) {
+ this.driverClass = driver.getClass().getName();
+ }
+ }
+ }
+
protected void initCheck() throws SQLException {
if (JdbcUtils.ORACLE.equals(this.dbType)) {
isOracle = true;
@@ -1317,7 +1321,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
this.validConnectionChecker = new MSSQLValidConnectionChecker();
} else if (realDriverClassName.equals(JdbcConstants.POSTGRESQL_DRIVER)
- || realDriverClassName.equals(JdbcConstants.ENTERPRISEDB_DRIVER)) {
+ || realDriverClassName.equals(JdbcConstants.ENTERPRISEDB_DRIVER)
+ || realDriverClassName.equals(JdbcConstants.POLARDB_DRIVER)) {
this.validConnectionChecker = new PGValidConnectionChecker();
}
}
@@ -1348,7 +1353,8 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
this.exceptionSorter = new SybaseExceptionSorter();
} else if (realDriverClassName.equals(JdbcConstants.POSTGRESQL_DRIVER)
- || realDriverClassName.equals(JdbcConstants.ENTERPRISEDB_DRIVER)) {
+ || realDriverClassName.equals(JdbcConstants.ENTERPRISEDB_DRIVER)
+ || realDriverClassName.equals(JdbcConstants.POLARDB_DRIVER)) {
this.exceptionSorter = new PGExceptionSorter();
} else if (realDriverClassName.equals("com.alibaba.druid.mock.MockDriver")) {
diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java
index 3f4876cbfc..616986e46a 100644
--- a/src/main/java/com/alibaba/druid/sql/SQLUtils.java
+++ b/src/main/java/com/alibaba/druid/sql/SQLUtils.java
@@ -891,7 +891,9 @@ public class SQLUtils {
if (MySqlUtils.isKeyword(normalizeName)) {
return name;
}
- } else if (JdbcUtils.isPgsqlDbType(dbType)) {
+ } else if (JdbcUtils.isPgsqlDbType(dbType)
+ || JdbcConstants.ENTERPRISEDB.equals(dbType)
+ || JdbcConstants.POLARDB.equals(dbType)) {
if (PGUtils.isKeyword(normalizeName)) {
return name;
}
diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
index 77c73d8a9e..ca6a2556d7 100644
--- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
+++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java
@@ -1585,11 +1585,7 @@ public class SQLExprParser extends SQLParser {
throw new ParserException("error, " + lexer.info());
}
- if (lexer.token == Token.LITERAL_ALIAS) {
- name = new SQLPropertyExpr(name, lexer.stringVal());
- } else {
- name = new SQLPropertyExpr(name, lexer.stringVal());
- }
+ name = new SQLPropertyExpr(name, lexer.stringVal());
lexer.nextToken();
name = nameRest(name);
}
diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java b/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java
index b93240ac63..6f119aa73c 100644
--- a/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java
+++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java
@@ -85,6 +85,8 @@ public class SQLParserUtils {
}
if (JdbcUtils.isPgsqlDbType(dbType)) {
+ || JdbcUtils.ENTERPRISEDB.equals(dbType)
+ || JdbcUtils.POLARDB.equals(dbType)) {
return new PGSQLStatementParser(sql);
}
@@ -124,7 +126,9 @@ public class SQLParserUtils {
return new MySqlExprParser(sql);
}
- if (JdbcUtils.isPgsqlDbType(dbType)) {
+ if (JdbcUtils.isPgsqlDbType(dbType)
+ || JdbcUtils.ENTERPRISEDB.equals(dbType)
+ || JdbcUtils.POLARDB.equals(dbType)) {
return new PGExprParser(sql);
}
@@ -156,7 +160,9 @@ public class SQLParserUtils {
return new MySqlLexer(sql);
}
- if (JdbcUtils.isPgsqlDbType(dbType)) {
+ if (JdbcUtils.isPgsqlDbType(dbType)
+ || JdbcUtils.ENTERPRISEDB.equals(dbType)
+ || JdbcUtils.POLARDB.equals(dbType)) {
return new PGLexer(sql);
}
diff --git a/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java b/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java
index 7ce819a62a..8d521c6725 100644
--- a/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java
+++ b/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java
@@ -1,212 +1,222 @@
-/*
- * Copyright 1999-2018 Alibaba Group Holding Ltd.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.alibaba.druid.sql.visitor;
-
-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.expr.SQLBetweenExpr;
-import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr;
-import com.alibaba.druid.sql.ast.expr.SQLBooleanExpr;
-import com.alibaba.druid.sql.ast.expr.SQLCharExpr;
-import com.alibaba.druid.sql.ast.expr.SQLDateExpr;
-import com.alibaba.druid.sql.ast.expr.SQLHexExpr;
-import com.alibaba.druid.sql.ast.expr.SQLListExpr;
-import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr;
-import com.alibaba.druid.sql.ast.expr.SQLNumericLiteralExpr;
-import com.alibaba.druid.sql.ast.expr.SQLTimestampExpr;
-import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr;
-import com.alibaba.druid.sql.dialect.db2.visitor.DB2ExportParameterVisitor;
-import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlExportParameterVisitor;
-import com.alibaba.druid.sql.dialect.oracle.visitor.OracleExportParameterVisitor;
-import com.alibaba.druid.sql.dialect.postgresql.visitor.PGExportParameterVisitor;
-import com.alibaba.druid.sql.dialect.sqlserver.visitor.MSSQLServerExportParameterVisitor;
-import com.alibaba.druid.util.JdbcUtils;
-
-public final class ExportParameterVisitorUtils {
-
- //private for util class not need new instance
- private ExportParameterVisitorUtils() {
- super();
- }
-
- public static ExportParameterVisitor createExportParameterVisitor(final Appendable out ,final String dbType) {
-
- if (JdbcUtils.isMysqlDbType(dbType)) {
- return new MySqlExportParameterVisitor(out);
- }
-
- if (JdbcUtils.isOracleDbType(dbType)) {
- return new OracleExportParameterVisitor(out);
- }
-
- if (JdbcUtils.isPgsqlDbType(dbType)) {
- return new PGExportParameterVisitor(out);
- }
-
- if (JdbcUtils.isSqlserverDbType(dbType)) {
- return new MSSQLServerExportParameterVisitor(out);
- }
-
- if (JdbcUtils.DB2.equals(dbType)) {
- return new DB2ExportParameterVisitor(out);
- }
-
- if (JdbcUtils.MARIADB.equals(dbType)) {
- return new MySqlExportParameterVisitor(out);
- }
-
- if (JdbcUtils.H2.equals(dbType)) {
- return new MySqlExportParameterVisitor(out);
- }
-
- return new ExportParameterizedOutputVisitor(out);
- }
-
-
-
- public static boolean exportParamterAndAccept(final List