diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyConstraint.java index a1147a2d81..e0af4155fa 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLForeignKeyConstraint.java @@ -19,7 +19,7 @@ import java.util.List; import com.alibaba.druid.sql.ast.SQLName; -public interface SQLForeignKeyConstraint extends SQLConstaint, SQLTableElement { +public interface SQLForeignKeyConstraint extends SQLConstaint, SQLTableElement, SQLTableConstaint { List getReferencingColumns(); 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 7338d30e64..a63df80f61 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 @@ -20,9 +20,11 @@ import com.alibaba.druid.sql.ast.statement.SQLCheck; import com.alibaba.druid.sql.ast.statement.SQLColumnDefinition; import com.alibaba.druid.sql.ast.statement.SQLCreateTableStatement; import com.alibaba.druid.sql.ast.statement.SQLForeignKeyConstraint; +import com.alibaba.druid.sql.ast.statement.SQLPrimaryKey; import com.alibaba.druid.sql.ast.statement.SQLSelect; import com.alibaba.druid.sql.ast.statement.SQLTableConstaint; import com.alibaba.druid.sql.dialect.mysql.ast.MySqlKey; +import com.alibaba.druid.sql.dialect.mysql.ast.MySqlUnique; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement.TableSpaceOption; import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlPartitionByHash; @@ -93,7 +95,8 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { stmt.setLike(name); } else { for (;;) { - if (lexer.token() == Token.IDENTIFIER || lexer.token() == Token.LITERAL_CHARS) { + 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 // @@ -142,6 +145,9 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { } else if (lexer.token() == Token.CHECK) { SQLCheck check = this.exprParser.parseCheck(); stmt.getTableElementList().add(check); + } else { + SQLColumnDefinition column = this.exprParser.parseColumn(); + stmt.getTableElementList().add(column); } if (!(lexer.token() == (Token.COMMA))) { @@ -633,15 +639,25 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { return key; } - if (lexer.token() == (Token.PRIMARY)) { - return (SQLTableConstaint) this.exprParser.parsePrimaryKey(); + if (lexer.token() == Token.PRIMARY) { + SQLPrimaryKey pk = this.exprParser.parsePrimaryKey(); + pk.setName(name); + return (SQLTableConstaint) pk; } - if (lexer.token() == (Token.UNIQUE)) { - return (SQLTableConstaint) this.getExprParser().parseUnique(); + if (lexer.token() == Token.UNIQUE) { + MySqlUnique uk = this.getExprParser().parseUnique(); + uk.setName(name); + return (SQLTableConstaint) uk; + } + + if (lexer.token() == Token.FOREIGN) { + SQLForeignKeyConstraint fk = this.getExprParser().parseForeignKey(); + fk.setName(name); + return (SQLTableConstaint) fk; } - throw new ParserException("TODO"); + throw new ParserException("TODO :" + lexer.token()); } } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java index 585fb20bb7..e67a9621ad 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/visitor/MySqlSchemaStatVisitor.java @@ -18,6 +18,7 @@ package com.alibaba.druid.sql.dialect.mysql.visitor; import java.util.Map; import com.alibaba.druid.sql.ast.SQLName; +import com.alibaba.druid.sql.ast.SQLObject; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.statement.SQLAlterTableAddColumn; import com.alibaba.druid.sql.ast.statement.SQLAlterTableStatement; @@ -266,8 +267,10 @@ public class MySqlSchemaStatVisitor extends SchemaStatVisitor implements MySqlAS @Override public boolean visit(MySqlPrimaryKey x) { - - return true; + for (SQLObject item : x.getColumns()) { + item.accept(this); + } + return false; } @Override