mirror of
https://github.com/alibaba/druid.git
synced 2023-03-04 19:17:16 +00:00
Merge branch 'master' into support_oceanbase_dbtype
This commit is contained in:
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user