From 68e7059b2c8b9e0c522e5b777408b7546b052221 Mon Sep 17 00:00:00 2001 From: wenshao Date: Fri, 19 Apr 2013 17:49:06 +0800 Subject: [PATCH] improve mysql parser --- .../mysql/parser/MySqlCreateTableParser.java | 10 ++- .../bvt/sql/mysql/MySqlCreateTableTest13.java | 68 +++++++++++++++++++ 2 files changed, 77 insertions(+), 1 deletion(-) create mode 100644 src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest13.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 aa9c87c926..6d2c1a510e 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 @@ -147,6 +147,14 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); continue; } + + if (identifierEquals("AUTO_INCREMENT")) { + lexer.nextToken(); + accept(Token.EQ); + stmt.getTableOptions().put("AUTO_INCREMENT", lexer.numberString()); + lexer.nextToken(); + continue; + } if (identifierEquals("TYPE")) { lexer.nextToken(); @@ -183,7 +191,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { throw new ParserException("TODO " + lexer.token() + " " + lexer.stringVal()); } } - + if (lexer.token() == Token.DEFAULT) { lexer.nextToken(); if (identifierEquals("CHARACTER")) { diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest13.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest13.java new file mode 100644 index 0000000000..3029fe2265 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/MySqlCreateTableTest13.java @@ -0,0 +1,68 @@ +/* + * 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 org.junit.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 MySqlCreateTableTest13 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "CREATE TABLE `xx_video` (" + // + "`id` int(11) NOT NULL AUTO_INCREMENT," + // + "`video_url` varchar(500) DEFAULT NULL," + // + "`video_title` varchar(200) DEFAULT NULL," + // + "`video_des` varchar(500) DEFAULT NULL," + // + "`video_type` varchar(11) NOT NULL," + // + "`delete_flag` int(11) DEFAULT '0'," + // + "`create_date` datetime DEFAULT NULL," + // + "`last_update` datetime DEFAULT NULL," + // + "PRIMARY KEY (`id`)" + // + ") ENGINE=InnoDB AUTO_INCREMENT=5 DEFAULT CHARSET=gbk;"; + + 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(8, visitor.getColumns().size()); + Assert.assertEquals(0, visitor.getConditions().size()); + + Assert.assertTrue(visitor.getTables().containsKey(new TableStat.Name("xx_video"))); + + Assert.assertTrue(visitor.getColumns().contains(new Column("xx_video", "id"))); + Assert.assertTrue(visitor.getColumns().contains(new Column("xx_video", "video_url"))); + } +}