Fix holo date expr support issue.

lizongbo · Jul 26, 2024 · c86912e · c86912e
1 parent 283c34a
commit c86912e
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 6 deletions.
diff --git a/core/src/main/java/com/alibaba/druid/DbType.java b/core/src/main/java/com/alibaba/druid/DbType.java
@@ -138,7 +138,7 @@ public static DbType of(String name) {
     }
 
     public static boolean isPostgreSQLDbStyle(DbType dbType) {
-        return dbType == DbType.postgresql || dbType == DbType.edb || dbType == DbType.greenplum;
+        return dbType == DbType.postgresql || dbType == DbType.edb || dbType == DbType.greenplum || dbType == DbType.hologres;
     }
     public final boolean equals(String other) {
         return this == of(other);

diff --git a/core/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateExpr.java b/core/src/main/java/com/alibaba/druid/sql/ast/expr/SQLDateExpr.java
@@ -207,6 +207,7 @@ public List<SQLObject> getChildren() {
             DbType.presto,
             DbType.trino,
             DbType.postgresql,
+            DbType.hologres,
             DbType.ads,
             DbType.hive,
             DbType.odps,

diff --git a/core/src/main/java/com/alibaba/druid/sql/dialect/holo/parser/HoloExprParser.java b/core/src/main/java/com/alibaba/druid/sql/dialect/holo/parser/HoloExprParser.java
@@ -8,7 +8,8 @@
 public class HoloExprParser
         extends PGExprParser {
     public HoloExprParser(String sql, SQLParserFeature... features) {
-        super(sql, features);
+        super(new HoloLexer(sql, features));
+        this.lexer.nextToken();
         dbType = DbType.hologres;
     }
 

diff --git a/core/src/main/java/com/alibaba/druid/util/JdbcUtils.java b/core/src/main/java/com/alibaba/druid/util/JdbcUtils.java
@@ -1004,6 +1004,7 @@ public static boolean isPgsqlDbType(DbType dbType) {
             case polardb:
             case greenplum:
             case gaussdb:
+            case hologres:
                 return true;
             default:
                 return false;

diff --git a/core/src/test/resources/bvt/parser/hologres/0.txt b/core/src/test/resources/bvt/parser/hologres/0.txt
@@ -12,10 +12,14 @@ CREATE TABLE blink_demo (
 	id text
 );
 ------------------------------------------------------------------------------------------------------------------------
-create schema schemaname;
+create schema schemaname
 --------------------
-CREATE SCHEMA schemaname;
+CREATE SCHEMA schemaname
 ------------------------------------------------------------------------------------------------------------------------
-set search_path to schemaname;
+set search_path to schemaname
 --------------------
-SET search_path TO schemaname;
+SET search_path TO schemaname
+------------------------------------------------------------------------------------------------------------------------
+select DATEADD(DATE '1970-01-01', 14238, 'dd')
+--------------------
+SELECT DATEADD(DATE '1970-01-01', 14238, 'dd')