improved sql parser.

This commit is contained in:
wenshao
2017-11-06 16:58:58 +08:00
parent d94b773de9
commit d6e9cfbd4f
14 changed files with 255 additions and 20 deletions
@@ -2403,7 +2403,7 @@ public class MySqlStatementParser extends SQLStatementParser {
columns.add(cachedColumns2.get(i).clone());
}
}
stmt.setColumnsString(cachedColumns.columnsFormattedString);
stmt.setColumnsString(cachedColumns.columnsFormattedString, cachedColumns.columnsFormattedStringHash);
int p2 = pos + cachedColumns.columnsString.length();
lexer.reset(p2);
lexer.nextToken();
@@ -2467,9 +2467,10 @@ public class MySqlStatementParser extends SQLStatementParser {
outputVisitor.printInsertColumns(columns);
String formattedColumnsString = buf.toString();
long columnsFormattedStringHash = FnvHash.fnv1a_64_lower(formattedColumnsString);
insertColumnsCache.put(tableName.hashCode64(), columnsString, formattedColumnsString, clonedColumns);
stmt.setColumnsString(formattedColumnsString);
stmt.setColumnsString(formattedColumnsString, columnsFormattedStringHash);
}
}
}
@@ -118,7 +118,9 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
String cachedSelectList = x.getCachedSelectList();
if (cachedSelectList != null) {
print0(cachedSelectList);
if (!isEnabled(VisitorFeature.OutputSkipSelectListCacheString)) {
print0(cachedSelectList);
}
} else {
print0(ucase ? "SELECT " : "select ");
@@ -861,7 +863,9 @@ public class MySqlOutputVisitor extends SQLASTOutputVisitor implements MySqlASTV
String columnsString = x.getColumnsString();
if (columnsString != null) {
print0(columnsString);
if (!isEnabled(VisitorFeature.OutputSkipInsertColumnsString)) {
print0(columnsString);
}
} else {
List<SQLExpr> columns = x.getColumns();
if (columns.size() > 0) {