From fc96c0c424be484b56b369a361603f87b5fd1cdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AB=98=E9=93=81?= Date: Thu, 30 Jun 2016 00:12:56 +0800 Subject: [PATCH] bug fixed for issue #1266 --- .../druid/sql/parser/SQLExprParser.java | 1 + .../bvt/sql/mysql/MySqlAlterTableTest25.java | 38 +++++++++++++++++++ .../alibaba/druid/demo/sql/LimitDetect.java | 9 +++++ 3 files changed, 48 insertions(+) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest25.java create mode 100644 src/test/java/com/alibaba/druid/demo/sql/LimitDetect.java 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 0d1035f45b..daffa6e1a7 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLExprParser.java @@ -958,6 +958,7 @@ public class SQLExprParser extends SQLParser { case REVOKE: // binary有很多含义,lexer识别了这个token,实际上应该当做普通IDENTIFIER case BINARY: + case OVER: identName = lexer.stringVal(); lexer.nextToken(); break; diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest25.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest25.java new file mode 100644 index 0000000000..492d41fce3 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlAlterTableTest25.java @@ -0,0 +1,38 @@ +/* + * 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.mysql; + +import junit.framework.TestCase; + +import org.junit.Assert; + +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.parser.Token; + +public class MySqlAlterTableTest25 extends TestCase { + + public void test_alter_add_key() throws Exception { + String sql = "alter table xxxx add over bigint unsigned comment 'xxxx';"; + MySqlStatementParser parser = new MySqlStatementParser(sql); + SQLStatement stmt = parser.parseStatementList().get(0); + parser.match(Token.EOF); + String output = SQLUtils.toMySqlString(stmt); + Assert.assertEquals("ALTER TABLE xxxx" + + "\n\tADD COLUMN over bigint UNSIGNED COMMENT 'xxxx'", output); + } +} diff --git a/src/test/java/com/alibaba/druid/demo/sql/LimitDetect.java b/src/test/java/com/alibaba/druid/demo/sql/LimitDetect.java new file mode 100644 index 0000000000..1ef219bc8f --- /dev/null +++ b/src/test/java/com/alibaba/druid/demo/sql/LimitDetect.java @@ -0,0 +1,9 @@ +package com.alibaba.druid.demo.sql; + +import junit.framework.TestCase; + +public class LimitDetect extends TestCase { + public void test_limit() throws Exception { + String sql = "select * from t limit 1"; + } +}