mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
improved sql paser for mysql. issue #2611
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -24,4 +24,5 @@ public interface SQLUniqueConstraint extends SQLConstraint {
|
||||
List<SQLSelectOrderByItem> getColumns();
|
||||
|
||||
boolean containsColumn(String column);
|
||||
boolean containsColumn(long columnNameHash);
|
||||
}
|
||||
|
||||
+45
-2
@@ -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);
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
@@ -102,6 +102,7 @@ public enum Token {
|
||||
IN("IN"),
|
||||
CONTAINS("CONTAINS"),
|
||||
RLIKE("RLIKE"),
|
||||
FULLTEXT("FULLTEXT"),
|
||||
|
||||
NEW("NEW"),
|
||||
ASC("ASC"),
|
||||
|
||||
Reference in New Issue
Block a user