Merge branch 'master' into support_oceanbase_dbtype

This commit is contained in:
Hongwei Yi
2020-04-06 21:44:21 +08:00
committed by GitHub
17 changed files with 369 additions and 253 deletions
@@ -438,7 +438,21 @@ public final class JdbcUtils implements JdbcConstants {
} else if (rawUrl.startsWith("jdbc:hsqldb:")) {
return "org.hsqldb.jdbcDriver";
} else if (rawUrl.startsWith("jdbc:db2:")) {
return DB2_DRIVER;
// Resolve the DB2 driver from JDBC URL
// Type2 COM.ibm.db2.jdbc.app.DB2Driver, url = jdbc:db2:databasename
// Type3 COM.ibm.db2.jdbc.net.DB2Driver, url = jdbc:db2:ServerIP:6789:databasename
// Type4 8.1+ com.ibm.db2.jcc.DB2Driver, url = jdbc:db2://ServerIP:50000/databasename
String prefix = "jdbc:db2:";
if (rawUrl.startsWith(prefix + "//")) { // Type4
return DB2_DRIVER; // "com.ibm.db2.jcc.DB2Driver";
} else {
String suffix = rawUrl.substring(prefix.length());
if (suffix.indexOf(':') > 0) { // Type3
return DB2_DRIVER3; // COM.ibm.db2.jdbc.net.DB2Driver
} else { // Type2
return DB2_DRIVER2; // COM.ibm.db2.jdbc.app.DB2Driver
}
}
} else if (rawUrl.startsWith("jdbc:sqlite:")) {
return SQLITE_DRIVER;
} else if (rawUrl.startsWith("jdbc:ingres:")) {
@@ -495,7 +509,11 @@ public final class JdbcUtils implements JdbcConstants {
return JdbcConstants.CLICKHOUSE_DRIVER;
} else if(rawUrl.startsWith("jdbc:presto:")) {
return JdbcConstants.PRESTO_DRIVER;
}else {
} else if (rawUrl.startsWith("jdbc:inspur:")) {
return JdbcConstants.KDB_DRIVER;
} else if (rawUrl.startsWith("jdbc:polardb")) {
return JdbcConstants.POLARDB_DRIVER;
} else {
throw new SQLException("unknown jdbc driver : " + rawUrl);
}
}
@@ -594,6 +612,10 @@ public final class JdbcUtils implements JdbcConstants {
return CLICKHOUSE;
} else if (rawUrl.startsWith("jdbc:presto:")) {
return PRESTO;
} else if (rawUrl.startsWith("jdbc:inspur:")) {
return JdbcConstants.KDB;
} else if (rawUrl.startsWith("jdbc:polardb")) {
return POLARDB;
} else {
return null;
}