From 8681b7a7cd5b80ba77ce73232a29da6cbd8af20b Mon Sep 17 00:00:00 2001 From: wenshao Date: Mon, 9 Apr 2018 15:06:22 +0800 Subject: [PATCH] improved h2 parser. --- src/main/java/com/alibaba/druid/VERSION.java | 2 +- .../druid/sql/dialect/h2/parser/H2Lexer.java | 1 + .../druid/sql/parser/SQLExprParser.java | 40 ++++++++-- .../druid/sql/parser/SQLParserFeature.java | 4 +- .../sql/visitor/SQLASTOutputVisitor.java | 4 + .../bvt/sql/h2/H2_CreateTableTest_0.java | 77 +++++++++++++++++++ .../druid/bvt/sql/h2/H2_DropDatabaseTest.java | 59 ++++++++++++++ 7 files changed, 177 insertions(+), 10 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_0.java create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/h2/H2_DropDatabaseTest.java diff --git a/src/main/java/com/alibaba/druid/VERSION.java b/src/main/java/com/alibaba/druid/VERSION.java index eef6327e1c..00d4063dec 100644 --- a/src/main/java/com/alibaba/druid/VERSION.java +++ b/src/main/java/com/alibaba/druid/VERSION.java @@ -19,7 +19,7 @@ public final class VERSION { public final static int MajorVersion = 1; public final static int MinorVersion = 1; - public final static int RevisionVersion = 9; + public final static int RevisionVersion = 10; public static String getVersionNumber() { return VERSION.MajorVersion + "." + VERSION.MinorVersion + "." + VERSION.RevisionVersion; diff --git a/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2Lexer.java b/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2Lexer.java index a49fe05699..45670cc270 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2Lexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/h2/parser/H2Lexer.java @@ -39,6 +39,7 @@ public class H2Lexer extends Lexer { map.put("ROW", Token.ROW); map.put("LIMIT", Token.LIMIT); + map.put("IF", Token.IF); DEFAULT_H2_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 5cf1d38f4a..066f28fbf1 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -1783,7 +1783,15 @@ public class SQLExprParser extends SQLParser { public final SQLExpr additive() { SQLExpr expr = multiplicative(); - return additiveRest(expr); + + if (lexer.token == Token.PLUS + || lexer.token == Token.BARBAR + || lexer.token == Token.CONCAT + || lexer.token == Token.SUB) { + expr = additiveRest(expr); + } + + return expr; } public SQLExpr additiveRest(SQLExpr expr) { @@ -1795,7 +1803,7 @@ public class SQLExprParser extends SQLParser { expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.Add, rightExp, dbType); expr = additiveRest(expr); } else if ((token == Token.BARBAR || token == Token.CONCAT) - && !JdbcConstants.MYSQL.equals(dbType)) { + && (isEnabled(SQLParserFeature.PipesAsConcat) || !JdbcConstants.MYSQL.equals(dbType))) { lexer.nextToken(); SQLExpr rightExp = multiplicative(); expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.Concat, rightExp, dbType); @@ -1836,7 +1844,10 @@ public class SQLExprParser extends SQLParser { public SQLExpr and() { SQLExpr expr = relational(); - return andRest(expr); + if (lexer.token == Token.AND || lexer.token == Token.AMPAMP) { + expr = andRest(expr); + } + return expr; } public SQLExpr andRest(SQLExpr expr) { @@ -1891,8 +1902,8 @@ public class SQLExprParser extends SQLParser { SQLExpr rightExp = relational(); SQLBinaryOperator operator = JdbcConstants.POSTGRESQL.equals(dbType) - ? SQLBinaryOperator.PG_And - : SQLBinaryOperator.BooleanAnd; + ? SQLBinaryOperator.PG_And + : SQLBinaryOperator.BooleanAnd; expr = new SQLBinaryOpExpr(expr, operator, rightExp, dbType); } else { @@ -1905,7 +1916,10 @@ public class SQLExprParser extends SQLParser { public SQLExpr or() { SQLExpr expr = and(); - return orRest(expr); + if (lexer.token == Token.OR || lexer.token == Token.BARBAR || lexer.token == Token.XOR) { + expr = orRest(expr); + } + return expr; } public SQLExpr orRest(SQLExpr expr) { @@ -1943,11 +1957,15 @@ public class SQLExprParser extends SQLParser { } else { expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.BooleanOr, rightExp, dbType); } - } else if (lexer.token == Token.BARBAR && JdbcConstants.MYSQL.equals(dbType)) { + } else if (lexer.token == Token.BARBAR) { lexer.nextToken(); SQLExpr rightExp = and(); - expr = new SQLBinaryOpExpr(expr, SQLBinaryOperator.BooleanOr, rightExp, dbType); + SQLBinaryOperator op = JdbcConstants.MYSQL.equals(dbType) && !isEnabled(SQLParserFeature.PipesAsConcat) + ? SQLBinaryOperator.BooleanOr + : SQLBinaryOperator.Concat; + + expr = new SQLBinaryOpExpr(expr, op, rightExp, dbType); } else if (lexer.token == Token.XOR) { lexer.nextToken(); SQLExpr rightExp = and(); @@ -2701,6 +2719,12 @@ public class SQLExprParser extends SQLParser { return parseColumnRest(column); } + if (lexer.identifierEquals(FnvHash.Constants.AUTO_INCREMENT)) { + lexer.nextToken(); + column.setAutoIncrement(true); + return parseColumnRest(column); + } + return column; } diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLParserFeature.java b/src/main/java/com/alibaba/druid/sql/parser/SQLParserFeature.java index 81a8ddf7a9..bc72d371cc 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLParserFeature.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLParserFeature.java @@ -24,7 +24,9 @@ public enum SQLParserFeature { OptimizedForForParameterizedSkipValue, KeepComments, SkipComments, - StrictForWall + StrictForWall, + + PipesAsConcat, // for mysql ; private SQLParserFeature(){ 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 06bba25b7d..523a6628b4 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SQLASTOutputVisitor.java @@ -2363,6 +2363,10 @@ public class SQLASTOutputVisitor extends SQLASTVisitorAdapter implements Paramet visitColumnDefault(x); } + if (x.isAutoIncrement()) { + print0(ucase ? " AUTO_INCREMENT" : " auto_increment"); + } + for (SQLColumnConstraint item : x.getConstraints()) { boolean newLine = item instanceof SQLForeignKeyConstraint // || item instanceof SQLPrimaryKey // diff --git a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_0.java b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_0.java new file mode 100644 index 0000000000..632da21ce3 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_CreateTableTest_0.java @@ -0,0 +1,77 @@ +/* + * Copyright 1999-2017 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.h2; + +import com.alibaba.druid.sql.OracleTest; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.oracle.visitor.OracleSchemaStatVisitor; +import com.alibaba.druid.util.JdbcConstants; +import junit.framework.TestCase; +import org.junit.Assert; + +import java.util.List; + +public class H2_CreateTableTest_0 extends TestCase { + + public void test_0() throws Exception { + String sql = // + "CREATE TABLE IF NOT EXISTS `DTS_EXECUTION_COUNTER` ( `id` bigint(20) NOT NULL AUTO_INCREMENT, `gmt_create` datetime DEFAULT NULL, `gmt_modified` datetime DEFAULT NULL, `job_id` bigint(20) DEFAULT NULL, `job_instance_id` bigint(20) DEFAULT NULL, `receive_node` varchar(255) DEFAULT NULL, `task_name` varchar(255) DEFAULT NULL, `total_counter` bigint(20), `queued_counter` bigint(20), `running_counter` bigint(20), `success_counter` bigint(20), `fail_counter` bigint(20), PRIMARY KEY (`id`) ) ; "; // + + List statementList = SQLUtils.toStatementList(sql, JdbcConstants.H2); + SQLStatement stmt = statementList.get(0); + + Assert.assertEquals(1, statementList.size()); + + OracleSchemaStatVisitor visitor = new OracleSchemaStatVisitor(); + stmt.accept(visitor); + + { + String text = SQLUtils.toSQLString(stmt, JdbcConstants.H2); + + assertEquals("CREATE TABLE IF NOT EXISTS `DTS_EXECUTION_COUNTER` (\n" + + "\t`id` bigint(20) AUTO_INCREMENT NOT NULL,\n" + + "\t`gmt_create` datetime DEFAULT NULL,\n" + + "\t`gmt_modified` datetime DEFAULT NULL,\n" + + "\t`job_id` bigint(20) DEFAULT NULL,\n" + + "\t`job_instance_id` bigint(20) DEFAULT NULL,\n" + + "\t`receive_node` varchar(255) DEFAULT NULL,\n" + + "\t`task_name` varchar(255) DEFAULT NULL,\n" + + "\t`total_counter` bigint(20),\n" + + "\t`queued_counter` bigint(20),\n" + + "\t`running_counter` bigint(20),\n" + + "\t`success_counter` bigint(20),\n" + + "\t`fail_counter` bigint(20),\n" + + "\tPRIMARY KEY (`id`)\n" + + ");", text); + } + + System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); + System.out.println("coditions : " + visitor.getConditions()); + System.out.println("relationships : " + visitor.getRelationships()); + System.out.println("orderBy : " + visitor.getOrderByColumns()); + + assertEquals(1, visitor.getTables().size()); + assertEquals(12, visitor.getColumns().size()); + assertEquals(0, visitor.getConditions().size()); + assertEquals(0, visitor.getRelationships().size()); + assertEquals(0, visitor.getOrderByColumns().size()); + + Assert.assertTrue(visitor.containsTable("DTS_EXECUTION_COUNTER")); + + } +} diff --git a/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_DropDatabaseTest.java b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_DropDatabaseTest.java new file mode 100644 index 0000000000..cdd07d0674 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/h2/H2_DropDatabaseTest.java @@ -0,0 +1,59 @@ +/* + * Copyright 1999-2018 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.h2; + +import com.alibaba.druid.sql.MysqlTest; +import com.alibaba.druid.sql.SQLUtils; +import com.alibaba.druid.sql.ast.SQLStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor; +import com.alibaba.druid.util.JdbcConstants; + +import java.util.List; + +public class H2_DropDatabaseTest extends MysqlTest { + + public void test_0() throws Exception { + String sql = "DROP DATABASE IF EXISTS sonar"; + + List statementList = SQLUtils.parseStatements(sql, JdbcConstants.H2); + SQLStatement stmt = statementList.get(0); +// print(statementList); + + assertEquals(1, statementList.size()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); + + String output = SQLUtils.toMySqlString(stmt); + assertEquals("DROP DATABASE IF EXISTS sonar", // + output); + +// System.out.println("Tables : " + visitor.getTables()); +// System.out.println("fields : " + visitor.getColumns()); +// System.out.println("coditions : " + visitor.getConditions()); +// System.out.println("orderBy : " + visitor.getOrderByColumns()); + + assertEquals(0, visitor.getTables().size()); + assertEquals(0, visitor.getColumns().size()); + assertEquals(0, visitor.getConditions().size()); + +// assertTrue(visitor.getTables().containsKey(new TableStat.Name("City"))); +// assertTrue(visitor.getTables().containsKey(new TableStat.Name("t2"))); + +// assertTrue(visitor.getColumns().contains(new Column("t2", "id"))); + } +}