diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java index 8cd4d02ddb..bb868c9e0a 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLColumnDefinition.java @@ -431,6 +431,21 @@ public class SQLColumnDefinition extends SQLObjectImpl implements SQLTableElemen return false; } + public boolean isPrimaryKey() { + for (SQLColumnConstraint constraint : constraints) { + if (constraint instanceof SQLColumnPrimaryKey) { + return true; + } + } + + if (parent instanceof SQLCreateTableStatement) { + return ((SQLCreateTableStatement) parent) + .isPrimaryColumn(nameHashCode64()); + } + + return false; + } + public String toString() { return SQLUtils.toSQLString(this, dbType); } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java index 5b8fec750b..41dc46db0f 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLCreateTableStatement.java @@ -1107,4 +1107,35 @@ public class SQLCreateTableStatement extends SQLStatementImpl implements SQLDDLS this.rowFormat = x; } + public SQLColumnDefinition getColumn(String name) { + if (name == null) { + return null; + } + + return getColumn( + FnvHash.hashCode64(name) + ); + } + + public SQLColumnDefinition getColumn(long nameHash) { + for (SQLTableElement element : this.tableElementList) { + if (element instanceof SQLColumnDefinition) { + SQLColumnDefinition column = (SQLColumnDefinition) element; + if (column.nameHashCode64() == nameHash) { + return column; + } + } + } + + return null; + } + + public boolean isPrimaryColumn(long columnNameHash) { + SQLPrimaryKey pk = this.findPrimaryKey(); + if (pk == null) { + return false; + } + + return pk.containsColumn(columnNameHash); + } } diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnique.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnique.java index d34fa6e202..68e2da2b37 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnique.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUnique.java @@ -73,6 +73,18 @@ public class SQLUnique extends SQLConstraintImpl implements SQLUniqueConstraint, return false; } + public boolean containsColumn(long columnNameHash) { + for (SQLSelectOrderByItem item : columns) { + SQLExpr expr = item.getExpr(); + if (expr instanceof SQLIdentifierExpr) { + if (((SQLIdentifierExpr) expr).nameHashCode64() == columnNameHash) { + return true; + } + } + } + return false; + } + public void cloneTo(SQLUnique x) { super.cloneTo(x); diff --git a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraint.java b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraint.java index 1d14b9efa9..73906a9460 100644 --- a/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraint.java +++ b/src/main/java/com/alibaba/druid/sql/ast/statement/SQLUniqueConstraint.java @@ -24,4 +24,5 @@ public interface SQLUniqueConstraint extends SQLConstraint { List getColumns(); boolean containsColumn(String column); + boolean containsColumn(long columnNameHash); } 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 03dbc80cf8..00d19ac00d 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 @@ -106,7 +106,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { stmt.setSelect(query); } else { for (;;) { - if (lexer.identifierEquals(FnvHash.Constants.FULLTEXT)) { + if (lexer.token() == Token.FULLTEXT) { Lexer.SavePoint mark = lexer.mark(); lexer.nextToken(); if (lexer.token() == Token.KEY) { @@ -119,8 +119,51 @@ public class MySqlCreateTableParser extends SQLCreateTableParser { lexer.nextToken(); continue; } + } else if (lexer.token() == Token.INDEX) { + lexer.nextToken(); + MySqlTableIndex idx = new MySqlTableIndex(); + idx.setIndexType("FULLTEXT"); + idx.setName(this.exprParser.name()); + + accept(Token.LPAREN); + for (; ; ) { + idx.addColumn(this.exprParser.parseSelectOrderByItem()); + if (!(lexer.token() == (Token.COMMA))) { + break; + } else { + lexer.nextToken(); + } + } + stmt.getTableElementList().add(idx); + accept(Token.RPAREN); + if (lexer.token() == Token.RPAREN) { + break; + } else if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + continue; + } } else { - lexer.reset(mark); + MySqlTableIndex idx = new MySqlTableIndex(); + idx.setIndexType("FULLTEXT"); + idx.setName(this.exprParser.name()); + + accept(Token.LPAREN); + for (; ; ) { + idx.addColumn(this.exprParser.parseSelectOrderByItem()); + if (!(lexer.token() == (Token.COMMA))) { + break; + } else { + lexer.nextToken(); + } + } + stmt.getTableElementList().add(idx); + accept(Token.RPAREN); + if (lexer.token() == Token.RPAREN) { + break; + } else if (lexer.token() == Token.COMMA) { + lexer.nextToken(); + continue; + } } } else if (lexer.identifierEquals(FnvHash.Constants.SPATIAL)) { Lexer.SavePoint mark = lexer.mark(); diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java index 1f61cb122a..c559b25cd2 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlLexer.java @@ -64,6 +64,7 @@ public class MySqlLexer extends Lexer { map.put("MOD", Token.MOD); map.put("CONTAINS", Token.CONTAINS); map.put("RLIKE", Token.RLIKE); + map.put("FULLTEXT", Token.FULLTEXT); DEFAULT_MYSQL_KEYWORDS = new Keywords(map); } diff --git a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java index 0b6b0663fb..845b28cbd5 100644 --- a/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/dialect/mysql/parser/MySqlStatementParser.java @@ -65,7 +65,6 @@ public class MySqlStatementParser extends SQLStatementParser { private static final String TABLES = "TABLES"; private static final String TEMPORARY = "TEMPORARY"; private static final String SPATIAL = "SPATIAL"; - private static final String FULLTEXT = "FULLTEXT"; private static final String LOW_PRIORITY = "LOW_PRIORITY"; private static final String CONNECTION = "CONNECTION"; private static final String EXTENDED = "EXTENDED"; @@ -258,7 +257,7 @@ public class MySqlStatementParser extends SQLStatementParser { return parseCreateDatabase(); } - if (lexer.token() == Token.UNIQUE || lexer.token() == Token.INDEX || lexer.identifierEquals(FULLTEXT) + if (lexer.token() == Token.UNIQUE || lexer.token() == Token.INDEX || lexer.token() == Token.FULLTEXT || lexer.identifierEquals(SPATIAL)) { if (replace) { lexer.reset(markBp, markChar, Token.CREATE); @@ -505,8 +504,8 @@ public class MySqlStatementParser extends SQLStatementParser { if (lexer.token() == Token.UNIQUE) { stmt.setType("UNIQUE"); lexer.nextToken(); - } else if (lexer.identifierEquals(FULLTEXT)) { - stmt.setType(FULLTEXT); + } else if (lexer.token() == Token.FULLTEXT) { + stmt.setType("FULLTEXT"); lexer.nextToken(); } else if (lexer.identifierEquals(SPATIAL)) { stmt.setType(SPATIAL); @@ -3463,7 +3462,7 @@ public class MySqlStatementParser extends SQLStatementParser { lexer.nextToken(); parseAlterTableAddColumn(stmt); } else if (lexer.token() == Token.INDEX - || lexer.identifierEquals(FnvHash.Constants.FULLTEXT) + || lexer.token() == Token.FULLTEXT || lexer.identifierEquals(FnvHash.Constants.SPATIAL)) { SQLAlterTableAddIndex item = parseAlterTableAddIndex(); item.setParent(stmt); diff --git a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java index a44c3dd1a4..1466043612 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java +++ b/src/main/java/com/alibaba/druid/sql/parser/SQLStatementParser.java @@ -2804,7 +2804,7 @@ public class SQLStatementParser extends SQLParser { protected SQLAlterTableAddIndex parseAlterTableAddIndex() { SQLAlterTableAddIndex item = new SQLAlterTableAddIndex(); - if (lexer.identifierEquals(FnvHash.Constants.FULLTEXT)) { + if (lexer.token == Token.FULLTEXT) { lexer.nextToken(); item.setType("FULLTEXT"); } else if (lexer.identifierEquals(FnvHash.Constants.SPATIAL)) { diff --git a/src/main/java/com/alibaba/druid/sql/parser/Token.java b/src/main/java/com/alibaba/druid/sql/parser/Token.java index fd9f07cdd8..a3a28bee92 100644 --- a/src/main/java/com/alibaba/druid/sql/parser/Token.java +++ b/src/main/java/com/alibaba/druid/sql/parser/Token.java @@ -102,6 +102,7 @@ public enum Token { IN("IN"), CONTAINS("CONTAINS"), RLIKE("RLIKE"), + FULLTEXT("FULLTEXT"), NEW("NEW"), ASC("ASC"), diff --git a/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest112.java b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest112.java new file mode 100644 index 0000000000..d439a6d871 --- /dev/null +++ b/src/test/java/com/alibaba/druid/bvt/sql/mysql/createTable/MySqlCreateTableTest112.java @@ -0,0 +1,50 @@ +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.ast.statement.SQLColumnDefinition; +import com.alibaba.druid.sql.dialect.mysql.ast.statement.MySqlCreateTableStatement; +import com.alibaba.druid.sql.dialect.mysql.parser.MySqlStatementParser; +import com.alibaba.druid.sql.visitor.SchemaStatVisitor; +import com.alibaba.druid.util.JdbcConstants; + +import java.util.List; + +public class MySqlCreateTableTest112 extends MysqlTest { + + public void test_0() throws Exception { + String sql = "CREATE TABLE opening_lines ( " + + "id INT UNSIGNED AUTO_INCREMENT NOT NULL PRIMARY KEY" + + ", opening_line TEXT(500)" + + ", author VARCHAR(200)" + + ", title VARCHAR(200)" + + ", FULLTEXT idx (opening_line) " + + ") ENGINE=InnoDB;"; + + MySqlStatementParser parser = new MySqlStatementParser(sql); + List statementList = parser.parseStatementList(); + MySqlCreateTableStatement stmt = (MySqlCreateTableStatement)statementList.get(0); + + assertEquals(1, statementList.size()); + assertEquals(5, stmt.getTableElementList().size()); + + assertEquals("CREATE TABLE opening_lines (\n" + + "\tid INT UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,\n" + + "\topening_line TEXT(500),\n" + + "\tauthor VARCHAR(200),\n" + + "\ttitle VARCHAR(200),\n" + + "\tFULLTEXT INDEX idx(opening_line)\n" + + ") ENGINE = InnoDB;", stmt.toString()); + + SchemaStatVisitor v = SQLUtils.createSchemaStatVisitor(JdbcConstants.MYSQL); + stmt.accept(v); + + assertEquals(4, v.getColumns().size()); + SQLColumnDefinition column = stmt.getColumn("id"); + assertNotNull(column); + assertEquals(2, column.getConstraints().size()); + assertTrue(column.isPrimaryKey()); + } + +} \ No newline at end of file