diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCheck.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCheck.java index 7856c11871..f697f7f05a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCheck.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCheck.java @@ -18,7 +18,7 @@ package com.alibaba.druid.sql.ast.statement; import com.alibaba.druid.sql.ast.SQLExpr; import com.alibaba.druid.sql.visitor.SQLASTVisitor; -public class SQLCheck extends SQLConstraintImpl implements SQLTableElement { +public class SQLCheck extends SQLConstraintImpl implements SQLTableElement, SQLTableConstraint { private SQLExpr expr; @@ -34,11 +34,11 @@ public class SQLCheck extends SQLConstraintImpl implements SQLTableElement { return expr; } - public void setExpr(SQLExpr expr) { - if (expr != null) { - expr.setParent(this); + public void setExpr(SQLExpr x) { + if (x != null) { + x.setParent(this); } - this.expr = expr; + this.expr = x; } @Override 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 8f5409003b..b5d88df02e 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 @@ -849,7 +849,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { pk.setName(name); } pk.setHasConstaint(hasConstaint); - return (SQLTableConstraint) pk; + return pk; } if (lexer.token() == Token.UNIQUE) { @@ -858,14 +858,23 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { uk.setName(name); } uk.setHasConstaint(hasConstaint); - return (SQLTableConstraint) uk; + return uk; } if (lexer.token() == Token.FOREIGN) { MysqlForeignKey fk = this.getExprParser().parseForeignKey(); fk.setName(name); fk.setHasConstraint(hasConstaint); - return (SQLTableConstraint) fk; + return fk; + } + + if (lexer.token() == Token.CHECK) { + lexer.nextToken(); + SQLCheck check = new SQLCheck(); + check.setName(name); + SQLExpr expr = this.exprParser.expr(); + check.setExpr(expr); + return check; } throw new ParserException("TODO. " + lexer.info()); diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest89.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest89.java new file mode 100644 index 0000000000..406c7f38a0 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest89.java @@ -0,0 +1,75 @@ +/* + * 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.mysql.createTable; + +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.sql.parser.SQLParserFeature; + +public class MySqlCreateTableTest89 extends MysqlTest { + + public void test_one() throws Exception { + String sql = "CREATE TABLE IF NOT EXISTS `test_table_normal`( \n" + + "scoreID INTEGER NOT NULL PRIMARY KEY, \n" + + "stuID INTEGER NOT NULL, \n" + + "KEMUID INTEGER NOT NULL, \n" + + "score FLOAT, \n" + + "FOREIGN KEY SCORE_ID_FK (stuID) REFERENCES students (stuid), \n" + + "CONSTRAINT CHK_SCORE_ZIP CHECK (SCORE > 0) \n" + + "); "; + + MySqlStatementParser parser = new MySqlStatementParser(sql, SQLParserFeature.KeepComments); + SQLStatement stmt = parser.parseCreateTable(); + + MySqlSchemaStatVisitor visitor = new MySqlSchemaStatVisitor(); + stmt.accept(visitor); + + visitor.containsTable("t_share_like_info"); +// System.out.println("Tables : " + visitor.getTables()); + System.out.println("fields : " + visitor.getColumns()); +// System.out.println("coditions : " + visitor.getConditions()); +// System.out.println("orderBy : " + visitor.getOrderByColumns()); + + System.out.println(stmt); + + { + String output = SQLUtils.toMySqlString(stmt); + assertEquals("CREATE TABLE IF NOT EXISTS `test_table_normal` (\n" + + "\tscoreID INTEGER NOT NULL PRIMARY KEY,\n" + + "\tstuID INTEGER NOT NULL,\n" + + "\tKEMUID INTEGER NOT NULL,\n" + + "\tscore FLOAT,\n" + + "\tFOREIGN KEY SCORE_ID_FK (stuID) REFERENCES students (stuid),\n" + + "\tCONSTRAINT CHK_SCORE_ZIP CHECK (SCORE > 0)\n" + + ")", output); + } + + { + String output = SQLUtils.toMySqlString(stmt, SQLUtils.DEFAULT_LCASE_FORMAT_OPTION); + assertEquals("create table if not exists `test_table_normal` (\n" + + "\tscoreID INTEGER not null primary key,\n" + + "\tstuID INTEGER not null,\n" + + "\tKEMUID INTEGER not null,\n" + + "\tscore FLOAT,\n" + + "\tforeign key SCORE_ID_FK (stuID) references students (stuid),\n" + + "\tconstraint CHK_SCORE_ZIP check (SCORE > 0)\n" + + ")", output); + } + } +}