prefer database type to connection for database type.

tristaZero · tristaZero · commit 52659fb9fb34 · 2018-04-23T11:56:08.000+08:00
diff --git a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/jdbc/core/datasource/ShardingDataSource.java b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/jdbc/core/datasource/ShardingDataSource.java
@@ -61,7 +61,7 @@ public ShardingDataSource(final Map<String, DataSource> dataSourceMap, final Sha
         shardingProperties = new ShardingProperties(null == props ? new Properties() : props);
         int executorSize = shardingProperties.getValue(ShardingPropertiesConstant.EXECUTOR_SIZE);
         executorEngine = new ExecutorEngine(executorSize);
-        ShardingMetaData shardingMetaData = new JDBCShardingMetaData(dataSourceMap);
+        ShardingMetaData shardingMetaData = new JDBCShardingMetaData(dataSourceMap, getDatabaseType());
         shardingMetaData.init(shardingRule);
         boolean showSQL = shardingProperties.getValue(ShardingPropertiesConstant.SQL_SHOW);
         shardingContext = new ShardingContext(dataSourceMap, shardingRule, getDatabaseType(), executorEngine, shardingMetaData, showSQL);
@@ -85,7 +85,7 @@ public void renew(final Map<String, DataSource> newDataSourceMap, final Sharding
             originalExecutorEngine.close();
         }
         boolean newShowSQL = newShardingProperties.getValue(ShardingPropertiesConstant.SQL_SHOW);
-        ShardingMetaData shardingMetaData = new JDBCShardingMetaData(newDataSourceMap);
+        ShardingMetaData shardingMetaData = new JDBCShardingMetaData(newDataSourceMap, getDatabaseType());
         shardingMetaData.init(newShardingRule);
         shardingProperties = newShardingProperties;
         shardingContext = new ShardingContext(newDataSourceMap, newShardingRule, getDatabaseType(), executorEngine, shardingMetaData, newShowSQL);
diff --git a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/jdbc/metadata/JDBCShardingMetaData.java b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/jdbc/metadata/JDBCShardingMetaData.java
@@ -17,6 +17,7 @@
 
 package io.shardingjdbc.core.jdbc.metadata;
 
+import io.shardingjdbc.core.constant.DatabaseType;
 import io.shardingjdbc.core.metadata.ColumnMetaData;
 import io.shardingjdbc.core.metadata.ShardingMetaData;
 import io.shardingjdbc.core.rule.DataNode;
@@ -38,9 +39,11 @@ public final class JDBCShardingMetaData extends ShardingMetaData {
     
     private final Map<String, DataSource> dataSourceMap;
     
+    private final DatabaseType databaseType;
+    
     @Override
     protected Collection<ColumnMetaData> getColumnMetaDataList(final DataNode dataNode) throws SQLException {
-        return ShardingMetaDataHandlerFactory.newInstance(dataSourceMap.get(dataNode.getDataSourceName()), dataNode.getTableName()).getColumnMetaDataList();
+        return ShardingMetaDataHandlerFactory.newInstance(dataSourceMap.get(dataNode.getDataSourceName()), dataNode.getTableName(), databaseType).getColumnMetaDataList();
     }
 }
 
diff --git a/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/jdbc/metadata/ShardingMetaDataHandlerFactory.java b/sharding-jdbc-core/src/main/java/io/shardingjdbc/core/jdbc/metadata/ShardingMetaDataHandlerFactory.java
@@ -24,7 +24,6 @@
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import javax.sql.DataSource;
-import java.sql.Connection;
 import java.sql.SQLException;
 
 /**
@@ -40,18 +39,16 @@ public final class ShardingMetaDataHandlerFactory {
      *
      * @param dataSource data source.
      * @param actualTableName actual table name.
+     * @param databaseType database type.
      * @return abstract table metadata handler.
      * @throws SQLException SQL exception.
      */
-    public static ShardingMetaDataHandler newInstance(final DataSource dataSource, final String actualTableName) throws SQLException {
-        try (Connection conn = dataSource.getConnection()) {
-            DatabaseType databaseType = DatabaseType.valueFrom(conn.getMetaData().getDatabaseProductName());
-            switch (databaseType) {
-                case MySQL:
-                    return new MySQLShardingMetaDataHandler(dataSource, actualTableName);
-                default:
-                    return new DefaultShardingMetaDataHandler(dataSource, actualTableName);
-            }
+    public static ShardingMetaDataHandler newInstance(final DataSource dataSource, final String actualTableName, final DatabaseType databaseType) throws SQLException {
+        switch (databaseType) {
+            case MySQL:
+                return new MySQLShardingMetaDataHandler(dataSource, actualTableName);
+            default:
+                return new DefaultShardingMetaDataHandler(dataSource, actualTableName);
         }
     }
 }
diff --git a/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/jdbc/core/connection/ShardingConnectionTest.java b/sharding-jdbc-core/src/test/java/io/shardingjdbc/core/jdbc/core/connection/ShardingConnectionTest.java
@@ -63,14 +63,14 @@ public static void init() throws SQLException {
     }
     
     @Before
-    public void setUp() {
+    public void setUp() throws SQLException {
         ShardingRuleConfiguration shardingRuleConfig = new ShardingRuleConfiguration();
         TableRuleConfiguration tableRuleConfig = new TableRuleConfiguration();
         tableRuleConfig.setLogicTable("test");
         shardingRuleConfig.getTableRuleConfigs().add(tableRuleConfig);
         Map<String, DataSource> dataSourceMap = new HashMap<>(1, 1);
         dataSourceMap.put(DS_NAME, masterSlaveDataSource);
-        ShardingMetaData shardingMetaData = new JDBCShardingMetaData(dataSourceMap);
+        ShardingMetaData shardingMetaData = new JDBCShardingMetaData(dataSourceMap, null);
         ShardingContext shardingContext = new ShardingContext(dataSourceMap, new ShardingRule(shardingRuleConfig, dataSourceMap.keySet()), null, null, shardingMetaData, false);
         connection = new ShardingConnection(shardingContext);
     }
