Merge branch 'master' into support_oceanbase_dbtype

This commit is contained in:
Hongwei Yi
2020-04-06 21:44:21 +08:00
committed by GitHub
17 changed files with 369 additions and 253 deletions
@@ -1585,11 +1585,7 @@ public class SQLExprParser extends SQLParser {
throw new ParserException("error, " + lexer.info());
}
if (lexer.token == Token.LITERAL_ALIAS) {
name = new SQLPropertyExpr(name, lexer.stringVal());
} else {
name = new SQLPropertyExpr(name, lexer.stringVal());
}
name = new SQLPropertyExpr(name, lexer.stringVal());
lexer.nextToken();
name = nameRest(name);
}
@@ -85,6 +85,8 @@ public class SQLParserUtils {
}
if (JdbcUtils.isPgsqlDbType(dbType)) {
|| JdbcUtils.ENTERPRISEDB.equals(dbType)
|| JdbcUtils.POLARDB.equals(dbType)) {
return new PGSQLStatementParser(sql);
}
@@ -124,7 +126,9 @@ public class SQLParserUtils {
return new MySqlExprParser(sql);
}
if (JdbcUtils.isPgsqlDbType(dbType)) {
if (JdbcUtils.isPgsqlDbType(dbType)
|| JdbcUtils.ENTERPRISEDB.equals(dbType)
|| JdbcUtils.POLARDB.equals(dbType)) {
return new PGExprParser(sql);
}
@@ -156,7 +160,9 @@ public class SQLParserUtils {
return new MySqlLexer(sql);
}
if (JdbcUtils.isPgsqlDbType(dbType)) {
if (JdbcUtils.isPgsqlDbType(dbType)
|| JdbcUtils.ENTERPRISEDB.equals(dbType)
|| JdbcUtils.POLARDB.equals(dbType)) {
return new PGLexer(sql);
}