improve parser

This commit is contained in:
wenshao
2013-04-19 16:58:26 +08:00
parent eb8d3d32ad
commit 7715fe152a
5 changed files with 71 additions and 2 deletions
@@ -76,7 +76,7 @@ public class MySqlCreateTableParser extends SQLCreateTableParser {
lexer.nextToken();
for (;;) {
if (lexer.token() == Token.IDENTIFIER) {
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 //
@@ -146,6 +146,7 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
boolean flag0 = false;
boolean flag1 = false;
boolean flag2 = false;
boolean flag3 = false;
for (int i = 0; i < ident.length(); ++i) {
final char ch = ident.charAt(i);
if (ch == '\"') {
@@ -154,6 +155,8 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
flag1 = true;
} else if (ch == ' ') {
flag2 = true;
} else if (ch == '\'') {
flag3 = true;
}
}
if (flag0) {
@@ -167,6 +170,10 @@ public class SchemaStatVisitor extends SQLASTVisitorAdapter {
if (flag2) {
ident = ident.replaceAll(" ", "");
}
if (flag3) {
ident = ident.replaceAll("'", "");
}
ident = aliasWrap(ident);
@@ -469,7 +469,7 @@ public abstract class WallProvider {
violations.addAll(visitor.getViolations());
}
if (context != null && context.getWarnnings() >= 2) {
if (visitor.getViolations().size() == 0 && context != null && context.getWarnnings() >= 2) {
if (context.getDeleteNoneConditionWarnnings() > 0) {
violations.add(new IllegalSQLObjectViolation(ErrorCode.NONE_CONDITION, "delete none condition", sql));
} else if (context.getUpdateNoneConditionWarnnings() > 0) {
@@ -1180,6 +1180,11 @@ public class WallVisitorUtils {
if (name.startsWith("\"") && name.endsWith("\"")) {
name = name.substring(1, name.length() - 1);
}
if (name.startsWith("'") && name.endsWith("'")) {
name = name.substring(1, name.length() - 1);
}
if (name.startsWith("`") && name.endsWith("`")) {
name = name.substring(1, name.length() - 1);
}