From bde7e610992e5cdee2a6d21a56b4b0d37ec65eea Mon Sep 17 00:00:00 2001 From: wenshao Date: Thu, 30 Oct 2014 23:39:56 +0800 Subject: [PATCH] improve pg sql parser --- .../druid/sql/ast/expr/SQLBinaryOperator.java | 4 +- .../druid/sql/ast/expr/SQLCastExpr.java | 4 +- .../postgresql/ast/expr/PGExprImpl.java | 18 ++++++ .../postgresql/ast/expr/PGTypeCastExpr.java | 23 ++++++++ .../postgresql/parser/PGExprParser.java | 12 ++-- .../postgresql/visitor/PGASTVisitor.java | 5 ++ .../visitor/PGASTVisitorAdapter.java | 11 ++++ .../postgresql/visitor/PGOutputVisitor.java | 14 +++++ .../visitor/PGSchemaStatVisitor.java | 12 ++++ .../bvt/sql/postgresql/PGSelectTest11.java | 55 +++++++++++++++++++ 10 files changed, 149 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGExprImpl.java create mode 100644 src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGTypeCastExpr.java create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest11.java diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java index b7ec29bb94..3f55890772 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLBinaryOperator.java @@ -68,9 +68,7 @@ public enum SQLBinaryOperator { BooleanAnd("AND", 140), BooleanXor("XOR", 150), BooleanOr("OR", 160), - Assignment(":=", 169), - - PostgresStyleTypeCast("::", 20), + Assignment(":=", 169) ; public static int getPriority(SQLBinaryOperator operator) { diff --git a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCastExpr.java b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCastExpr.java index 27a9d8779b..6443682028 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCastExpr.java +++ b/src/main/java/com/alibaba/druid/sql/ast/expr/SQLCastExpr.java @@ -22,8 +22,8 @@ import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLCastExpr extends SQLExprImpl { - private SQLExpr expr; - private SQLDataType dataType; + protected SQLExpr expr; + protected SQLDataType dataType; public SQLCastExpr(){ diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGExprImpl.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGExprImpl.java new file mode 100644 index 0000000000..283d2a4f9b --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGExprImpl.java @@ -0,0 +1,18 @@ +package com.alibaba.druid.sql.dialect.postgresql.ast.expr; + +import com.alibaba.druid.sql.ast.SQLExprImpl; +import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor; +import com.alibaba.druid.sql.visitor.SQLASTVisitor; + + +public abstract class PGExprImpl extends SQLExprImpl implements PGExpr { + + @Override + public abstract void accept0(PGASTVisitor visitor); + + @Override + protected void accept0(SQLASTVisitor visitor) { + accept0((PGASTVisitor) visitor); + } + +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGTypeCastExpr.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGTypeCastExpr.java new file mode 100644 index 0000000000..83764468fb --- /dev/null +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/ast/expr/PGTypeCastExpr.java @@ -0,0 +1,23 @@ +package com.alibaba.druid.sql.dialect.postgresql.ast.expr; + +import com.alibaba.druid.sql.ast.expr.SQLCastExpr; +import com.alibaba.druid.sql.dialect.postgresql.visitor.PGASTVisitor; +import com.alibaba.druid.sql.visitor.SQLASTVisitor; + +public class PGTypeCastExpr extends SQLCastExpr implements PGExpr { + + @Override + public void accept0(PGASTVisitor visitor) { + if (visitor.visit(this)) { + acceptChild(visitor, this.expr); + acceptChild(visitor, this.dataType); + } + visitor.endVisit(this); + } + + @Override + protected void accept0(SQLASTVisitor visitor) { + accept0((PGASTVisitor) visitor); + } + +} diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java index 8852a0ba60..9d7339b059 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/parser/PGExprParser.java @@ -15,10 +15,10 @@ */ package com.alibaba.druid.sql.dialect.postgresql.parser; +import com.alibaba.druid.sql.ast.SQLDataType; import com.alibaba.druid.sql.ast.SQLExpr; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOpExpr; -import com.alibaba.druid.sql.ast.expr.SQLBinaryOperator; import com.alibaba.druid.sql.dialect.postgresql.ast.PGOrderBy; +import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGTypeCastExpr; import com.alibaba.druid.sql.parser.Lexer; import com.alibaba.druid.sql.parser.SQLExprParser; import com.alibaba.druid.sql.parser.Token; @@ -66,8 +66,12 @@ public class PGExprParser extends SQLExprParser { public SQLExpr primaryRest(SQLExpr expr) { if (lexer.token() == Token.COLONCOLON) { lexer.nextToken(); - SQLExpr typeExpr = this.expr(); - SQLBinaryOpExpr castExpr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.PostgresStyleTypeCast, typeExpr); + SQLDataType dataType = this.parseDataType(); + + PGTypeCastExpr castExpr = new PGTypeCastExpr(); + + castExpr.setExpr(expr); + castExpr.setDataType(dataType); return primaryRest(castExpr); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitor.java index 4e6cd95db8..29c9bbe014 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitor.java @@ -18,6 +18,7 @@ package com.alibaba.druid.sql.dialect.postgresql.visitor; import com.alibaba.druid.sql.dialect.postgresql.ast.PGWithClause; import com.alibaba.druid.sql.dialect.postgresql.ast.PGWithQuery; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGParameter; +import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGTypeCastExpr; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGDeleteStatement; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGFunctionTableSource; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGInsertStatement; @@ -79,5 +80,9 @@ public interface PGASTVisitor extends SQLASTVisitor { void endVisit(PGFunctionTableSource x); boolean visit(PGFunctionTableSource x); + + void endVisit(PGTypeCastExpr x); + + boolean visit(PGTypeCastExpr x); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitorAdapter.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitorAdapter.java index a5e7a2570a..c4a6f824af 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitorAdapter.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGASTVisitorAdapter.java @@ -18,6 +18,7 @@ package com.alibaba.druid.sql.dialect.postgresql.visitor; import com.alibaba.druid.sql.dialect.postgresql.ast.PGWithClause; import com.alibaba.druid.sql.dialect.postgresql.ast.PGWithQuery; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGParameter; +import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGTypeCastExpr; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGDeleteStatement; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGFunctionTableSource; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGInsertStatement; @@ -166,5 +167,15 @@ public class PGASTVisitorAdapter extends SQLASTVisitorAdapter implements PGASTVi public void endVisit(PGLimit x) { } + + @Override + public boolean visit(PGTypeCastExpr x) { + return true; + } + + @Override + public void endVisit(PGTypeCastExpr x) { + + } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java index a9641597b6..ec3a01ef03 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGOutputVisitor.java @@ -21,6 +21,7 @@ import com.alibaba.druid.sql.ast.statement.SQLTruncateStatement; import com.alibaba.druid.sql.dialect.postgresql.ast.PGWithClause; import com.alibaba.druid.sql.dialect.postgresql.ast.PGWithQuery; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGParameter; +import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGTypeCastExpr; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGDeleteStatement; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGFunctionTableSource; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGInsertStatement; @@ -481,4 +482,17 @@ public class PGOutputVisitor extends SQLASTOutputVisitor implements PGASTVisitor } + @Override + public void endVisit(PGTypeCastExpr x) { + + } + + @Override + public boolean visit(PGTypeCastExpr x) { + x.getExpr().accept(this); + print("::"); + x.getDataType().accept(this); + return false; + } + } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGSchemaStatVisitor.java index 046d18744d..f73918f00a 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/postgresql/visitor/PGSchemaStatVisitor.java @@ -24,6 +24,7 @@ import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.dialect.postgresql.ast.PGWithClause; import com.alibaba.druid.sql.dialect.postgresql.ast.PGWithQuery; import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGParameter; +import com.alibaba.druid.sql.dialect.postgresql.ast.expr.PGTypeCastExpr; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGDeleteStatement; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGFunctionTableSource; import com.alibaba.druid.sql.dialect.postgresql.ast.stmt.PGInsertStatement; @@ -275,4 +276,15 @@ public class PGSchemaStatVisitor extends SchemaStatVisitor implements PGASTVisit public void endVisit(PGLimit x) { } + + @Override + public boolean visit(PGTypeCastExpr x) { + x.getExpr().accept(this); + return false; + } + + @Override + public void endVisit(PGTypeCastExpr x) { + + } } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest11.java b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest11.java new file mode 100644 index 0000000000..70690c97cd --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/postgresql/PGSelectTest11.java @@ -0,0 +1,55 @@ +/* + * Copyright 1999-2011 Alibaba Group Holding Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.alibaba.druid.bvt.sql.postgresql; + +import java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.PGTest; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.postgresql.parser.PGSQLStatementParser; +import com.alibaba.druid.sql.dialect.postgresql.visitor.PGSchemaStatVisitor; + +public class PGSelectTest11 extends PGTest { + + public void test_0() throws Exception { + String sql = "select \"xxx\"::varchar as xx from xxx;"; + + PGSQLStatementParser parser = new PGSQLStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + PGSchemaStatVisitor visitor = new PGSchemaStatVisitor(); + statemen.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + + Assert.assertEquals(1, visitor.getColumns().size()); + Assert.assertEquals(1, visitor.getTables().size()); + } +} + +// select categoryId , offerIds from cnres.function_select_get_spt_p4p_offer_list (' 1031918 , 1031919 , 1037004 ') as +// a(categoryId numeric,offerIds character varying(4000)) +// select memberId , offerIds from cnres.function_select_get_seller_hot_offer_list('\'gzyyd168\'') as a(memberId +// character varying(20),offerIds character varying(4000)) +