From a99b7373b99146dc5650fd92f61dd040640d6200 Mon Sep 17 00:00:00 2001 From: ldming Date: Tue, 1 Sep 2020 12:28:48 +0800 Subject: [PATCH] Use isPgsqlDbType to check all pg-like database --- src/main/java/com/alibaba/druid/sql/SQLUtils.java | 4 +--- .../alibaba/druid/sql/parser/SQLParserUtils.java | 15 ++++----------- .../sql/visitor/ExportParameterVisitorUtils.java | 4 +--- .../visitor/ParameterizedOutputVisitorUtils.java | 4 +--- .../druid/sql/visitor/SQLEvalVisitorUtils.java | 4 +--- .../java/com/alibaba/druid/util/JdbcUtils.java | 3 ++- .../java/com/alibaba/druid/wall/WallFilter.java | 4 +--- 7 files changed, 11 insertions(+), 27 deletions(-) diff --git a/src/main/java/com/alibaba/druid/sql/SQLUtils.java b/src/main/java/com/alibaba/druid/sql/SQLUtils.java index 616986e46a..3f4876cbfc 100644 --- a/src/main/java/com/alibaba/druid/sql/SQLUtils.java +++ b/src/main/java/com/alibaba/druid/sql/SQLUtils.java @@ -891,9 +891,7 @@ public class SQLUtils { if (MySqlUtils.isKeyword(normalizeName)) { return name; } - } else if (JdbcUtils.isPgsqlDbType(dbType) - || JdbcConstants.ENTERPRISEDB.equals(dbType) - || JdbcConstants.POLARDB.equals(dbType)) { + } else if (JdbcUtils.isPgsqlDbType(dbType)) { if (PGUtils.isKeyword(normalizeName)) { return name; } 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 bc7352a771..7a33bcb252 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParserUtils.java @@ -84,9 +84,7 @@ public class SQLParserUtils { return new MySqlStatementParser(sql, features); } - if (JdbcUtils.isPgsqlDbType(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType) - || JdbcUtils.POLARDB.equals(dbType)) { + if (JdbcUtils.isPgsqlDbType(dbType)) { return new PGSQLStatementParser(sql); } @@ -126,9 +124,7 @@ public class SQLParserUtils { return new MySqlExprParser(sql); } - if (JdbcUtils.isPgsqlDbType(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType) - || JdbcUtils.POLARDB.equals(dbType)) { + if (JdbcUtils.isPgsqlDbType(dbType)) { return new PGExprParser(sql); } @@ -160,9 +156,7 @@ public class SQLParserUtils { return new MySqlLexer(sql); } - if (JdbcUtils.isPgsqlDbType(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType) - || JdbcUtils.POLARDB.equals(dbType)) { + if (JdbcUtils.isPgsqlDbType(dbType)) { return new PGLexer(sql); } @@ -194,8 +188,7 @@ public class SQLParserUtils { return new MySqlSelectQueryBlock(); } - if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType)) { + if (JdbcUtils.isPgsqlDbType(dbType)) { return new PGSelectQueryBlock(); } 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 09a02fe779..dcb357b543 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ExportParameterVisitorUtils.java @@ -75,9 +75,7 @@ public final class ExportParameterVisitorUtils { return new MySqlExportParameterVisitor(out); } - if (JdbcUtils.POSTGRESQL.equals(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType) - || JdbcUtils.POLARDB.equals(dbType)) { + if (JdbcUtils.POSTGRESQL.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 09e5871598..3dfc7d7b06 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/ParameterizedOutputVisitorUtils.java @@ -274,9 +274,7 @@ public class ParameterizedOutputVisitorUtils { } - if (JdbcUtils.isPgsqlDbType(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType) - || JdbcUtils.POLARDB.equals(dbType)) { + if (JdbcUtils.isPgsqlDbType(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 3c3167aa88..f6badb3f3d 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLEvalVisitorUtils.java @@ -168,9 +168,7 @@ public class SQLEvalVisitorUtils { return new OracleEvalVisitor(); } - if (JdbcUtils.isPgsqlDbType(dbType) - || JdbcConstants.ENTERPRISEDB.equals(dbType) - || JdbcConstants.POLARDB.equals(dbType)) { + if (JdbcUtils.isPgsqlDbType(dbType)) { return new PGEvalVisitor(); } diff --git a/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/src/main/java/com/alibaba/druid/util/JdbcUtils.java index 6b5b866f88..d1e9e8a2de 100644 --- a/src/main/java/com/alibaba/druid/util/JdbcUtils.java +++ b/src/main/java/com/alibaba/druid/util/JdbcUtils.java @@ -906,7 +906,8 @@ public final class JdbcUtils implements JdbcConstants { public static boolean isPgsqlDbType(String dbType) { return JdbcUtils.POSTGRESQL.equals(dbType) || // - JdbcUtils.ENTERPRISEDB.equals(dbType); + JdbcUtils.ENTERPRISEDB.equals(dbType) || // + JdbcUtils.POLARDB.equals(dbType); } public static boolean isSqlserverDbType(String dbType) { diff --git a/src/main/java/com/alibaba/druid/wall/WallFilter.java b/src/main/java/com/alibaba/druid/wall/WallFilter.java index a7c3da5a0b..0e5012c2c2 100644 --- a/src/main/java/com/alibaba/druid/wall/WallFilter.java +++ b/src/main/java/com/alibaba/druid/wall/WallFilter.java @@ -148,9 +148,7 @@ public class WallFilter extends FilterAdapter implements WallFilterMBean { } provider = new SQLServerWallProvider(config); - } else if (JdbcUtils.isPgsqlDbType(dbType) - || JdbcUtils.ENTERPRISEDB.equals(dbType) - || JdbcUtils.POLARDB.equals(dbType)) { + } else if (JdbcUtils.isPgsqlDbType(dbType)) { if (config == null) { config = new WallConfig(PGWallProvider.DEFAULT_CONFIG_DIR); }