improve dynamic config

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

@@ -32,7 +32,7 @@ public class UnwrapTest2 extends TestCase {
         dataSource.setValidationQueryTimeout(10);
         dataSource.setQueryTimeout(100);
 
-        dataSource.setFilters("log4j");
+        dataSource.setFilters("mergeStat");
     }
 
     protected void tearDown() throws Exception {

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

@@ -0,0 +1,52 @@
+package com.alibaba.druid.bvt.pool;
+
+import java.sql.Connection;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.filter.logging.Log4jFilter;
+import com.alibaba.druid.filter.logging.LogFilter;
+import com.alibaba.druid.filter.stat.MergeStatFilter;
+import com.alibaba.druid.filter.stat.StatFilter;
+import com.alibaba.druid.pool.DruidDataSource;
+
+public class UnwrapTest_filter extends TestCase {
+
+    private DruidDataSource dataSource;
+
+    protected void setUp() throws Exception {
+
+        dataSource = new DruidDataSource();
+        dataSource.setUrl("jdbc:mock:xxx");
+        dataSource.setTestOnBorrow(true);
+        dataSource.setInitialSize(1);
+        dataSource.setValidationQuery("select 1");
+        dataSource.setValidationQueryTimeout(10);
+        dataSource.setQueryTimeout(100);
+
+        dataSource.setFilters("mergeStat,log4j");
+    }
+
+    protected void tearDown() throws Exception {
+        dataSource.close();
+    }
+
+    public void test_unwrap() throws Exception {
+        Connection conn = dataSource.getConnection();
+        conn.close();
+        
+        Assert.assertTrue(dataSource.isWrapperFor(StatFilter.class));
+        Assert.assertNotNull(dataSource.unwrap(StatFilter.class));
+        
+        Assert.assertTrue(dataSource.isWrapperFor(MergeStatFilter.class));
+        Assert.assertNotNull(dataSource.unwrap(MergeStatFilter.class));
+        
+        Assert.assertTrue(dataSource.isWrapperFor(LogFilter.class));
+        Assert.assertNotNull(dataSource.unwrap(LogFilter.class));
+        
+        Assert.assertTrue(dataSource.isWrapperFor(Log4jFilter.class));
+        Assert.assertNotNull(dataSource.unwrap(Log4jFilter.class));
+    }
+}

src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest.java

@@ -18,9 +18,11 @@ package com.alibaba.druid.bvt.pool.dynamic;
 import java.lang.reflect.Field;
 import java.sql.Connection;
 
-import junit.framework.Assert;
 import junit.framework.TestCase;
 
+import org.junit.Assert;
+
+import com.alibaba.druid.filter.stat.StatFilter;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.support.logging.Log;
 
@@ -41,8 +43,9 @@ public class ConnectPropertiesChangeTest extends TestCase {
         dataSource.setUrl("jdbc:mock:xxx");
         dataSource.setTestOnBorrow(false);
         dataSource.setConnectionProperties("a=3;b=4");
+        dataSource.setFilters("stat");
         dataSource.init();
-        
+
         Assert.assertEquals(1, dataSourceLog.getInfoCount());
     }
 
@@ -59,13 +62,37 @@ public class ConnectPropertiesChangeTest extends TestCase {
         Connection conn = dataSource.getConnection();
         conn.close();
 
+        dataSource.setConnectionProperties("a=3;b=4");
+        Assert.assertEquals(1, dataSourceLog.getInfoCount());
+
         dataSource.setConnectionProperties("b=5;c=6");
-        
         Assert.assertEquals(2, dataSourceLog.getInfoCount());
 
         Assert.assertEquals(2, dataSource.getConnectProperties().size());
 
         Assert.assertEquals("5", dataSource.getConnectProperties().getProperty("b"));
         Assert.assertEquals("6", dataSource.getConnectProperties().getProperty("c"));
+
+        StatFilter filter = dataSource.unwrap(StatFilter.class);
+        Assert.assertNotNull(filter);
+        Assert.assertFalse(filter.isMergeSql());
+
+        dataSource.setConnectionProperties("b=5;c=6;druid.stat.mergeSql=true");
+
+        Assert.assertTrue(filter.isMergeSql());
+
+        Assert.assertEquals(3, dataSource.getConnectProperties().size());
+
+        Assert.assertEquals("true", dataSource.getConnectProperties().getProperty("druid.stat.mergeSql"));
+        Assert.assertEquals("5", dataSource.getConnectProperties().getProperty("b"));
+        Assert.assertEquals("6", dataSource.getConnectProperties().getProperty("c"));
+        
+        dataSource.setConnectionProperties("b=5;c=6;druid.stat.mergeSql=false");
+
+        Assert.assertFalse(filter.isMergeSql());
+        
+        Assert.assertEquals("false", dataSource.getConnectProperties().getProperty("druid.stat.mergeSql"));
+        Assert.assertEquals("5", dataSource.getConnectProperties().getProperty("b"));
+        Assert.assertEquals("6", dataSource.getConnectProperties().getProperty("c"));
     }
 }

src/test/java/com/alibaba/druid/bvt/pool/dynamic/ConnectPropertiesChangeTest1.java

@@ -0,0 +1,81 @@
+/*
+ * 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.bvt.pool.dynamic;
+
+import java.lang.reflect.Field;
+import java.sql.Connection;
+
+import junit.framework.TestCase;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.filter.stat.StatFilter;
+import com.alibaba.druid.pool.DruidDataSource;
+import com.alibaba.druid.support.logging.Log;
+
+public class ConnectPropertiesChangeTest1 extends TestCase {
+
+    private DruidDataSource dataSource;
+
+    private Log             dataSourceLog;
+
+    protected void setUp() throws Exception {
+        Field logField = DruidDataSource.class.getDeclaredField("LOG");
+        logField.setAccessible(true);
+        dataSourceLog = (Log) logField.get(null);
+
+        dataSourceLog.resetStat();
+
+        dataSource = new DruidDataSource();
+        dataSource.setUrl("jdbc:mock:xxx");
+        dataSource.setTestOnBorrow(false);
+        dataSource.setConnectionProperties("druid.filters=stat;druid.stat.sql.MaxSize=234");
+        dataSource.init();
+
+        Assert.assertEquals(1, dataSourceLog.getInfoCount());
+    }
+
+    protected void tearDown() throws Exception {
+        dataSource.close();
+    }
+
+    public void test_connectPropertiesChange() throws Exception {
+        Assert.assertEquals(2, dataSource.getConnectProperties().size());
+
+        Connection conn = dataSource.getConnection();
+        conn.close();
+
+        StatFilter filter = dataSource.unwrap(StatFilter.class);
+        Assert.assertNotNull(filter);
+        Assert.assertFalse(filter.isMergeSql());
+        Assert.assertEquals(234, dataSource.getDataSourceStat().getMaxSqlSize());
+
+        dataSource.setConnectionProperties("druid.stat.mergeSql=true;druid.stat.sql.MaxSize=456");
+        Assert.assertEquals(456, dataSource.getDataSourceStat().getMaxSqlSize());
+        
+        Assert.assertTrue(filter.isMergeSql());
+
+        Assert.assertEquals(2, dataSource.getConnectProperties().size());
+
+        Assert.assertEquals("true", dataSource.getConnectProperties().getProperty("druid.stat.mergeSql"));
+
+        dataSource.setConnectionProperties("druid.stat.mergeSql=false");
+
+        Assert.assertFalse(filter.isMergeSql());
+
+        Assert.assertEquals("false", dataSource.getConnectProperties().getProperty("druid.stat.mergeSql"));
+    }
+}

src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_0.java

@@ -17,7 +17,7 @@ package com.alibaba.druid.bvt.sql.mysql;
 
 import java.util.List;
 
-import junit.framework.Assert;
+import org.junit.Assert;
 
 import com.alibaba.druid.sql.MysqlTest;
 import com.alibaba.druid.sql.ast.SQLStatement;

src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlSelectTest_11.java

@@ -0,0 +1,68 @@
+/*
+ * 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.bvt.sql.mysql;
+
+import java.util.List;
+
+import org.junit.Assert;
+
+import com.alibaba.druid.sql.MysqlTest;
+import com.alibaba.druid.sql.SQLUtils;
+import com.alibaba.druid.sql.ast.SQLStatement;
+import com.alibaba.druid.sql.ast.statement.SQLSelect;
+import com.alibaba.druid.sql.ast.statement.SQLSelectStatement;
+import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock;
+import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser;
+import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor;
+import com.alibaba.druid.stat.TableStat;
+
+public class MySqlSelectTest_11 extends MysqlTest {
+
+    public void test_0() throws Exception {
+        String sql = "select * from users where uid = :uid";
+
+        MySqlStatementParser parser = new MySqlStatementParser(sql);
+        List<SQLStatement> statementList = parser.parseStatementList();
+        SQLStatement stmt = statementList.get(0);
+
+        SQLSelectStatement selectStmt = (SQLSelectStatement) stmt;
+
+        SQLSelect select = selectStmt.getSelect();
+        Assert.assertNotNull(select.getQuery());
+        MySqlSelectQueryBlock queryBlock = (MySqlSelectQueryBlock) select.getQuery();
+        Assert.assertNull(queryBlock.getOrderBy());
+
+        print(statementList);
+
+        Assert.assertEquals(1, statementList.size());
+
+        MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor();
+        stmt.accept(visitor);
+
+        Assert.assertEquals(1, visitor.getTables().size());
+        Assert.assertEquals(2, visitor.getColumns().size());
+        Assert.assertEquals(1, visitor.getConditions().size());
+        Assert.assertEquals(0, visitor.getOrderByColumns().size());
+
+        Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("users")));
+
+        String output = SQLUtils.toMySqlString(stmt);
+        Assert.assertEquals("SELECT *" + //
+                            "\nFROM users" + //
+                            "\nWHERE uid = :uid", //
+                            output);
+    }
+}