improved sql paser for mysql. issue #2611

This commit is contained in:
wenshao
2018-05-31 14:32:25 +08:00
parent cf57b62d4c
commit 6c3154e33d
10 changed files with 161 additions and 8 deletions
@@ -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();
@@ -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);
}
@@ -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);