From db8434dc1075d055b6dfb366ca497cefa1cf5755 Mon Sep 17 00:00:00 2001 From: wenshao Date: Tue, 25 Oct 2016 10:59:56 +0800 Subject: [PATCH] support EnterpriseDB. --- .../java/com/alibaba/druid/sql/parser/SQLParserUtils.java | 6 +++--- .../druid/sql/visitor/ExportParameterVisitorUtils.java | 2 +- .../druid/sql/visitor/ParameterizedOutputVisitorUtils.java | 3 +-- .../com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java | 2 +- src/main/java/com/alibaba/druid/util/JdbcConstants.java | 4 ++-- src/main/java/com/alibaba/druid/util/JdbcUtils.java | 4 ++-- src/main/java/com/alibaba/druid/wall/WallFilter.java | 2 +- 7 files changed, 11 insertions(+), 12 deletions(-) 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 538035fd7a..d9a128e3b1 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java @@ -54,7 +54,7 @@ public class SQLParserUtils { } if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISE_DB.equals(dbType)) { + || JdbcUtils.ENTERPRISEDB.equals(dbType)) { return new PGSQLStatementParser(sql); } @@ -93,7 +93,7 @@ public class SQLParserUtils { } if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISE_DB.equals(dbType)) { + || JdbcUtils.ENTERPRISEDB.equals(dbType)) { return new PGExprParser(sql); } @@ -128,7 +128,7 @@ public class SQLParserUtils { } if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISE_DB.equals(dbType)) { + || JdbcUtils.ENTERPRISEDB.equals(dbType)) { return new PGLexer(sql); } 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 c8e5dec624..f3faebbfd2 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java @@ -60,7 +60,7 @@ public final class ExportParameterVisitorUtils { } if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISE_DB.equals(dbType)) { + || JdbcUtils.ENTERPRISEDB.equals(dbType)) { return new PGExportParameterVisitor(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 5138ddd4e7..d265ce97bc 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java @@ -30,7 +30,6 @@ import com.alibaba.druid.sql.ast.expr.SQLIntegerExpr; import com.alibaba.druid.sql.ast.expr.SQLLiteralExpr; import com.alibaba.druid.sql.ast.expr.SQLNCharExpr; import com.alibaba.druid.sql.ast.expr.SQLNullExpr; -import com.alibaba.druid.sql.ast.expr.SQLNumberExpr; import com.alibaba.druid.sql.ast.expr.SQLVariantRefExpr; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.sql.ast.statement.SQLSelectOrderByItem; @@ -91,7 +90,7 @@ public class ParameterizedOutputVisitorUtils { } if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISE_DB.equals(dbType)) { + || JdbcUtils.ENTERPRISEDB.equals(dbType)) { return new PGOutputVisitor(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 83b32678e0..74871e6bee 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java @@ -169,7 +169,7 @@ public class SQLEvalVisitorUtils { } if (JdbcConstants.POSTGRESQL.equals(dbType) - || JdbcConstants.ENTERPRISE_DB.equals(dbType)) { + || JdbcConstants.ENTERPRISEDB.equals(dbType)) { return new PGEvalVisitor(); } diff --git a/src/main/java/com/alibaba/druid/util/JdbcConstants.java b/src/main/java/com/alibaba/druid/util/JdbcConstants.java index dfc6e0449b..dc87915e50 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcConstants.java +++ b/src/main/java/com/alibaba/druid/util/JdbcConstants.java @@ -89,6 +89,6 @@ public interface JdbcConstants { public static final String PHOENIX = "phoenix"; public static final String PHOENIX_DRIVER = "org.apache.phoenix.jdbc.PhoenixDriver"; - public static final String ENTERPRISE_DB = "edb"; - public static final String ENTERPRISE_DB_DRIVER = "com.edb.Driver"; + public static final String ENTERPRISEDB = "edb"; + public static final String ENTERPRISEDB_DRIVER = "com.edb.Driver"; } diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index e247293f11..8fb9bbf64a 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -397,7 +397,7 @@ public final class JdbcUtils implements JdbcConstants { } else if (rawUrl.startsWith("jdbc:postgresql:")) { return POSTGRESQL_DRIVER; } else if (rawUrl.startsWith("jdbc:edb:")) { - return ENTERPRISE_DB_DRIVER; + return ENTERPRISEDB_DRIVER; } else if (rawUrl.startsWith("jdbc:odps:")) { return ODPS_DRIVER; } else if (rawUrl.startsWith("jdbc:hsqldb:")) { @@ -482,7 +482,7 @@ public final class JdbcUtils implements JdbcConstants { } else if (rawUrl.startsWith("jdbc:postgresql:") || rawUrl.startsWith("jdbc:log4jdbc:postgresql:")) { return POSTGRESQL; } else if (rawUrl.startsWith("jdbc:edb:")) { - return ENTERPRISE_DB; + return ENTERPRISEDB; } else if (rawUrl.startsWith("jdbc:hsqldb:") || rawUrl.startsWith("jdbc:log4jdbc:hsqldb:")) { return HSQL; } else if (rawUrl.startsWith("jdbc:odps:")) { diff --git a/src/main/java/com/alibaba/druid/wall/WallFilter.java b/src/main/java/com/alibaba/druid/wall/WallFilter.java index 99696a896d..d545258281 100644 --- a/src/main/java/com/alibaba/druid/wall/WallFilter.java +++ b/src/main/java/com/alibaba/druid/wall/WallFilter.java @@ -145,7 +145,7 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean { provider = new SQLServerWallProvider(config); } else if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISE_DB.equals(dbType)) { + || JdbcUtils.ENTERPRISEDB.equals(dbType)) { if (config == null) { config = new WallConfig(PGWallProvider.DEFAULT_CONFIG_DIR); }