improve sqlwall: update

This commit is contained in:
Yako
2014-09-04 13:19:55 +08:00
parent fc7f5e016b
commit 54c940b9b9
9 changed files with 233 additions and 2 deletions
@@ -117,6 +117,10 @@ public class SQLUtils {
return format(sql, JdbcUtils.ODPS);
}
public static String formatSQLServer(String sql) {
return format(sql, JdbcUtils.SQL_SERVER);
}
public static String toOracleString(SQLObject sqlObject) {
StringBuilder out = new StringBuilder();
sqlObject.accept(new OracleOutputVisitor(out, false));
@@ -1994,10 +1994,15 @@ public class MySqlStatementParser extends SQLStatementParser {
SQLInsertStatement.ValuesClause values = new SQLInsertStatement.ValuesClause(new ArrayList<SQLExpr>(0));
valueClauseList.add(values);
}
if (lexer.token() != Token.RPAREN) {
throw new ParserException("syntax error");
}
if (!parseCompleteValues && valueClauseList.size() >= parseValuesSize) {
lexer.skipToEOF();
break;
}
lexer.nextTokenComma();
if (lexer.token() == Token.COMMA) {
@@ -123,6 +123,11 @@ public class SQLServerStatementParser extends SQLStatementParser {
insertStatement.getValuesList().add(values);
accept(Token.RPAREN);
if (!parseCompleteValues && insertStatement.getValuesList().size() >= parseValuesSize) {
lexer.skipToEOF();
break;
}
if (lexer.token() == Token.COMMA) {
lexer.nextToken();
continue;
@@ -1053,4 +1053,9 @@ public class Lexer {
public boolean isHasComment() {
return hasComment;
}
public void skipToEOF() {
pos = text.length();
this.token = Token.EOF;
}
}
@@ -85,6 +85,10 @@ public class SQLStatementParser extends SQLParser {
protected SQLExprParser exprParser;
protected boolean parseCompleteValues = true;
protected int parseValuesSize = 3;
public SQLStatementParser(String sql){
this(new SQLExprParser(sql));
}
@@ -1569,4 +1573,21 @@ public class SQLStatementParser extends SQLParser {
accept(Token.RPAREN);
return item;
}
public boolean isParseCompleteValues() {
return parseCompleteValues;
}
public void setParseCompleteValues(boolean parseCompleteValues) {
this.parseCompleteValues = parseCompleteValues;
}
public int getParseValuesSize() {
return parseValuesSize;
}
public void setParseValuesSize(int parseValuesSize) {
this.parseValuesSize = parseValuesSize;
}
}