imporved sql parser. improved h2 support. for issue #1941 #1942

This commit is contained in:
wenshao
2017-09-10 16:11:19 +08:00
parent 61794c4c19
commit 19501d678d
52 changed files with 922 additions and 370 deletions
@@ -23,6 +23,7 @@ import com.alibaba.druid.sql.ast.expr.*;
import com.alibaba.druid.sql.ast.statement.*;
import com.alibaba.druid.sql.dialect.db2.visitor.DB2OutputVisitor;
import com.alibaba.druid.sql.dialect.db2.visitor.DB2SchemaStatVisitor;
import com.alibaba.druid.sql.dialect.h2.visitor.H2OutputVisitor;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlOutputVisitor;
import com.alibaba.druid.sql.dialect.mysql.visitor.MySqlSchemaStatVisitor;
import com.alibaba.druid.sql.dialect.odps.visitor.OdpsOutputVisitor;
@@ -43,6 +44,11 @@ import com.alibaba.druid.support.logging.LogFactory;
import com.alibaba.druid.util.*;
public class SQLUtils {
private final static SQLParserFeature[] FORMAT_DEFAULT_FEATURES = {
SQLParserFeature.KeepComments,
SQLParserFeature.EnableSQLBinaryOpExprGroup
};
public static FormatOption DEFAULT_FORMAT_OPTION = new FormatOption(true, true);
public static FormatOption DEFAULT_LCASE_FORMAT_OPTION
= new FormatOption(false, true);
@@ -234,13 +240,8 @@ public class SQLUtils {
public static String format(String sql, String dbType, List<Object> parameters, FormatOption option) {
try {
SQLParserFeature[] features = {SQLParserFeature.KeepComments, SQLParserFeature.EnableSQLBinaryOpExprGroup};
SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType, features);
parser.setKeepComments(true);
SQLStatementParser parser = SQLParserUtils.createSQLStatementParser(sql, dbType, FORMAT_DEFAULT_FEATURES);
List<SQLStatement> statementList = parser.parseStatementList();
return toSQLString(statementList, dbType, parameters, option);
} catch (ParserException ex) {
LOG.warn("format error", ex);
@@ -363,8 +364,7 @@ public class SQLUtils {
}
if (JdbcConstants.MYSQL.equals(dbType) //
|| JdbcConstants.MARIADB.equals(dbType) //
|| JdbcConstants.H2.equals(dbType)) {
|| JdbcConstants.MARIADB.equals(dbType)) {
return new MySqlOutputVisitor(out);
}
@@ -384,6 +384,10 @@ public class SQLUtils {
return new OdpsOutputVisitor(out);
}
if (JdbcConstants.H2.equals(dbType)) {
return new H2OutputVisitor(out);
}
return new SQLASTOutputVisitor(out, dbType);
}