fix #88

apache · May 31, 2016 · 7ecbd2a · 7ecbd2a
1 parent c08be4c
commit 7ecbd2a
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/...ing-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/constants/DatabaseType.java b/...ing-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/constants/DatabaseType.java
@@ -26,7 +26,7 @@
  */
 public enum DatabaseType {
 
-    H2, MySQL, Oracle, SQLServer, DB2;
+    H2, MySQL, Oracle, SQLServer, DB2, PostgreSQL;
 
     /**
      * 获取数据库类型枚举.

diff --git a/...ng-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingDataSource.java b/...ng-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/ShardingDataSource.java
@@ -66,7 +66,7 @@ private String getDatabaseProductName(final ShardingRule shardingRule) throws SQ
                 databaseProductName = ((MasterSlaveDataSource) each).getDatabaseProductName();
             } else {
                 try (Connection connection = each.getConnection()) {
-                    databaseProductName = connection.getMetaData().getDatabaseProductName();    
+                    databaseProductName = connection.getMetaData().getDatabaseProductName();
                 }
             }
             Preconditions.checkState(null == result || result.equals(databaseProductName), String.format("Database type inconsistent with '%s' and '%s'", result, databaseProductName));

diff --git a/...-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/SQLVisitorRegistry.java b/...-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/parser/SQLVisitorRegistry.java
@@ -57,25 +57,41 @@ public final class SQLVisitorRegistry {
     private static void registerSelectVistor() {
         SELECT_REGISTRY.put(DatabaseType.H2, MySQLSelectVisitor.class);
         SELECT_REGISTRY.put(DatabaseType.MySQL, MySQLSelectVisitor.class);
-        // TODO 其他数据库
+        // TODO 其他数据库先使用MySQL, 只能使用标准SQL
+        SELECT_REGISTRY.put(DatabaseType.Oracle, MySQLSelectVisitor.class);
+        SELECT_REGISTRY.put(DatabaseType.SQLServer, MySQLSelectVisitor.class);
+        SELECT_REGISTRY.put(DatabaseType.DB2, MySQLSelectVisitor.class);
+        SELECT_REGISTRY.put(DatabaseType.PostgreSQL, MySQLSelectVisitor.class);
     }
 
     private static void registerInsertVistor() {
         INSERT_REGISTRY.put(DatabaseType.H2, MySQLInsertVisitor.class);
         INSERT_REGISTRY.put(DatabaseType.MySQL, MySQLInsertVisitor.class);
-        // TODO 其他数据库
+        // TODO 其他数据库先使用MySQL, 只能使用标准SQL
+        INSERT_REGISTRY.put(DatabaseType.Oracle, MySQLInsertVisitor.class);
+        INSERT_REGISTRY.put(DatabaseType.SQLServer, MySQLInsertVisitor.class);
+        INSERT_REGISTRY.put(DatabaseType.DB2, MySQLInsertVisitor.class);
+        INSERT_REGISTRY.put(DatabaseType.PostgreSQL, MySQLInsertVisitor.class);
     }
 
     private static void registerUpdateVistor() {
         UPDATE_REGISTRY.put(DatabaseType.H2, MySQLUpdateVisitor.class);
         UPDATE_REGISTRY.put(DatabaseType.MySQL, MySQLUpdateVisitor.class);
-        // TODO 其他数据库
+        // TODO 其他数据库先使用MySQL, 只能使用标准SQL
+        INSERT_REGISTRY.put(DatabaseType.Oracle, MySQLUpdateVisitor.class);
+        INSERT_REGISTRY.put(DatabaseType.SQLServer, MySQLUpdateVisitor.class);
+        INSERT_REGISTRY.put(DatabaseType.DB2, MySQLUpdateVisitor.class);
+        INSERT_REGISTRY.put(DatabaseType.PostgreSQL, MySQLUpdateVisitor.class);
     }
 
     private static void registerDeleteVistor() {
         DELETE_REGISTRY.put(DatabaseType.H2, MySQLDeleteVisitor.class);
         DELETE_REGISTRY.put(DatabaseType.MySQL, MySQLDeleteVisitor.class);
-        // TODO 其他数据库
+        // TODO 其他数据库先使用MySQL, 只能使用标准SQL
+        INSERT_REGISTRY.put(DatabaseType.Oracle, MySQLDeleteVisitor.class);
+        INSERT_REGISTRY.put(DatabaseType.SQLServer, MySQLDeleteVisitor.class);
+        INSERT_REGISTRY.put(DatabaseType.DB2, MySQLDeleteVisitor.class);
+        INSERT_REGISTRY.put(DatabaseType.PostgreSQL, MySQLDeleteVisitor.class);
     }
 
     /**

diff --git a/sharding-jdbc-doc/content/post/release_notes.md b/sharding-jdbc-doc/content/post/release_notes.md
@@ -15,6 +15,7 @@ weight = 1
 ### 功能提升
 
 1. [ISSUE #82](https://github.com/dangdangdotcom/sharding-jdbc/issues/82) TableRule可传入dataSourceName属性，用于指定该TableRule对应的数据源
+1. [ISSUE #88](https://github.com/dangdangdotcom/sharding-jdbc/issues/88) 放开对其他数据库的限制，可支持标准SQL, 对个性化分页等语句不支持
 
 ### 缺陷修正