From eb5c8d708e59d58661f81a2227315ab65419cf59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Wed, 29 Jun 2016 02:01:22 +0800 Subject: [PATCH] improved sql parser. fixed issue #1311 --- .../ast/statement/SQLSelectQueryBlock.java | 14 ++++ .../dialect/db2/parser/DB2SelectParser.java | 6 ++ .../ast/statement/MySqlSelectQueryBlock.java | 10 --- .../sql/visitor/SQLASTOutputVisitor.java | 5 ++ .../druid/bvt/sql/db2/DB2SelectTest_12.java | 75 +++++++++++++++++++ 5 files changed, 100 insertions(+), 10 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_12.java diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java index 225db21080..a94d092ff3 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLSelectQueryBlock.java @@ -20,6 +20,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.ast.SQLObjectImpl; +import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.visitor.SQLASTVisitor; public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery { @@ -31,6 +32,7 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery protected SQLExprTableSource into; protected SQLExpr where; protected SQLSelectGroupByClause groupBy; + protected SQLOrderBy orderBy; protected boolean parenthesized = false; public SQLSelectQueryBlock(){ @@ -70,6 +72,18 @@ public class SQLSelectQueryBlock extends SQLObjectImpl implements SQLSelectQuery } this.where = where; } + + public SQLOrderBy getOrderBy() { + return orderBy; + } + + public void setOrderBy(SQLOrderBy orderBy) { + if (orderBy != null) { + orderBy.setParent(this); + } + + this.orderBy = orderBy; + } public int getDistionOption() { return this.distionOption; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2SelectParser.java b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2SelectParser.java index abfad27f83..6c78ca9e5b 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2SelectParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/db2/parser/DB2SelectParser.java @@ -16,6 +16,7 @@ package com.alibaba.druid.sql.dialect.db2.parser; import com.alibaba.druid.sql.ast.SQLExpr; +import com.alibaba.druid.sql.ast.SQLOrderBy; import com.alibaba.druid.sql.ast.SQLSetQuantifier; import com.alibaba.druid.sql.ast.statement.SQLSelectQuery; import com.alibaba.druid.sql.dialect.db2.ast.stmt.DB2SelectQueryBlock; @@ -76,6 +77,11 @@ public class DB2SelectParser extends SQLSelectParser { parseWhere(queryBlock); parseGroupBy(queryBlock); + + if (lexer.token() == Token.ORDER) { + SQLOrderBy orderBy = parseOrderBy(); + queryBlock.setOrderBy(orderBy); + } for (;;) { diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectQueryBlock.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectQueryBlock.java index de75421297..fbf8d6fdad 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectQueryBlock.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/ast/statement/MySqlSelectQueryBlock.java @@ -39,8 +39,6 @@ public class MySqlSelectQueryBlock extends SQLSelectQueryBlock implements MySqlO private Boolean cache; private boolean calcFoundRows; - private SQLOrderBy orderBy; - private Limit limit; private SQLName procedureName; @@ -183,14 +181,6 @@ public class MySqlSelectQueryBlock extends SQLSelectQueryBlock implements MySqlO this.calcFoundRows = calcFoundRows; } - public SQLOrderBy getOrderBy() { - return orderBy; - } - - public void setOrderBy(SQLOrderBy orderBy) { - this.orderBy = orderBy; - } - public Limit getLimit() { return limit; } 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 b7634ba64a..0294536142 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -765,6 +765,11 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Printab println(); x.getGroupBy().accept(this); } + + if (x.getOrderBy() != null) { + println(); + x.getOrderBy().accept(this); + } return false; } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_12.java b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_12.java new file mode 100644 index 0000000000..62d2794a62 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/db2/DB2SelectTest_12.java @@ -0,0 +1,75 @@ +/* + * 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.stat.TableStat.Column; +import com.alibaba.druid.util.JdbcConstants; + +public class DB2SelectTest_12 extends DB2Test { + + public void test_0() throws Exception { + String sql = "SELECT * FROM TASK_POLICE_QUERY_BATCH WHERE STATUS = '0' ORDER BY PRIORITY FETCH FIRST 100 ROWS ONLY"; + + 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(2, visitor.getColumns().size()); + Assert.assertEquals(1, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("TASK_POLICE_QUERY_BATCH"))); + + Assert.assertTrue(visitor.getColumns().contains(new Column("TASK_POLICE_QUERY_BATCH", "STATUS"))); + // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "first_name"))); + // Assert.assertTrue(visitor.getColumns().contains(new Column("mytable", "full_name"))); + + Assert.assertEquals("SELECT *" + + "\nFROM TASK_POLICE_QUERY_BATCH" + + "\nWHERE STATUS = '0'" + + "\nORDER BY PRIORITY" + + "\nFETCH FIRST 100 ROWS ONLY", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2)); + + Assert.assertEquals("select *" + + "\nfrom TASK_POLICE_QUERY_BATCH" + + "\nwhere STATUS = '0'" + + "\norder by PRIORITY" + + "\nfetch first 100 rows only", // + SQLUtils.toSQLString(stmt, JdbcConstants.DB2, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION)); + } +}