From 19c771bcd6408108db6217c4013a2f2505df6776 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Fri, 6 May 2016 16:17:18 +0800 Subject: [PATCH 1/2] removed sysout --- .../bvt/sql/odps/OdpsMultiInsertTest.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest.java b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest.java index 8d49c4f472..47f5a9012c 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/odps/OdpsMultiInsertTest.java @@ -41,7 +41,7 @@ public class OdpsMultiInsertTest extends TestCase { } public void exec_test(String resource) throws Exception { - System.out.println(resource); +// System.out.println(resource); InputStream is = null; is = Thread.currentThread().getContextClassLoader().getResourceAsStream(resource); @@ -61,13 +61,13 @@ public class OdpsMultiInsertTest extends TestCase { SchemaStatVisitor visitor = new OdpsSchemaStatVisitor(); stmt.accept(visitor); - System.out.println(sql); - System.out.println("Tables : " + visitor.getTables()); - System.out.println("fields : " + visitor.getColumns()); - - System.out.println(); - System.out.println("---------------------------"); - System.out.println(SQLUtils.toOdpsString(stmt)); +// System.out.println(sql); +// System.out.println("Tables : " + visitor.getTables()); +// System.out.println("fields : " + visitor.getColumns()); +// +// System.out.println(); +// System.out.println("---------------------------"); +// System.out.println(SQLUtils.toOdpsString(stmt)); } void mergValidate(String sql, String expect) { @@ -82,7 +82,7 @@ public class OdpsMultiInsertTest extends TestCase { MySqlParameterizedOutputVisitor visitor = new MySqlParameterizedOutputVisitor(out); statemen.accept(visitor); - System.out.println(out.toString()); +// System.out.println(out.toString()); Assert.assertEquals(expect, out.toString()); } From 8cdad2dad063edd3ac2fd88e5915f3797b68bde7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Fri, 6 May 2016 16:34:07 +0800 Subject: [PATCH 2/2] bug fixed filter.int dbType is null, for issue 1193. https://github.com/alibaba/druid/issues/1193 --- src/main/java/com/alibaba/druid/pool/DruidDataSource.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index 75fb862de8..8c664106cc 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -590,15 +590,15 @@ public class DruidDataSource extends DruidAbstractDataSource this.jdbcUrl = this.jdbcUrl.trim(); initFromWrapDriverUrl(); } + + for (Filter filter : filters) { + filter.init(this); + } if (this.dbType == null || this.dbType.length() == 0) { this.dbType = JdbcUtils.getDbType(jdbcUrl, null); } - for (Filter filter : filters) { - filter.init(this); - } - if (JdbcConstants.MYSQL.equals(this.dbType) || // JdbcConstants.MARIADB.equals(this.dbType)) { boolean cacheServerConfigurationSet = false;