From bf1ad5da0c7705ea3bb3cf02a69254caaddb9d67 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Fri, 18 Mar 2016 16:34:02 +0800 Subject: [PATCH] sql parser improved db2 support --- .../com/alibaba/druid/sql/ast/SQLOver.java | 15 +++ .../sql/dialect/db2/parser/DB2Lexer.java | 1 + .../druid/sql/parser/SQLExprParser.java | 6 ++ .../sql/visitor/SQLASTOutputVisitor.java | 7 ++ .../druid/bvt/sql/db2/DB2SelectTest_10.java | 93 +++++++++++++++++++ 5 files changed, 122 insertions(+) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_10.java diff --git a/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java b/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java index 9396c541e2..8aa9ef0e77 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java +++ b/src/main/java/com/alibaba/druid/sql/ast/SQLOver.java @@ -25,6 +25,9 @@ public class SQLOver extends SQLObjectImpl { protected final List partitionBy = new ArrayList(); protected SQLOrderBy orderBy; + // for db2 + protected SQLExpr of; + public SQLOver(){ } @@ -38,6 +41,7 @@ public class SQLOver extends SQLObjectImpl { if (visitor.visit(this)) { acceptChild(visitor, this.partitionBy); acceptChild(visitor, this.orderBy); + acceptChild(visitor, this.of); } visitor.endVisit(this); } @@ -53,6 +57,17 @@ public class SQLOver extends SQLObjectImpl { this.orderBy = orderBy; } + public SQLExpr getOf() { + return of; + } + + public void setOf(SQLExpr of) { + if (of != null) { + of.setParent(this); + } + this.of = of; + } + public List getPartitionBy() { return partitionBy; } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2Lexer.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2Lexer.java index 9fee7ff66d..1f0d909c6e 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2Lexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2Lexer.java @@ -36,6 +36,7 @@ public class DB2Lexer extends Lexer { map.put("FIRST", Token.FIRST); map.put("ONLY", Token.ONLY); map.put("OPTIMIZE", Token.OPTIMIZE); + map.put("OF", Token.OF); DEFAULT_DB2_KEYWORDS = new Keywords(map); } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java index f13df09738..60ce7d8832 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -1036,6 +1036,12 @@ public class SQLExprParser extends SQLParser { } over.setOrderBy(parseOrderBy()); + + if (lexer.token() == Token.OF) { + lexer.nextToken(); + SQLExpr of = this.expr(); + over.setOf(of); + } accept(Token.RPAREN); aggregateExpr.setOver(over); diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java index 5dd21fa600..20a2e529ad 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -1632,9 +1632,16 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab printAndAccept(x.getPartitionBy(), ", "); print(' '); } + if (x.getOrderBy() != null) { x.getOrderBy().accept(this); } + + if (x.getOf() != null) { + print0(ucase ? " OF " : " of "); + x.getOf().accept(this); + } + print(')'); return false; } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_10.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_10.java new file mode 100644 index 0000000000..6c7e5ca26d --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_10.java @@ -0,0 +1,93 @@ +/* + * Copyright 1999-2101 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.db2; + +import java.util.List; + +import org.junit.Assert; + +import com.alibaba.druid.sql.DB2Test; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.db2.parser.DB2StatementParser; +import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor; +import com.alibaba.druid.stat.TableStat; +import com.alibaba.druid.util.JdbcConstants; + +public class DB2SelectTest_10 extends DB2Test { + + public void test_0() throws Exception { + String sql = "select * from ( select inner2_.*, rownumber() over(order by order of inner2_) as rownumber_ from (" + + " select tsuserstb0_.USERID as USERID1_1_, tsuserstb0_.CREASTAF as CREASTAF2_1_, tsuserstb0_.CREATIME as CREATIME3_1_" + + " , tsuserstb0_.LOCORGNO as LOCORGNO4_1_, tsuserstb0_.PWDMODIFYTIME as PWDMODIF5_1_, tsuserstb0_.REMARK01 as REMARK6_1_" + + " , tsuserstb0_.REMARK02 as REMARK7_1_, tsuserstb0_.STAORGNO as STAORGNO8_1_, tsuserstb0_.UPDASTAF as UPDASTAF9_1_" + + " , tsuserstb0_.UPDATIME as UPDATIM10_1_, tsuserstb0_.USERNAME as USERNAM11_1_, tsuserstb0_.USERPWD as USERPWD12_1_" + + " , tsuserstb0_.USERSTATE as USERSTA13_1_ from TS_USERSTB tsuserstb0_ fetch first 20 rows only ) as inner2_ " + + ") as inner1_" + + " where rownumber_ > 10 order by rownumber_"; + + DB2StatementParser parser = new DB2StatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement stmt = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + DB2SchemaStatVisitor visitor = new DB2SchemaStatVisitor(); + stmt.accept(visitor); + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + Assert.assertEquals(1, visitor.getTables().size()); + Assert.assertEquals(14, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("TS_USERSTB"))); + + // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "last_name"))); + // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name"))); + // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); + + Assert.assertEquals("SELECT *" + + "\nFROM (SELECT inner2_.*, ROWNUMBER() OVER (ORDER BY order OF inner2_) AS rownumber_" + + "\n\tFROM (SELECT tsuserstb0_.USERID AS USERID1_1_, tsuserstb0_.CREASTAF AS CREASTAF2_1_, tsuserstb0_.CREATIME AS CREATIME3_1_, tsuserstb0_.LOCORGNO AS LOCORGNO4_1_, tsuserstb0_.PWDMODIFYTIME AS PWDMODIF5_1_" + + "\n\t\t\t, tsuserstb0_.REMARK01 AS REMARK6_1_, tsuserstb0_.REMARK02 AS REMARK7_1_, tsuserstb0_.STAORGNO AS STAORGNO8_1_, tsuserstb0_.UPDASTAF AS UPDASTAF9_1_, tsuserstb0_.UPDATIME AS UPDATIM10_1_" + + "\n\t\t\t, tsuserstb0_.USERNAME AS USERNAM11_1_, tsuserstb0_.USERPWD AS USERPWD12_1_, tsuserstb0_.USERSTATE AS USERSTA13_1_" + + "\n\t\tFROM TS_USERSTB tsuserstb0_" + + "\n\t\tFETCH FIRST 20 ROWS ONLY" + + "\n\t\t) inner2_" + + "\n\t) inner1_" + + "\nWHERE rownumber_ > 10" + + "\nORDER BY rownumber_", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + + Assert.assertEquals("select *" + + "\nfrom (select inner2_.*, rownumber() over (order by order of inner2_) as rownumber_" + + "\n\tfrom (select tsuserstb0_.USERID as USERID1_1_, tsuserstb0_.CREASTAF as CREASTAF2_1_, tsuserstb0_.CREATIME as CREATIME3_1_, tsuserstb0_.LOCORGNO as LOCORGNO4_1_, tsuserstb0_.PWDMODIFYTIME as PWDMODIF5_1_" + + "\n\t\t\t, tsuserstb0_.REMARK01 as REMARK6_1_, tsuserstb0_.REMARK02 as REMARK7_1_, tsuserstb0_.STAORGNO as STAORGNO8_1_, tsuserstb0_.UPDASTAF as UPDASTAF9_1_, tsuserstb0_.UPDATIME as UPDATIM10_1_" + + "\n\t\t\t, tsuserstb0_.USERNAME as USERNAM11_1_, tsuserstb0_.USERPWD as USERPWD12_1_, tsuserstb0_.USERSTATE as USERSTA13_1_" + + "\n\t\tfrom TS_USERSTB tsuserstb0_" + + "\n\t\tfetch first 20 rows only" + + "\n\t\t) inner2_" + + "\n\t) inner1_" + + "\nwhere rownumber_ > 10" + + "\norder by rownumber_", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + } +}