From 8ef52029f2c0642547a9c6ce5a7208984683f2bf Mon Sep 17 00:00:00 2001 From: hongweiyi Date: Tue, 28 Jan 2020 12:03:24 +0800 Subject: [PATCH] support oceanbase dbtype Signed-off-by: hongwei yi hongweiyi@hotmail.com 1. add oceanbase/oceanbase_oracle dbtype 2. update some dbtype recognition usages --- .../alibaba/druid/pool/DruidDataSource.java | 1 + .../com/alibaba/druid/sql/PagerUtils.java | 38 +++----- .../java/com/alibaba/druid/sql/SQLUtils.java | 52 +++++------ .../druid/sql/builder/FunctionBuilder.java | 3 +- .../builder/impl/SQLDeleteBuilderImpl.java | 15 +-- .../builder/impl/SQLSelectBuilderImpl.java | 9 +- .../builder/impl/SQLUpdateBuilderImpl.java | 21 +++-- .../mysql/visitor/MySqlOutputVisitor.java | 3 +- .../druid/sql/parser/SQLParserUtils.java | 91 +++++++++---------- .../sql/repository/SchemaRepository.java | 18 ++-- .../visitor/ExportParameterVisitorUtils.java | 22 +++-- .../ParameterizedOutputVisitorUtils.java | 11 +-- .../sql/visitor/SQLEvalVisitorUtils.java | 17 +--- .../druid/sql/visitor/SchemaStatVisitor.java | 4 +- .../com/alibaba/druid/util/JdbcConstants.java | 4 +- .../com/alibaba/druid/util/JdbcUtils.java | 41 ++++++++- .../com/alibaba/druid/wall/WallFilter.java | 11 +-- .../filter/wall/WallSelectLimitTest_2.java | 9 ++ .../alibaba/druid/bvt/sql/DistinctTest.java | 4 + .../alibaba/druid/bvt/sql/MybatisTest.java | 2 + .../alibaba/druid/bvt/sql/MybatisTest2.java | 2 + .../bvt/sql/PagerUtilsTest_Count_MySql_0.java | 39 +++++++- .../sql/PagerUtilsTest_Count_Oracle_0.java | 27 ++++++ .../druid/bvt/sql/oracle/MergeTest.java | 2 + .../bvt/sql/oracle/OracleFormatTest2.java | 2 + 25 files changed, 266 insertions(+), 182 deletions(-) diff --git a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java index c2116ad0a7..5f67fa7b3d 100644 --- a/src/main/java/com/alibaba/druid/pool/DruidDataSource.java +++ b/src/main/java/com/alibaba/druid/pool/DruidDataSource.java @@ -845,6 +845,7 @@ public class DruidDataSource extends DruidAbstractDataSource implements DruidDat if (JdbcConstants.MYSQL.equals(this.dbType) || JdbcConstants.MARIADB.equals(this.dbType) + || JdbcConstants.OCEANBASE.equals(this.dbType) || JdbcConstants.ALIYUN_ADS.equals(this.dbType)) { boolean cacheServerConfigurationSet = false; if (this.connectProperties.containsKey("cacheServerConfiguration")) { diff --git a/src/main/java/com/alibaba/druid/sql/PagerUtils.java b/src/main/java/com/alibaba/druid/sql/PagerUtils.java index 02cd006be5..6ab4e73621 100644 --- a/src/main/java/com/alibaba/druid/sql/PagerUtils.java +++ b/src/main/java/com/alibaba/druid/sql/PagerUtils.java @@ -102,18 +102,18 @@ public class PagerUtils { } public static boolean limit(SQLSelect select, String dbType, int offset, int count, boolean check) { - if (JdbcConstants.ORACLE.equals(dbType)) { + if (JdbcUtils.isOracleDbType(dbType)) { return limitOracle(select, dbType, offset, count, check); } + if (JdbcUtils.isSqlserverDbType(dbType)) { + return limitSQLServer(select, dbType, offset, count, check); + } + if (JdbcConstants.DB2.equals(dbType)) { return limitDB2(select, dbType, offset, count, check); } - if (JdbcConstants.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) { - return limitSQLServer(select, dbType, offset, count, check); - } - return limitQueryBlock(select, dbType, offset, count, check); } @@ -125,13 +125,11 @@ public class PagerUtils { } SQLSelectQueryBlock queryBlock = (SQLSelectQueryBlock) query; - if (JdbcConstants.MYSQL.equals(dbType) || // - JdbcConstants.MARIADB.equals(dbType) || // - JdbcConstants.H2.equals(dbType)) { + if (JdbcUtils.isMysqlDbType(dbType)) { return limitMySqlQueryBlock(queryBlock, dbType, offset, count, check); } - if (JdbcConstants.POSTGRESQL.equals(dbType)) { + if (JdbcUtils.isPgsqlDbType(dbType)) { return limitPostgreSQLQueryBlock((PGSelectQueryBlock) queryBlock, dbType, offset, count, check); } throw new UnsupportedOperationException(); @@ -521,29 +519,19 @@ public class PagerUtils { } private static SQLSelectQueryBlock createQueryBlock(String dbType) { - if (JdbcConstants.MYSQL.equals(dbType) - || JdbcConstants.MARIADB.equals(dbType) - || JdbcConstants.ALIYUN_ADS.equals(dbType)) { + if (JdbcUtils.isPgsqlDbType(dbType)) { return new MySqlSelectQueryBlock(); } - if (JdbcConstants.MARIADB.equals(dbType)) { - return new MySqlSelectQueryBlock(); - } - - if (JdbcConstants.H2.equals(dbType)) { - return new MySqlSelectQueryBlock(); - } - - if (JdbcConstants.ORACLE.equals(dbType)) { + if (JdbcUtils.isOracleDbType(dbType)) { return new OracleSelectQueryBlock(); } - if (JdbcConstants.POSTGRESQL.equals(dbType)) { + if (JdbcUtils.isPgsqlDbType(dbType)) { return new PGSelectQueryBlock(); } - if (JdbcConstants.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) { + if (JdbcUtils.isSqlserverDbType(dbType)) { return new SQLServerSelectQueryBlock(); } @@ -640,7 +628,7 @@ public class PagerUtils { public static boolean hasUnorderedLimit(String sql, String dbType) { List stmtList = SQLUtils.parseStatements(sql, dbType); - if (JdbcConstants.MYSQL.equals(dbType)) { + if (JdbcUtils.isMysqlDbType(dbType)) { MySqlUnorderedLimitDetectVisitor visitor = new MySqlUnorderedLimitDetectVisitor(); @@ -651,7 +639,7 @@ public class PagerUtils { return visitor.unorderedLimitCount > 0; } - if (JdbcConstants.ORACLE.equals(dbType)) { + if (JdbcUtils.isOracleDbType(dbType)) { OracleUnorderedLimitDetectVisitor visitor = new OracleUnorderedLimitDetectVisitor(); diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java index 1fb6bbd08a..3f4876cbfc 100644 --- a/src/main/java/com/alibaba/druid/sql/SQLUtils.java +++ b/src/main/java/com/alibaba/druid/sql/SQLUtils.java @@ -69,13 +69,7 @@ import com.alibaba.druid.sql.visitor.SchemaStatVisitor; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; -import com.alibaba.druid.util.FnvHash; -import com.alibaba.druid.util.JdbcConstants; -import com.alibaba.druid.util.MySqlUtils; -import com.alibaba.druid.util.OracleUtils; -import com.alibaba.druid.util.PGUtils; -import com.alibaba.druid.util.StringUtils; -import com.alibaba.druid.util.Utils; +import com.alibaba.druid.util.*; public class SQLUtils { private final static SQLParserFeature[] FORMAT_DEFAULT_FEATURES = { @@ -400,7 +394,7 @@ public class SQLUtils { public static SQLASTOutputVisitor createFormatOutputVisitor(Appendable out, // List statementList, // String dbType) { - if (JdbcConstants.ORACLE.equals(dbType) || JdbcConstants.ALI_ORACLE.equals(dbType)) { + if (JdbcUtils.isOracleDbType(dbType)) { if (statementList == null || statementList.size() == 1) { return new OracleOutputVisitor(out, false); } else { @@ -408,16 +402,19 @@ public class SQLUtils { } } - if (JdbcConstants.MYSQL.equals(dbType) // - || JdbcConstants.MARIADB.equals(dbType)) { + if (JdbcConstants.H2.equals(dbType)) { + return new H2OutputVisitor(out); + } + + if (JdbcUtils.isMysqlDbType(dbType)) { return new MySqlOutputVisitor(out); } - if (JdbcConstants.POSTGRESQL.equals(dbType)) { + if (JdbcUtils.isPgsqlDbType(dbType)) { return new PGOutputVisitor(out); } - if (JdbcConstants.SQL_SERVER.equals(dbType) || JdbcConstants.JTDS.equals(dbType)) { + if (JdbcUtils.isSqlserverDbType(dbType)) { return new SQLServerOutputVisitor(out); } @@ -429,10 +426,6 @@ public class SQLUtils { return new OdpsOutputVisitor(out); } - if (JdbcConstants.H2.equals(dbType)) { - return new H2OutputVisitor(out); - } - if (JdbcConstants.HIVE.equals(dbType)) { return new HiveOutputVisitor(out); } @@ -450,20 +443,23 @@ public class SQLUtils { } public static SchemaStatVisitor createSchemaStatVisitor(String dbType) { - if (JdbcConstants.ORACLE.equals(dbType) || JdbcConstants.ALI_ORACLE.equals(dbType)) { + if (JdbcUtils.isOracleDbType(dbType)) { return new OracleSchemaStatVisitor(); } - if (JdbcConstants.MYSQL.equals(dbType) || // - JdbcConstants.MARIADB.equals(dbType)) { + if (JdbcConstants.H2.equals(dbType)) { + return new H2SchemaStatVisitor(); + } + + if (JdbcUtils.isMysqlDbType(dbType)) { return new MySqlSchemaStatVisitor(); } - if (JdbcConstants.POSTGRESQL.equals(dbType)) { + if (JdbcUtils.isPgsqlDbType(dbType)) { return new PGSchemaStatVisitor(); } - if (JdbcConstants.SQL_SERVER.equals(dbType) || JdbcConstants.JTDS.equals(dbType)) { + if (JdbcUtils.isSqlserverDbType(dbType)) { return new SQLServerSchemaStatVisitor(); } @@ -475,9 +471,6 @@ public class SQLUtils { return new OdpsSchemaStatVisitor(); } - if (JdbcConstants.H2.equals(dbType)) { - return new H2SchemaStatVisitor(); - } if (JdbcConstants.HIVE.equals(dbType)) { return new HiveSchemaStatVisitor(); @@ -543,10 +536,10 @@ public class SQLUtils { if (StringUtils.isEmpty(columnName)) return ""; if (StringUtils.isEmpty(dbType)) dbType = JdbcConstants.MYSQL; String formatMethod = ""; - if (JdbcConstants.MYSQL.equalsIgnoreCase(dbType)) { + if (JdbcUtils.isMysqlDbType(dbType)) { formatMethod = "STR_TO_DATE"; if (StringUtils.isEmpty(pattern)) pattern = "%Y-%m-%d %H:%i:%s"; - } else if (JdbcConstants.ORACLE.equalsIgnoreCase(dbType)) { + } else if (JdbcUtils.isOracleDbType(dbType)) { formatMethod = "TO_DATE"; if (StringUtils.isEmpty(pattern)) pattern = "yyyy-mm-dd hh24:mi:ss"; } else { @@ -890,16 +883,15 @@ public class SQLUtils { normalizeName = normalizeName.replaceAll("`\\.`", "."); } - if (JdbcConstants.ORACLE.equals(dbType)) { + if (JdbcUtils.isOracleDbType(dbType)) { if (OracleUtils.isKeyword(normalizeName)) { return name; } - } else if (JdbcConstants.MYSQL.equals(dbType)) { + } else if (JdbcUtils.isMysqlDbType(dbType)) { if (MySqlUtils.isKeyword(normalizeName)) { return name; } - } else if (JdbcConstants.POSTGRESQL.equals(dbType) - || JdbcConstants.ENTERPRISEDB.equals(dbType)) { + } else if (JdbcUtils.isPgsqlDbType(dbType)) { if (PGUtils.isKeyword(normalizeName)) { return name; } diff --git a/src/main/java/com/alibaba/druid/sql/builder/FunctionBuilder.java b/src/main/java/com/alibaba/druid/sql/builder/FunctionBuilder.java index 47990dbf80..8e34e1062c 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/FunctionBuilder.java +++ b/src/main/java/com/alibaba/druid/sql/builder/FunctionBuilder.java @@ -18,6 +18,7 @@ package com.alibaba.druid.sql.builder; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.expr.SQLMethodInvokeExpr; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.druid.util.JdbcUtils; /** * Created by wenshao on 09/07/2017. @@ -65,7 +66,7 @@ public class FunctionBuilder { return new SQLMethodInvokeExpr("coalesce", null, expr1, expr2); } - if (JdbcConstants.ORACLE.equals(dbType)) { + if (JdbcUtils.isOracleDbType(dbType)) { return new SQLMethodInvokeExpr("nvl", null, expr1, expr2); } diff --git a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLDeleteBuilderImpl.java b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLDeleteBuilderImpl.java index fc9e7cfaa7..8cbdd19b4e 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLDeleteBuilderImpl.java +++ b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLDeleteBuilderImpl.java @@ -29,6 +29,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlDeleteStatement; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleDeleteStatement; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGDeleteStatement; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.druid.util.JdbcUtils; public class SQLDeleteBuilderImpl implements SQLDeleteBuilder { @@ -123,16 +124,16 @@ public class SQLDeleteBuilderImpl implements SQLDeleteBuilder { } public SQLDeleteStatement createSQLDeleteStatement() { - if (JdbcConstants.ORACLE.equals(dbType)) { + if (JdbcUtils.isOracleDbType(dbType)) { return new OracleDeleteStatement(); } - - if (JdbcConstants.MYSQL.equals(dbType)) { - return new MySqlDeleteStatement(); + + if (JdbcUtils.isMysqlDbType(dbType)) { + return new MySqlDeleteStatement(); } - - if (JdbcConstants.POSTGRESQL.equals(dbType)) { - return new PGDeleteStatement(); + + if (JdbcUtils.isPgsqlDbType(dbType)) { + return new PGDeleteStatement(); } return new SQLDeleteStatement(); diff --git a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLSelectBuilderImpl.java b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLSelectBuilderImpl.java index 3a49dc48f3..802354e59a 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLSelectBuilderImpl.java +++ b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLSelectBuilderImpl.java @@ -37,6 +37,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleSelectQueryBlock; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock; import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.druid.util.JdbcUtils; public class SQLSelectBuilderImpl implements SQLSelectBuilder { @@ -239,19 +240,19 @@ public class SQLSelectBuilderImpl implements SQLSelectBuilder { } protected SQLSelectQuery createSelectQueryBlock() { - if (JdbcConstants.MYSQL.equals(dbType)) { + if (JdbcUtils.isMysqlDbType(dbType)) { return new MySqlSelectQueryBlock(); } - if (JdbcConstants.POSTGRESQL.equals(dbType)) { + if (JdbcUtils.isPgsqlDbType(dbType)) { return new PGSelectQueryBlock(); } - if (JdbcConstants.SQL_SERVER.equals(dbType)) { + if (JdbcUtils.isSqlserverDbType(dbType)) { return new SQLServerSelectQueryBlock(); } - if (JdbcConstants.ORACLE.equals(dbType)) { + if (JdbcUtils.isOracleDbType(dbType)) { return new OracleSelectQueryBlock(); } diff --git a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLUpdateBuilderImpl.java b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLUpdateBuilderImpl.java index 2e5632dd33..26b0dc81f2 100644 --- a/src/main/java/com/alibaba/druid/sql/builder/impl/SQLUpdateBuilderImpl.java +++ b/src/main/java/com/alibaba/druid/sql/builder/impl/SQLUpdateBuilderImpl.java @@ -32,6 +32,7 @@ import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleUpdateStatement; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGUpdateStatement; import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerUpdateStatement; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.druid.util.JdbcUtils; public class SQLUpdateBuilderImpl extends SQLBuilderImpl implements SQLUpdateBuilder { @@ -158,20 +159,20 @@ public class SQLUpdateBuilderImpl extends SQLBuilderImpl implements SQLUpdateBui } public SQLUpdateStatement createSQLUpdateStatement() { - if (JdbcConstants.MYSQL.equals(dbType)) { + if (JdbcUtils.isMysqlDbType(dbType)) { return new MySqlUpdateStatement(); } - - if (JdbcConstants.ORACLE.equals(dbType)) { - return new OracleUpdateStatement(); + + if (JdbcUtils.isOracleDbType(dbType)) { + return new OracleUpdateStatement(); + } + + if (JdbcUtils.isPgsqlDbType(dbType)) { + return new PGUpdateStatement(); } - if (JdbcConstants.POSTGRESQL.equals(dbType)) { - return new PGUpdateStatement(); - } - - if (JdbcConstants.SQL_SERVER.equals(dbType)) { - return new SQLServerUpdateStatement(); + if (JdbcUtils.isSqlserverDbType(dbType)) { + return new SQLServerUpdateStatement(); } return new SQLUpdateStatement(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java index e2149b9f60..1218acb11a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlOutputVisitor.java @@ -191,6 +191,7 @@ import com.alibaba.druid.sql.visitor.ExportParameterVisitorUtils; import com.alibaba.druid.sql.visitor.SQLASTOutputVisitor; import com.alibaba.druid.sql.visitor.VisitorFeature; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.druid.util.JdbcUtils; public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTVisitor { @@ -3143,7 +3144,7 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV @Override public boolean visit(SQLSetStatement x) { - boolean printSet = x.getAttribute("parser.set") == Boolean.TRUE || !JdbcConstants.ORACLE.equals(dbType); + boolean printSet = x.getAttribute("parser.set") == Boolean.TRUE || !JdbcUtils.isOracleDbType(dbType); if (printSet) { print0(ucase ? "SET " : "set "); } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java b/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java index 3d94c6e040..b93240ac63 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java @@ -26,6 +26,7 @@ import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlSelectQueryBlock; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlExprParser; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlLexer; import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.odps.ast.OdpsSelectQueryBlock; import com.alibaba.druid.sql.dialect.odps.parser.OdpsExprParser; import com.alibaba.druid.sql.dialect.odps.parser.OdpsLexer; import com.alibaba.druid.sql.dialect.odps.parser.OdpsStatementParser; @@ -36,9 +37,11 @@ import com.alibaba.druid.sql.dialect.oracle.parser.OracleStatementParser; import com.alibaba.druid.sql.dialect.phoenix.parser.PhoenixExprParser; import com.alibaba.druid.sql.dialect.phoenix.parser.PhoenixLexer; import com.alibaba.druid.sql.dialect.phoenix.parser.PhoenixStatementParser; +import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGSelectQueryBlock; import com.alibaba.druid.sql.dialect.postgresql.parser.PGExprParser; import com.alibaba.druid.sql.dialect.postgresql.parser.PGLexer; import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser; +import com.alibaba.druid.sql.dialect.sqlserver.ast.SQLServerSelectQueryBlock; import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerExprParser; import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerLexer; import com.alibaba.druid.sql.dialect.sqlserver.parser.SQLServerStatementParser; @@ -69,31 +72,26 @@ public class SQLParserUtils { } public static SQLStatementParser createSQLStatementParser(String sql, String dbType, SQLParserFeature... features) { - if (JdbcUtils.ORACLE.equals(dbType) || JdbcUtils.ALI_ORACLE.equals(dbType)) { + if (JdbcUtils.isOracleDbType(dbType)) { return new OracleStatementParser(sql); } - if (JdbcUtils.MYSQL.equals(dbType) || JdbcUtils.ALIYUN_DRDS.equals(dbType)) { - return new MySqlStatementParser(sql, features); - } - - if (JdbcUtils.MARIADB.equals(dbType)) { - return new MySqlStatementParser(sql, features); - } - - if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType)) { - return new PGSQLStatementParser(sql); - } - - if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) { - return new SQLServerStatementParser(sql); - } - if (JdbcUtils.H2.equals(dbType)) { return new H2StatementParser(sql); } - + + if (JdbcUtils.isMysqlDbType(dbType)) { + return new MySqlStatementParser(sql, features); + } + + if (JdbcUtils.isPgsqlDbType(dbType)) { + return new PGSQLStatementParser(sql); + } + + if (JdbcUtils.isSqlserverDbType(dbType)) { + return new SQLServerStatementParser(sql); + } + if (JdbcUtils.DB2.equals(dbType)) { return new DB2StatementParser(sql); } @@ -118,22 +116,19 @@ public class SQLParserUtils { } public static SQLExprParser createExprParser(String sql, String dbType) { - if (JdbcUtils.ORACLE.equals(dbType) || JdbcUtils.ALI_ORACLE.equals(dbType)) { + if (JdbcUtils.isOracleDbType(dbType)) { return new OracleExprParser(sql); } - if (JdbcUtils.MYSQL.equals(dbType) || // - JdbcUtils.MARIADB.equals(dbType) || // - JdbcUtils.H2.equals(dbType)) { + if (JdbcUtils.isMysqlDbType(dbType)) { return new MySqlExprParser(sql); } - if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType)) { + if (JdbcUtils.isPgsqlDbType(dbType)) { return new PGExprParser(sql); } - if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) { + if (JdbcUtils.isSqlserverDbType(dbType)) { return new SQLServerExprParser(sql); } @@ -153,22 +148,19 @@ public class SQLParserUtils { } public static Lexer createLexer(String sql, String dbType) { - if (JdbcUtils.ORACLE.equals(dbType) || JdbcUtils.ALI_ORACLE.equals(dbType)) { + if (JdbcUtils.isOracleDbType(dbType)) { return new OracleLexer(sql); } - if (JdbcUtils.MYSQL.equals(dbType) || // - JdbcUtils.MARIADB.equals(dbType) || // - JdbcUtils.H2.equals(dbType)) { + if (JdbcUtils.isMysqlDbType(dbType)) { return new MySqlLexer(sql); } - if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType)) { + if (JdbcUtils.isPgsqlDbType(dbType)) { return new PGLexer(sql); } - if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) { + if (JdbcUtils.isSqlserverDbType(dbType)) { return new SQLServerLexer(sql); } @@ -188,28 +180,29 @@ public class SQLParserUtils { } public static SQLSelectQueryBlock createSelectQueryBlock(String dbType) { - if (JdbcConstants.MYSQL.equals(dbType)) { - return new MySqlSelectQueryBlock(); - } - - if (JdbcConstants.ORACLE.equals(dbType)) { + if (JdbcUtils.isOracleDbType(dbType)) { return new OracleSelectQueryBlock(); } - if (JdbcConstants.DB2.equals(dbType)) { + if (JdbcUtils.isMysqlDbType(dbType)) { + return new MySqlSelectQueryBlock(); + } + + if (JdbcUtils.POSTGRESQL.equals(dbType) + || JdbcUtils.ENTERPRISEDB.equals(dbType)) { + return new PGSelectQueryBlock(); + } + + if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) { + return new SQLServerSelectQueryBlock(); + } + + if (JdbcUtils.DB2.equals(dbType)) { return new DB2SelectQueryBlock(); } - if (JdbcConstants.POSTGRESQL.equals(dbType)) { - return new DB2SelectQueryBlock(); - } - - if (JdbcConstants.ODPS.equals(dbType)) { - return new DB2SelectQueryBlock(); - } - - if (JdbcConstants.SQL_SERVER.equals(dbType)) { - return new DB2SelectQueryBlock(); + if (JdbcUtils.ODPS.equals(dbType)) { + return new OdpsSelectQueryBlock(); } return new SQLSelectQueryBlock(); diff --git a/src/main/java/com/alibaba/druid/sql/repository/SchemaRepository.java b/src/main/java/com/alibaba/druid/sql/repository/SchemaRepository.java index 340b3c6dab..15c7886dfc 100644 --- a/src/main/java/com/alibaba/druid/sql/repository/SchemaRepository.java +++ b/src/main/java/com/alibaba/druid/sql/repository/SchemaRepository.java @@ -61,6 +61,7 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitorAdapter; import com.alibaba.druid.support.logging.Log; import com.alibaba.druid.support.logging.LogFactory; import com.alibaba.druid.util.JdbcConstants; +import com.alibaba.druid.util.JdbcUtils; /** * Created by wenshao on 03/06/2017. @@ -78,9 +79,9 @@ public class SchemaRepository { public SchemaRepository(String dbType) { this.dbType = dbType; - if (JdbcConstants.MYSQL.equals(dbType)) { + if (JdbcConstants.MYSQL.equals(dbType) || JdbcConstants.OCEANBASE.equals(dbType)) { consoleVisitor = new MySqlConsoleSchemaVisitor(); - } else if (JdbcConstants.ORACLE.equals(dbType)) { + } else if (JdbcConstants.ORACLE.equals(dbType) || JdbcConstants.OCEANBASE_ORACLE.equals(dbType)) { consoleVisitor = new OracleConsoleSchemaVisitor(); } else { consoleVisitor = new DefaultConsoleSchemaVisitor(); @@ -281,21 +282,20 @@ public class SchemaRepository { int optionsValue = SchemaResolveVisitor.Option.of(options); SchemaResolveVisitor resolveVisitor; - if (JdbcConstants.MYSQL.equals(dbType) - || JdbcConstants.SQLITE.equals(dbType)) { + if (JdbcUtils.isMysqlDbType(dbType) || JdbcConstants.SQLITE.equals(dbType)) { resolveVisitor = new SchemaResolveVisitorFactory.MySqlResolveVisitor(this, optionsValue); - } else if (JdbcConstants.ORACLE.equals(dbType)) { + } else if (JdbcUtils.isOracleDbType(dbType)) { resolveVisitor = new SchemaResolveVisitorFactory.OracleResolveVisitor(this, optionsValue); + } else if (JdbcUtils.isPgsqlDbType(dbType)) { + resolveVisitor = new SchemaResolveVisitorFactory.PGResolveVisitor(this, optionsValue); + } else if (JdbcUtils.isSqlserverDbType(dbType)) { + resolveVisitor = new SchemaResolveVisitorFactory.SQLServerResolveVisitor(this, optionsValue); } else if (JdbcConstants.DB2.equals(dbType)) { resolveVisitor = new SchemaResolveVisitorFactory.DB2ResolveVisitor(this, optionsValue); } else if (JdbcConstants.ODPS.equals(dbType)) { resolveVisitor = new SchemaResolveVisitorFactory.OdpsResolveVisitor(this, optionsValue); } else if (JdbcConstants.HIVE.equals(dbType)) { resolveVisitor = new SchemaResolveVisitorFactory.HiveResolveVisitor(this, optionsValue); - } else if (JdbcConstants.POSTGRESQL.equals(dbType)) { - resolveVisitor = new SchemaResolveVisitorFactory.PGResolveVisitor(this, optionsValue); - } else if (JdbcConstants.SQL_SERVER.equals(dbType)) { - resolveVisitor = new SchemaResolveVisitorFactory.SQLServerResolveVisitor(this, optionsValue); } else { resolveVisitor = new SchemaResolveVisitorFactory.SQLResolveVisitor(this, optionsValue); } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java b/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java index d2812cfce4..7ce819a62a 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java @@ -47,12 +47,22 @@ public final class ExportParameterVisitorUtils { public static ExportParameterVisitor createExportParameterVisitor(final Appendable out ,final String dbType) { - if (JdbcUtils.MYSQL.equals(dbType)) { + if (JdbcUtils.isMysqlDbType(dbType)) { return new MySqlExportParameterVisitor(out); } - if (JdbcUtils.ORACLE.equals(dbType) || JdbcUtils.ALI_ORACLE.equals(dbType)) { + + if (JdbcUtils.isOracleDbType(dbType)) { return new OracleExportParameterVisitor(out); } + + if (JdbcUtils.isPgsqlDbType(dbType)) { + return new PGExportParameterVisitor(out); + } + + if (JdbcUtils.isSqlserverDbType(dbType)) { + return new MSSQLServerExportParameterVisitor(out); + } + if (JdbcUtils.DB2.equals(dbType)) { return new DB2ExportParameterVisitor(out); } @@ -65,14 +75,6 @@ public final class ExportParameterVisitorUtils { return new MySqlExportParameterVisitor(out); } - if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType)) { - return new PGExportParameterVisitor(out); - } - - if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) { - return new MSSQLServerExportParameterVisitor(out); - } return new ExportParameterizedOutputVisitor(out); } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java index 13f5ff3878..8b324e3389 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java @@ -265,22 +265,19 @@ public class ParameterizedOutputVisitorUtils { } public static ParameterizedVisitor createParameterizedOutputVisitor(Appendable out, String dbType) { - if (JdbcUtils.ORACLE.equals(dbType) || JdbcUtils.ALI_ORACLE.equals(dbType)) { + if (JdbcUtils.isOracleDbType(dbType)) { return new OracleParameterizedOutputVisitor(out); } - if (JdbcUtils.MYSQL.equals(dbType) - || JdbcUtils.MARIADB.equals(dbType) - || JdbcUtils.H2.equals(dbType)) { + if (JdbcUtils.isMysqlDbType(dbType)) { return new MySqlOutputVisitor(out, true); } - if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType)) { + if (JdbcUtils.isPgsqlDbType(dbType)) { return new PGOutputVisitor(out, true); } - if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) { + if (JdbcUtils.isSqlserverDbType(dbType)) { return new SQLServerOutputVisitor(out, true); } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java index 3e5c5421c8..f6badb3f3d 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java @@ -160,28 +160,19 @@ public class SQLEvalVisitorUtils { } public static SQLEvalVisitor createEvalVisitor(String dbType) { - if (JdbcUtils.MYSQL.equals(dbType)) { + if (JdbcUtils.isMysqlDbType(dbType)) { return new MySqlEvalVisitorImpl(); } - if (JdbcUtils.MARIADB.equals(dbType)) { - return new MySqlEvalVisitorImpl(); - } - - if (JdbcUtils.H2.equals(dbType)) { - return new MySqlEvalVisitorImpl(); - } - - if (JdbcUtils.ORACLE.equals(dbType) || JdbcUtils.ALI_ORACLE.equals(dbType)) { + if (JdbcUtils.isOracleDbType(dbType)) { return new OracleEvalVisitor(); } - if (JdbcConstants.POSTGRESQL.equals(dbType) - || JdbcConstants.ENTERPRISEDB.equals(dbType)) { + if (JdbcUtils.isPgsqlDbType(dbType)) { return new PGEvalVisitor(); } - if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) { + if (JdbcUtils.isSqlserverDbType(dbType)) { return new SQLServerEvalVisitor(); } diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java index 51ad560222..292704a6a1 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java @@ -539,11 +539,11 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { protected SQLASTVisitor createOrderByVisitor(SQLOrderBy x) { final SQLASTVisitor orderByVisitor; - if (JdbcConstants.MYSQL.equals(dbType)) { + if (JdbcConstants.MYSQL.equals(dbType) || JdbcConstants.OCEANBASE.equals(dbType)) { orderByVisitor = new MySqlOrderByStatVisitor(x); } else if (JdbcConstants.POSTGRESQL.equals(dbType)) { orderByVisitor = new PGOrderByStatVisitor(x); - } else if (JdbcConstants.ORACLE.equals(dbType)) { + } else if (JdbcConstants.ORACLE.equals(dbType) || JdbcConstants.OCEANBASE_ORACLE.equals(dbType)) { orderByVisitor = new OracleOrderByStatVisitor(x); } else { orderByVisitor = new OrderByStatVisitor(x); diff --git a/src/main/java/com/alibaba/druid/util/JdbcConstants.java b/src/main/java/com/alibaba/druid/util/JdbcConstants.java index 8b7757b334..789c88ceb4 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcConstants.java +++ b/src/main/java/com/alibaba/druid/util/JdbcConstants.java @@ -75,7 +75,9 @@ public interface JdbcConstants { String XUGU_DRIVER = "com.xugu.cloudjdbc.Driver"; String OCEANBASE = "oceanbase"; - String OCEANBASE_DRIVER = "com.mysql.jdbc.Driver"; + String OCEANBASE_ORACLE = "oceanbase_oracle"; + String OCEANBASE_DRIVER = "com.alipay.oceanbase.jdbc.Driver"; + String INFORMIX = "informix"; /** diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index bc8b70666b..1fc05b0677 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -417,6 +417,8 @@ public final class JdbcUtils implements JdbcConstants { return ORACLE_DRIVER; } else if (rawUrl.startsWith("jdbc:alibaba:oracle:")) { return ALI_ORACLE_DRIVER; + } else if (rawUrl.startsWith("jdbc:oceanbase:")) { + return OCEANBASE_DRIVER; } else if (rawUrl.startsWith("jdbc:microsoft:")) { return "com.microsoft.jdbc.sqlserver.SQLServerDriver"; } else if (rawUrl.startsWith("jdbc:sqlserver:")) { @@ -514,6 +516,10 @@ public final class JdbcUtils implements JdbcConstants { return ORACLE; } else if (rawUrl.startsWith("jdbc:alibaba:oracle:")) { return ALI_ORACLE; + } else if (rawUrl.startsWith("jdbc:oceanbase:")) { + return OCEANBASE; + } else if (rawUrl.startsWith("jdbc:oceanbase:oracle:")) { + return OCEANBASE_ORACLE; } else if (rawUrl.startsWith("jdbc:microsoft:") || rawUrl.startsWith("jdbc:log4jdbc:microsoft:")) { return SQL_SERVER; } else if (rawUrl.startsWith("jdbc:sqlserver:") || rawUrl.startsWith("jdbc:log4jdbc:sqlserver:")) { @@ -586,7 +592,7 @@ public final class JdbcUtils implements JdbcConstants { return ELASTIC_SEARCH; } else if (rawUrl.startsWith("jdbc:clickhouse:")) { return CLICKHOUSE; - }else if (rawUrl.startsWith("jdbc:presto:")) { + } else if (rawUrl.startsWith("jdbc:presto:")) { return PRESTO; } else { return null; @@ -826,11 +832,11 @@ public final class JdbcUtils implements JdbcConstants { } public static List showTables(Connection conn, String dbType) throws SQLException { - if (JdbcConstants.MYSQL.equals(dbType)) { + if (JdbcConstants.MYSQL.equals(dbType) || JdbcConstants.OCEANBASE.equals(dbType)) { return MySqlUtils.showTables(conn); } - if (JdbcConstants.ORACLE.equals(dbType)) { + if (JdbcConstants.ORACLE.equals(dbType) || JdbcConstants.OCEANBASE_ORACLE.equals(dbType)) { return OracleUtils.showTables(conn); } @@ -845,11 +851,11 @@ public final class JdbcUtils implements JdbcConstants { } public static String getCreateTableScript(Connection conn, String dbType, boolean sorted, boolean simplify) throws SQLException { - if (JdbcConstants.MYSQL.equals(dbType)) { + if (JdbcConstants.MYSQL.equals(dbType) || JdbcConstants.OCEANBASE.equals(dbType)) { return MySqlUtils.getCreateTableScript(conn, sorted, simplify); } - if (JdbcConstants.ORACLE.equals(dbType)) { + if (JdbcConstants.ORACLE.equals(dbType) || JdbcConstants.OCEANBASE_ORACLE.equals(dbType)) { return OracleUtils.getCreateTableScript(conn, sorted, simplify); } @@ -861,4 +867,29 @@ public final class JdbcUtils implements JdbcConstants { || driverClassName.equals(JdbcConstants.MYSQL_DRIVER_6) || driverClassName.equals(JdbcConstants.MYSQL_DRIVER_REPLICATE); } + + public static boolean isOracleDbType(String dbType) { + return JdbcUtils.ORACLE.equals(dbType) || // + JdbcUtils.OCEANBASE_ORACLE.equals(dbType) || // + JdbcUtils.ALI_ORACLE.equals(dbType); + } + + public static boolean isMysqlDbType(String dbType) { + return JdbcUtils.MYSQL.equals(dbType) || // + JdbcUtils.OCEANBASE.equals(dbType) || // + JdbcUtils.ALIYUN_DRDS.equals(dbType) || // + JdbcUtils.MARIADB.equals(dbType) || + JdbcUtils.H2.equals(dbType); // H2 SchemaStatVisitor & SQLASTOutputVisitor should specify + } + + public static boolean isPgsqlDbType(String dbType) { + return JdbcUtils.POSTGRESQL.equals(dbType) || // + JdbcUtils.ENTERPRISEDB.equals(dbType); + } + + public static boolean isSqlserverDbType(String dbType) { + return JdbcUtils.SQL_SERVER.equals(dbType) || // + JdbcUtils.JTDS.equals(dbType); + } + } diff --git a/src/main/java/com/alibaba/druid/wall/WallFilter.java b/src/main/java/com/alibaba/druid/wall/WallFilter.java index 0d0b91d532..0e5012c2c2 100644 --- a/src/main/java/com/alibaba/druid/wall/WallFilter.java +++ b/src/main/java/com/alibaba/druid/wall/WallFilter.java @@ -129,29 +129,26 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean { dbType = JdbcUtils.getDbType(dataSource.getUrl(), null); } - if (JdbcUtils.MYSQL.equals(dbType) || // - JdbcUtils.MARIADB.equals(dbType) || // - JdbcUtils.H2.equals(dbType)|| + if (JdbcUtils.isMysqlDbType(dbType) || // JdbcUtils.PRESTO.equals(dbType)) { if (config == null) { config = new WallConfig(MySqlWallProvider.DEFAULT_CONFIG_DIR); } provider = new MySqlWallProvider(config); - } else if (JdbcUtils.ORACLE.equals(dbType) || JdbcUtils.ALI_ORACLE.equals(dbType)) { + } else if (JdbcUtils.isOracleDbType(dbType)) { if (config == null) { config = new WallConfig(OracleWallProvider.DEFAULT_CONFIG_DIR); } provider = new OracleWallProvider(config); - } else if (JdbcUtils.SQL_SERVER.equals(dbType) || JdbcUtils.JTDS.equals(dbType)) { + } else if (JdbcUtils.isSqlserverDbType(dbType)) { if (config == null) { config = new WallConfig(SQLServerWallProvider.DEFAULT_CONFIG_DIR); } provider = new SQLServerWallProvider(config); - } else if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType)) { + } else if (JdbcUtils.isPgsqlDbType(dbType)) { if (config == null) { config = new WallConfig(PGWallProvider.DEFAULT_CONFIG_DIR); } diff --git a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest_2.java b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest_2.java index 3627c3cab9..7180f0eaed 100644 --- a/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest_2.java +++ b/src/test/java/com/alibaba/druid/bvt/filter/wall/WallSelectLimitTest_2.java @@ -82,5 +82,14 @@ public class WallSelectLimitTest_2 extends TestCase { assertEquals("SELECT *\n" + "FROM t\n" + "WHERE ROWNUM <= 10", resultSql); + + sql = PagerUtils.limit("select * from t", JdbcConstants.OCEANBASE_ORACLE, 0, 10); + provider = new OracleWallProvider(config); + checkResult = provider.check(sql); + resultSql = checkResult.getSql(); + System.out.println(resultSql); + assertEquals("SELECT *\n" + + "FROM t\n" + + "WHERE ROWNUM <= 10", resultSql); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java b/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java index 52a7e3220e..4cceb26b47 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/DistinctTest.java @@ -27,16 +27,20 @@ public class DistinctTest extends TestCase { public void test_mysql() throws Exception { Assert.assertEquals("SELECT count(DISTINCT *)\nFROM t", SQLUtils.format(sql, JdbcUtils.MYSQL)); + Assert.assertEquals("SELECT count(DISTINCT *)\nFROM t", SQLUtils.format(sql, JdbcUtils.OCEANBASE)); } public void test_oracle() throws Exception { Assert.assertEquals("SELECT count(DISTINCT *)\nFROM t", SQLUtils.format(sql, JdbcUtils.ORACLE)); + Assert.assertEquals("SELECT count(DISTINCT *)\nFROM t", SQLUtils.format(sql, JdbcUtils.OCEANBASE_ORACLE)); Assert.assertEquals("SELECT count(DISTINCT *)\nFROM t", SQLUtils.format(sql, JdbcUtils.ALI_ORACLE)); } public void test_oracle_unique() throws Exception { Assert.assertEquals("SELECT count(UNIQUE *)\nFROM t", SQLUtils.format("select count(unique *) from t", JdbcUtils.ORACLE)); + Assert.assertEquals("SELECT count(UNIQUE *)\nFROM t", + SQLUtils.format("select count(unique *) from t", JdbcUtils.OCEANBASE_ORACLE)); Assert.assertEquals("SELECT count(UNIQUE *)\nFROM t", SQLUtils.format("select count(unique *) from t", JdbcUtils.ALI_ORACLE)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest.java b/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest.java index 51c4ee8e84..df7259d034 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest.java @@ -28,10 +28,12 @@ public class MybatisTest extends TestCase { public void test_mysql() throws Exception { Assert.assertEquals("SELECT *\nFROM t\nWHERE id = #{id}", SQLUtils.format(sql, JdbcUtils.MYSQL)); + Assert.assertEquals("SELECT *\nFROM t\nWHERE id = #{id}", SQLUtils.format(sql, JdbcUtils.OCEANBASE)); } public void test_oracle() throws Exception { Assert.assertEquals("SELECT *\nFROM t\nWHERE id = #{id}", SQLUtils.format(sql, JdbcUtils.ORACLE)); + Assert.assertEquals("SELECT *\nFROM t\nWHERE id = #{id}", SQLUtils.format(sql, JdbcUtils.OCEANBASE_ORACLE)); Assert.assertEquals("SELECT *\nFROM t\nWHERE id = #{id}", SQLUtils.format(sql, JdbcUtils.ALI_ORACLE)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest2.java index 56ca8c7dc9..0dc95e780a 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/MybatisTest2.java @@ -27,10 +27,12 @@ public class MybatisTest2 extends TestCase { public void test_mysql() throws Exception { Assert.assertEquals("SELECT *\nFROM t\nWHERE id = ${id}", SQLUtils.format(sql, JdbcUtils.MYSQL)); + Assert.assertEquals("SELECT *\nFROM t\nWHERE id = ${id}", SQLUtils.format(sql, JdbcUtils.OCEANBASE)); } public void test_oracle() throws Exception { Assert.assertEquals("SELECT *\nFROM t\nWHERE id = ${id}", SQLUtils.format(sql, JdbcUtils.ORACLE)); + Assert.assertEquals("SELECT *\nFROM t\nWHERE id = ${id}", SQLUtils.format(sql, JdbcUtils.OCEANBASE_ORACLE)); Assert.assertEquals("SELECT *\nFROM t\nWHERE id = ${id}", SQLUtils.format(sql, JdbcUtils.ALI_ORACLE)); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_MySql_0.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_MySql_0.java index ee05bf3316..0c5edc6d28 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_MySql_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_MySql_0.java @@ -16,6 +16,9 @@ public class PagerUtilsTest_Count_MySql_0 extends TestCase { String result = PagerUtils.count(sql, JdbcConstants.MYSQL); Assert.assertEquals("SELECT COUNT(*)\n" + // "FROM t", result); + result = PagerUtils.count(sql, JdbcConstants.OCEANBASE); + Assert.assertEquals("SELECT COUNT(*)\n" + // + "FROM t", result); } public void test_mysql_1() throws Exception { @@ -23,6 +26,9 @@ public class PagerUtilsTest_Count_MySql_0 extends TestCase { String result = PagerUtils.count(sql, JdbcConstants.MYSQL); Assert.assertEquals("SELECT COUNT(*)\n" + // "FROM t", result); + result = PagerUtils.count(sql, JdbcConstants.OCEANBASE); + Assert.assertEquals("SELECT COUNT(*)\n" + // + "FROM t", result); } public void test_mysql_2() throws Exception { @@ -30,13 +36,19 @@ public class PagerUtilsTest_Count_MySql_0 extends TestCase { String result = PagerUtils.count(sql, JdbcConstants.MYSQL); Assert.assertEquals("SELECT COUNT(*)\n" + // "FROM t", result); + result = PagerUtils.count(sql, JdbcConstants.OCEANBASE); + Assert.assertEquals("SELECT COUNT(*)\n" + // + "FROM t", result); } - + public void test_mysql_3() throws Exception { String sql = "select distinct id from t order by id"; String result = PagerUtils.count(sql, JdbcConstants.MYSQL); Assert.assertEquals("SELECT COUNT(DISTINCT id)\n" + // "FROM t", result); + result = PagerUtils.count(sql, JdbcConstants.OCEANBASE); + Assert.assertEquals("SELECT COUNT(DISTINCT id)\n" + // + "FROM t", result); } public void test_mysql_4() throws Exception { @@ -44,6 +56,9 @@ public class PagerUtilsTest_Count_MySql_0 extends TestCase { String result = PagerUtils.count(sql, JdbcConstants.MYSQL); assertEquals("SELECT COUNT(DISTINCT a.col1, a.col2)\n" + "FROM test a", result); + result = PagerUtils.count(sql, JdbcConstants.OCEANBASE); + assertEquals("SELECT COUNT(DISTINCT a.col1, a.col2)\n" + + "FROM test a", result); } public void test_mysql_group_0() throws Exception { @@ -55,6 +70,14 @@ public class PagerUtilsTest_Count_MySql_0 extends TestCase { "\tFROM t\n" + "\tGROUP BY type\n" + ") ALIAS_COUNT", result); + + result = PagerUtils.count(sql, JdbcConstants.OCEANBASE); + Assert.assertEquals("SELECT COUNT(*)\n" + + "FROM (\n" + + "\tSELECT type, count(*)\n" + + "\tFROM t\n" + + "\tGROUP BY type\n" + + ") ALIAS_COUNT", result); } public void test_mysql_union_0() throws Exception { @@ -68,6 +91,15 @@ public class PagerUtilsTest_Count_MySql_0 extends TestCase { "\tSELECT id, name\n" + "\tFROM t2\n" + ") ALIAS_COUNT", result); + result = PagerUtils.count(sql, JdbcConstants.OCEANBASE); + Assert.assertEquals("SELECT COUNT(*)\n" + + "FROM (\n" + + "\tSELECT id, name\n" + + "\tFROM t1\n" + + "\tUNION\n" + + "\tSELECT id, name\n" + + "\tFROM t2\n" + + ") ALIAS_COUNT", result); } public void test_mysql_select() throws Exception { @@ -76,5 +108,10 @@ public class PagerUtilsTest_Count_MySql_0 extends TestCase { assertEquals("SELECT *\n" + "FROM t\n" + "LIMIT 10, 10", stmt.toString()); + stmt = (SQLSelectStatement) SQLUtils.parseStatements("select * from t", JdbcConstants.OCEANBASE).get(0); + PagerUtils.limit(stmt.getSelect(), stmt.getDbType(), 10, 10); + assertEquals("SELECT *\n" + + "FROM t\n" + + "LIMIT 10, 10", stmt.toString()); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_Oracle_0.java b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_Oracle_0.java index 3cf48c55b2..bee8ab6646 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_Oracle_0.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/PagerUtilsTest_Count_Oracle_0.java @@ -14,6 +14,9 @@ public class PagerUtilsTest_Count_Oracle_0 extends TestCase { String result = PagerUtils.count(sql, JdbcConstants.ORACLE); Assert.assertEquals("SELECT COUNT(*)\n" + // "FROM t", result); + result = PagerUtils.count(sql, JdbcConstants.OCEANBASE_ORACLE); + Assert.assertEquals("SELECT COUNT(*)\n" + // + "FROM t", result); } public void test_oracle_1() throws Exception { @@ -21,6 +24,9 @@ public class PagerUtilsTest_Count_Oracle_0 extends TestCase { String result = PagerUtils.count(sql, JdbcConstants.ORACLE); Assert.assertEquals("SELECT COUNT(*)\n" + // "FROM t", result); + result = PagerUtils.count(sql, JdbcConstants.OCEANBASE_ORACLE); + Assert.assertEquals("SELECT COUNT(*)\n" + // + "FROM t", result); } public void test_oracle_2() throws Exception { @@ -28,6 +34,9 @@ public class PagerUtilsTest_Count_Oracle_0 extends TestCase { String result = PagerUtils.count(sql, JdbcConstants.ORACLE); Assert.assertEquals("SELECT COUNT(*)\n" + // "FROM t", result); + result = PagerUtils.count(sql, JdbcConstants.OCEANBASE_ORACLE); + Assert.assertEquals("SELECT COUNT(*)\n" + // + "FROM t", result); } public void test_oracle_group_0() throws Exception { @@ -39,6 +48,14 @@ public class PagerUtilsTest_Count_Oracle_0 extends TestCase { "\tFROM t\n" + "\tGROUP BY type\n" + ") ALIAS_COUNT", result); + + result = PagerUtils.count(sql, JdbcConstants.OCEANBASE_ORACLE); + Assert.assertEquals("SELECT COUNT(*)\n" + + "FROM (\n" + + "\tSELECT type, count(*)\n" + + "\tFROM t\n" + + "\tGROUP BY type\n" + + ") ALIAS_COUNT", result); } public void test_oracle_union_0() throws Exception { @@ -52,5 +69,15 @@ public class PagerUtilsTest_Count_Oracle_0 extends TestCase { "\tSELECT id, name\n" + "\tFROM t2\n" + ") ALIAS_COUNT", result); + + result = PagerUtils.count(sql, JdbcConstants.OCEANBASE_ORACLE); + Assert.assertEquals("SELECT COUNT(*)\n" + + "FROM (\n" + + "\tSELECT id, name\n" + + "\tFROM t1\n" + + "\tUNION\n" + + "\tSELECT id, name\n" + + "\tFROM t2\n" + + ") ALIAS_COUNT", result); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/MergeTest.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/MergeTest.java index 0a8810c757..63a1e39296 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/MergeTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/MergeTest.java @@ -32,6 +32,7 @@ public class MergeTest extends TestCase { String sql = "{ call INTERFACE_DATA_EXTRACTION.INVOICE_INFO(?,?,?)}"; ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.ORACLE); + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.OCEANBASE_ORACLE); ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.ALI_ORACLE); } @@ -39,5 +40,6 @@ public class MergeTest extends TestCase { String sql = "{ call INTERFACE_DATA_EXTRACTION.INVOICE_INFO(?,?,?)}"; ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.MYSQL); + ParameterizedOutputVisitorUtils.parameterize(sql, JdbcUtils.OCEANBASE); } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest2.java b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest2.java index 0196858c2f..7db0012286 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest2.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/oracle/OracleFormatTest2.java @@ -27,6 +27,8 @@ public class OracleFormatTest2 extends TestCase { String formatedText = SQLUtils.format(text, JdbcUtils.ORACLE); System.out.println(formatedText); + String formatedText1 = SQLUtils.format(text, JdbcUtils.OCEANBASE_ORACLE); + System.out.println(formatedText1); String formatedText2 = SQLUtils.format(text, JdbcUtils.ALI_ORACLE); System.out.println(formatedText2); }