Alawn/Druid
1
0
Fork 0
mirror of https://github.com/alibaba/druid.git synced 2023-03-04 19:17:16 +00:00
Code Issues Releases Wiki Activity

Merge pull request #475 from cutedemons/master

Browse Source 
improve sql wall & fix datasource bug
This commit is contained in:
cutedemons
2013-11-25 18:37:24 -08:00
parent 188ff784b4 dee930814f
commit 24382e7465
3 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pom.xml
+1 -1
View File
@@ -11,7 +11,7 @@
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
<packaging>jar</packaging>
<name>druid</name>
src/main/java/com/alibaba/druid/pool/DruidDataSource.java
+1 -1
View File
@@ -1065,7 +1065,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
String errorMessage = buf.toString();
if (this.createError == null) {
if (this.createError != null) {
throw new GetConnectionTimeoutException(errorMessage, createError);
} else {
throw new GetConnectionTimeoutException(errorMessage);
src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java
+8
View File
@@ -794,6 +794,14 @@ public class WallVisitorUtils {
return false;
}
if (parent instanceof SQLJoinTableSource) {
SQLJoinTableSource joinTableSource = (SQLJoinTableSource) parent;
if (joinTableSource.getCondition() == x) {
return true;
}
}
if (parent instanceof SQLUnionQuery) {
SQLUnionQuery union = (SQLUnionQuery) parent;
if (union.getRight() == x && hasWhere(union.getLeft())) {