From 570bd6e009f55b26da89d816be1e7d849ae350d0 Mon Sep 17 00:00:00 2001 From: wenshao Date: Tue, 2 Jun 2015 09:29:03 +0800 Subject: [PATCH] bug fixed for postgresql wall --- src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java | 3 ++- .../java/com/alibaba/druid/bvt/sql/postgresql/PGShowTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java index 483d32b75e..cbe0820d37 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java @@ -115,6 +115,7 @@ import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleCreateSequenceStatement; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleMergeStatement; import com.alibaba.druid.sql.dialect.oracle.ast.stmt.OracleMultiInsertStatement; +import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGShowStatement; import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerCommitStatement; import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerExecStatement; import com.alibaba.druid.sql.dialect.sqlserver.ast.stmt.SQLServerInsertStatement; @@ -2452,7 +2453,7 @@ public class WallVisitorUtils { allow = config.isDescribeAllow(); denyMessage = "describe not allow"; errorCode = ErrorCode.DESC_NOT_ALLOW; - } else if (x instanceof MySqlShowStatement) { + } else if (x instanceof MySqlShowStatement || x instanceof PGShowStatement) { allow = config.isShowAllow(); denyMessage = "show not allow"; errorCode = ErrorCode.SHOW_NOT_ALLOW; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGShowTest.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGShowTest.java index b0a90dc8c5..4512f4ebc2 100644 --- a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGShowTest.java +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGShowTest.java @@ -46,7 +46,7 @@ public class PGShowTest extends PGTest { { WallProvider provider = new PGWallProvider(); - provider.check(sql); + Assert.assertTrue(provider.checkValid(sql)); } // Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("reviews")));