From 7715fe152a856eb981bce2a64e768002e1a05c0c Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 19 Apr 2013 16:58:26 +0800 Subject: [PATCH] improve parser --- .../mysql/parser/MySqlCreateTableParser.java | 2 +- .../druid/sql/visitor/SchemaStatVisitor.java | 7 +++ .../com/alibaba/druid/wall/WallProvider.java | 2 +- .../druid/wall/spi/WallVisitorUtils.java | 5 ++ .../bvt/sql/mysql/MySqlCreateTableTest12.java | 57 +++++++++++++++++++ 5 files changed, 71 insertions(+), 2 deletions(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest12.java diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java index ae86884da1..aa9c87c926 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlCreateTableParser.java @@ -76,7 +76,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); for (;;) { - if (lexer.token() == Token.IDENTIFIER) { + if (lexer.token() == Token.IDENTIFIER || lexer.token() == Token.LITERAL_CHARS) { SQLColumnDefinition column = this.exprParser.parseColumn(); stmt.getTableElementList().add(column); } else if (lexer.token() == Token.CONSTRAINT // diff --git a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java index 257025ea15..14fb53b9ea 100644 --- a/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/visitor/SchemaStatVisitor.java @@ -146,6 +146,7 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { boolean flag0 = false; boolean flag1 = false; boolean flag2 = false; + boolean flag3 = false; for (int i = 0; i < ident.length(); ++i) { final char ch = ident.charAt(i); if (ch == '\"') { @@ -154,6 +155,8 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { flag1 = true; } else if (ch == ' ') { flag2 = true; + } else if (ch == '\'') { + flag3 = true; } } if (flag0) { @@ -167,6 +170,10 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter { if (flag2) { ident = ident.replaceAll(" ", ""); } + + if (flag3) { + ident = ident.replaceAll("'", ""); + } ident = aliasWrap(ident); diff --git a/src/main/java/com/alibaba/druid/wall/WallProvider.java b/src/main/java/com/alibaba/druid/wall/WallProvider.java index 71e1a254e0..4659e65e4a 100644 --- a/src/main/java/com/alibaba/druid/wall/WallProvider.java +++ b/src/main/java/com/alibaba/druid/wall/WallProvider.java @@ -469,7 +469,7 @@ public abstract class WallProvider { violations.addAll(visitor.getViolations()); } - if (context != null && context.getWarnnings() >= 2) { + if (visitor.getViolations().size() == 0 && context != null && context.getWarnnings() >= 2) { if (context.getDeleteNoneConditionWarnnings() > 0) { violations.add(new IllegalSQLObjectViolation(ErrorCode.NONE_CONDITION, "delete none condition", sql)); } else if (context.getUpdateNoneConditionWarnnings() > 0) { 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 65ad3b6e3e..aa318f448b 100644 --- a/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java +++ b/src/main/java/com/alibaba/druid/wall/spi/WallVisitorUtils.java @@ -1180,6 +1180,11 @@ public class WallVisitorUtils { if (name.startsWith("\"") && name.endsWith("\"")) { name = name.substring(1, name.length() - 1); } + + if (name.startsWith("'") && name.endsWith("'")) { + name = name.substring(1, name.length() - 1); + } + if (name.startsWith("`") && name.endsWith("`")) { name = name.substring(1, name.length() - 1); } diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest12.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest12.java new file mode 100644 index 0000000000..74d2efccaf --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest12.java @@ -0,0 +1,57 @@ +/* + * 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.mysql; + +import java.util.List; + +import junit.framework.Assert; + +import com.alibaba.druid.sql.MysqlTest; +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.stat.TableStat; +import com.alibaba.druid.stat.TableStat.Column; + +public class MySqlCreateTableTest12 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "CREATE TABLE 'test' ('blob_col' BLOB, INDEX(blob_col(10)));"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + SQLStatement statemen = statementList.get(0); + print(statementList); + + Assert.assertEquals(1, statementList.size()); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + statemen.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(1, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("test"))); + + Assert.assertTrue(visitor.getColumns().contains(new Column("test", "blob_col"))); + } +}