Merge pull request #214 from wenshao/master

hibernate支持和validationQuery合法性检测

pom.xml

@@ -514,7 +514,7 @@
 			<groupId>org.hibernate</groupId>
 			<artifactId>hibernate-core</artifactId>
 			<version>4.1.8.Final</version>
-			<scope>test</scope>
+			<scope>provided</scope>
 		</dependency>
 
 		<dependency>

src/main/java/com/alibaba/druid/pool/DruidDataSource.java

@@ -63,6 +63,12 @@ import com.alibaba.druid.pool.vendor.SybaseExceptionSorter;
 import com.alibaba.druid.proxy.DruidDriver;
 import com.alibaba.druid.proxy.jdbc.DataSourceProxyConfig;
 import com.alibaba.druid.proxy.jdbc.TransactionInfo;
+import com.alibaba.druid.sql.ast.SQLStatement;
+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.parser.SQLParserUtils;
+import com.alibaba.druid.sql.parser.SQLStatementParser;
 import com.alibaba.druid.stat.DruidDataSourceStatManager;
 import com.alibaba.druid.stat.JdbcDataSourceStat;
 import com.alibaba.druid.stat.JdbcSqlStat;
@@ -336,7 +342,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             this.id = DruidDriver.createDataSourceId();
 
             loadFilterFromSystemProperty();
-            
+
             if (this.dbType == null || this.dbType.length() == 0) {
                 this.dbType = JdbcUtils.getDbType(jdbcUrl, null);
             }
@@ -576,12 +582,74 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
             if (driver.getMajorVersion() == 10 && isUseOracleImplicitCache()) {
                 this.getConnectProperties().setProperty("oracle.jdbc.FreeMemoryOnEnterImplicitCache", "true");
             }
+
+            oracleValidationQueryCheck();
         } else if (JdbcUtils.MYSQL.equals(this.dbType)) {
             if (!this.isTestWhileIdle()) {
                 if (LOG.isWarnEnabled()) {
                     LOG.warn("Your dbType is mysql, recommend set testWhileIdle is true");
                 }
             }
+        } else if (JdbcUtils.DB2.equals(dbType)) {
+            db2ValidationQueryCheck();
+        }
+    }
+
+    private void oracleValidationQueryCheck() {
+        if (validationQuery == null) {
+            return;
+        }
+        if (validationQuery.length() == 0) {
+            return;
+        }
+
+        SQLStatementParser sqlStmtParser = SQLParserUtils.createSQLStatementParser(validationQuery, this.dbType);
+        List<SQLStatement> stmtList = sqlStmtParser.parseStatementList();
+
+        if (stmtList.size() != 1) {
+            return;
+        }
+
+        SQLStatement stmt = stmtList.get(0);
+        if (!(stmt instanceof SQLSelectStatement)) {
+            return;
+        }
+
+        SQLSelectQuery query = ((SQLSelectStatement) stmt).getSelect().getQuery();
+        if (query instanceof SQLSelectQueryBlock) {
+            if (((SQLSelectQueryBlock) query).getFrom() == null) {
+                LOG.error("invalid oracle validationQuery. " + validationQuery + ", may should be : " + validationQuery
+                          + " FROM DUAL");
+            }
+        }
+    }
+
+    private void db2ValidationQueryCheck() {
+        if (validationQuery == null) {
+            return;
+        }
+        if (validationQuery.length() == 0) {
+            return;
+        }
+
+        SQLStatementParser sqlStmtParser = SQLParserUtils.createSQLStatementParser(validationQuery, this.dbType);
+        List<SQLStatement> stmtList = sqlStmtParser.parseStatementList();
+
+        if (stmtList.size() != 1) {
+            return;
+        }
+
+        SQLStatement stmt = stmtList.get(0);
+        if (!(stmt instanceof SQLSelectStatement)) {
+            return;
+        }
+
+        SQLSelectQuery query = ((SQLSelectStatement) stmt).getSelect().getQuery();
+        if (query instanceof SQLSelectQueryBlock) {
+            if (((SQLSelectQueryBlock) query).getFrom() == null) {
+                LOG.error("invalid db2 validationQuery. " + validationQuery + ", may should be : " + validationQuery
+                          + " FROM SYSDUMMY");
+            }
         }
     }
 
@@ -710,7 +778,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat
         try {
             activeCount--;
             discardCount++;
-            
+
             if (activeCount <= 0) {
                 empty.signal();
             }

src/main/java/com/alibaba/druid/support/hibernate/DruidConnectionProvider.java

@@ -1,3 +1,18 @@
+/*
+ * Copyright 1999-2011 Alibaba Group Holding Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 package com.alibaba.druid.support.hibernate;
 
 import java.sql.Connection;

src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogDB2Test.java

@@ -0,0 +1,47 @@
+package com.alibaba.druid.bvt.pool;
+
+import java.lang.reflect.Field;
+import java.sql.Connection;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.alibaba.druid.mock.MockDriver;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.support.logging.Log;
+import com.alibaba.druid.util.JdbcConstants;
+
+public class ValidationQueryLogDB2Test extends TestCase {
+
+    private DruidDataSource dataSource;
+
+    protected void setUp() throws Exception {
+        dataSource = new DruidDataSource();
+        dataSource.setUrl("jdbc:mock:xxx");
+        dataSource.setDbType(JdbcConstants.DB2);
+        dataSource.setDriver(new MockDriver() {
+            public int getMajorVersion() {
+                return 10;
+            }
+        });
+        dataSource.setValidationQuery("SELECT 'x'");
+    }
+
+    protected void tearDown() throws Exception {
+        dataSource.close();
+    }
+
+    public void test_oracle() throws Exception {
+        Field field = DruidDataSource.class.getDeclaredField("LOG");
+        field.setAccessible(true);
+        Log log = (Log) field.get(null);
+        log.resetStat();
+        
+        Connection conn = dataSource.getConnection();
+        
+        conn.close();
+        
+        
+        Assert.assertEquals(1, log.getErrorCount());
+    }
+}

src/test/java/com/alibaba/druid/bvt/pool/ValidationQueryLogTest.java

@@ -0,0 +1,46 @@
+package com.alibaba.druid.bvt.pool;
+
+import java.lang.reflect.Field;
+import java.sql.Connection;
+
+import junit.framework.Assert;
+import junit.framework.TestCase;
+
+import com.alibaba.druid.mock.MockDriver;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.support.logging.Log;
+import com.alibaba.druid.util.JdbcConstants;
+
+public class ValidationQueryLogTest extends TestCase {
+
+    private DruidDataSource dataSource;
+
+    protected void setUp() throws Exception {
+        dataSource = new DruidDataSource();
+        dataSource.setUrl("jdbc:mock:xxx");
+        dataSource.setDbType(JdbcConstants.ORACLE);
+        dataSource.setDriver(new MockDriver() {
+            public int getMajorVersion() {
+                return 10;
+            }
+        });
+        dataSource.setValidationQuery("SELECT 'x'");
+    }
+
+    protected void tearDown() throws Exception {
+        dataSource.close();
+    }
+
+    public void test_oracle() throws Exception {
+        Field field = DruidDataSource.class.getDeclaredField("LOG");
+        field.setAccessible(true);
+        Log log = (Log) field.get(null);
+        log.resetStat();
+        
+        Connection conn = dataSource.getConnection();
+        
+        conn.close();
+        
+        Assert.assertEquals(1, log.getErrorCount());
+    }
+}