improve wall filter

This commit is contained in:
wenshao
2013-04-09 14:27:24 +08:00
parent 0e7d1322e4
commit c814766889
13 changed files with 170 additions and 17 deletions
@@ -47,6 +47,7 @@ public class MySqlLexer extends Lexer {
map.put("LIMIT", Token.LIMIT);
map.put("TRUE", Token.TRUE);
map.put("BINARY", Token.BINARY);
map.put("SHOW", Token.SHOW);
DEFAULT_MYSQL_KEYWORDS = new Keywords(map);
}
@@ -173,7 +173,6 @@ public class MySqlStatementParser extends SQLStatementParser {
private static final String USER = "USER";
private static final String SPATIAL = "SPATIAL";
private static final String FULLTEXT = "FULLTEXT";
private static final String REPLACE = "REPLACE";
private static final String DELAYED = "DELAYED";
private static final String LOW_PRIORITY = "LOW_PRIORITY";
@@ -306,7 +305,7 @@ public class MySqlStatementParser extends SQLStatementParser {
boolean replace = false;
if (lexer.token() == Token.OR) {
lexer.nextToken();
acceptIdentifier("REPLACE");
accept(Token.REPLACE);
replace = true;
}
@@ -544,7 +543,7 @@ public class MySqlStatementParser extends SQLStatementParser {
return true;
}
if (identifierEquals(REPLACE)) {
if (lexer.token() == Token.REPLACE) {
MySqlReplaceStatement stmt = parseReplicate();
statementList.add(stmt);
return true;
@@ -556,7 +555,7 @@ public class MySqlStatementParser extends SQLStatementParser {
return true;
}
if (identifierEquals("SHOW")) {
if (lexer.token() == Token.SHOW) {
SQLStatement stmt = parseShow();
statementList.add(stmt);
return true;
@@ -639,7 +638,7 @@ public class MySqlStatementParser extends SQLStatementParser {
}
public SQLStatement parseShow() {
acceptIdentifier("SHOW");
accept(Token.SHOW);
if (lexer.token() == Token.COMMENT) {
lexer.nextToken();
@@ -1511,7 +1510,7 @@ public class MySqlStatementParser extends SQLStatementParser {
public MySqlReplaceStatement parseReplicate() {
MySqlReplaceStatement stmt = new MySqlReplaceStatement();
acceptIdentifier(REPLACE);
accept(Token.REPLACE);
if (lexer.token() == Token.COMMENT) {
lexer.nextToken();
@@ -1624,7 +1623,7 @@ public class MySqlStatementParser extends SQLStatementParser {
SQLLiteralExpr fileName = (SQLLiteralExpr) exprParser.expr();
stmt.setFileName(fileName);
if (identifierEquals(REPLACE)) {
if (lexer.token() == Token.REPLACE) {
stmt.setReplicate(true);
lexer.nextToken();
}
@@ -1697,7 +1696,7 @@ public class MySqlStatementParser extends SQLStatementParser {
SQLLiteralExpr fileName = (SQLLiteralExpr) exprParser.expr();
stmt.setFileName(fileName);
if (identifierEquals(REPLACE)) {
if (lexer.token() == Token.REPLACE) {
stmt.setReplicate(true);
lexer.nextToken();
}
@@ -1676,7 +1676,7 @@ public class OracleStatementParser extends SQLStatementParser {
accept(Token.CREATE);
if (lexer.token() == Token.OR) {
lexer.nextToken();
acceptIdentifier("REPLACE");
accept(Token.REPLACE);
stmt.setOrReplace(true);
}
@@ -114,6 +114,8 @@ public class Keywords {
map.put("OVER", Token.OVER);
map.put("TO", Token.TO);
map.put("USE", Token.USE);
map.put("REPLACE", Token.REPLACE);
DEFAULT_KEYWORDS = new Keywords(map);
}
@@ -195,7 +195,7 @@ public class SQLStatementParser extends SQLParser {
continue;
}
if (identifierEquals("SHOW")) {
if (lexer.token() == Token.SHOW) {
SQLStatement stmt = parseShow();
statementList.add(stmt);
@@ -489,7 +489,7 @@ public class SQLStatementParser extends SQLParser {
return parseCreateSequence(false);
} else if (token == Token.OR) {
lexer.nextToken();
acceptIdentifier("REPLACE");
accept(Token.REPLACE);
if (lexer.token() == Token.PROCEDURE) {
lexer.reset(markBp, markChar, Token.CREATE);
return parseCreateProcedure();
@@ -651,7 +651,7 @@ public class SQLStatementParser extends SQLParser {
if (lexer.token() == Token.OR) {
lexer.nextToken();
acceptIdentifier("REPLACE");
accept(Token.REPLACE);
createView.setOrReplace(true);
}
@@ -107,6 +107,8 @@ public enum Token {
PASSWORD("PASSWORD"),
DUAL("DUAL"),
BINARY("BINARY"),
SHOW("SHOW"),
REPLACE("REPLACE"),
//postgresql
WINDOW("WINDOW"),