(doris) 01/01: [fix](variable) support all type functions (#39144)

[morrysnow]

This is an automated email from the ASF dual-hosted git repository.

morrysnow pushed a commit to branch 2.1_39144
in repository https://gitbox.apache.org/repos/asf/doris.git

commit 214468d5406814ced338eca7fd4c3f9f6b126a7d
Author: morrySnow <101034200+morrys...@users.noreply.github.com>
AuthorDate: Mon Aug 12 15:20:57 2024 +0800

    [fix](variable) support all type functions (#39144)
    
    pick from master #39144
---
 fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java | 4 ++--
 regression-test/data/nereids_p0/test_user_var.out                | 3 +++
 regression-test/suites/nereids_p0/test_user_var.groovy           | 2 ++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java 
b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
index d9ce2a0a5ae..5bf5f8fc16c 100644
--- a/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
+++ b/fe/fe-core/src/main/java/org/apache/doris/qe/ConnectContext.java
@@ -555,7 +555,7 @@ public class ConnectContext {
             } else if (literalExpr instanceof NullLiteral) {
                 return Literal.of(null);
             } else {
-                return Literal.of("");
+                return Literal.of(literalExpr.getStringValue());
             }
         } else {
             // If there are no such user defined var, just return the NULL 
value.
@@ -585,7 +585,7 @@ public class ConnectContext {
                 desc.setIsNull();
             } else {
                 desc.setType(Type.VARCHAR);
-                desc.setStringValue("");
+                desc.setStringValue(literalExpr.getStringValue());
             }
         } else {
             // If there are no such user defined var, just fill the NULL value.
diff --git a/regression-test/data/nereids_p0/test_user_var.out 
b/regression-test/data/nereids_p0/test_user_var.out
index 5d6338dd7ee..a4508fd738d 100644
--- a/regression-test/data/nereids_p0/test_user_var.out
+++ b/regression-test/data/nereids_p0/test_user_var.out
@@ -17,3 +17,6 @@ true  false
 -- !function --
 4
 
+-- !datetime --
+2007-12-01 00:30:19
+
diff --git a/regression-test/suites/nereids_p0/test_user_var.groovy 
b/regression-test/suites/nereids_p0/test_user_var.groovy
index 35eb8d861d8..7c97387f4bb 100644
--- a/regression-test/suites/nereids_p0/test_user_var.groovy
+++ b/regression-test/suites/nereids_p0/test_user_var.groovy
@@ -23,6 +23,7 @@ suite("test_user_var") {
     sql "SET @c1='H', @c2=''"
     sql "SET @d1=true, @d2=false"
     sql "SET @f1=null"
+    sql "set @dt1 = from_unixtime(1196440219);"
     sql "set @func_1=(abs(1) + 1) * 2"
     sql "set disable_nereids_rules=PRUNE_EMPTY_PARTITION"
 
@@ -33,6 +34,7 @@ suite("test_user_var") {
     qt_boolean 'select @d1, @d2;'
     qt_null_literal 'select @f1, @f2;'
     qt_function 'select @func_1'
+    qt_datetime 'select @dt1'
 
     multi_sql(
         """


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@doris.apache.org
For additional commands, e-mail: commits-h...@doris.apache.org