fix(query): fix binary default string (#16345)

* fix(query): fix binary default string * fix(query): fix inf display * fix(query): fix inf display * fix(query): fix try cast * fix(query): fix * fix(query): fix
databendlabs · Aug 29, 2024 · a5c4129 · a5c4129
1 parent 9d706f4
commit a5c4129
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 2 deletions.
diff --git a/src/query/expression/src/utils/display.rs b/src/query/expression/src/utils/display.rs
@@ -773,7 +773,30 @@ impl<Index: ColumnIndex> Expr<Index> {
         #[recursive::recursive]
         fn write_expr<Index: ColumnIndex>(expr: &Expr<Index>, min_precedence: usize) -> String {
             match expr {
-                Expr::Constant { scalar, .. } => scalar.as_ref().to_string(),
+                Expr::Constant { scalar, .. } => match scalar {
+                    s @ Scalar::Binary(_) => format!("from_hex('{s}')::string"),
+                    Scalar::Number(NumberScalar::Float32(f)) if f.is_nan() => {
+                        "'nan'::Float32".to_string()
+                    }
+                    Scalar::Number(NumberScalar::Float64(f)) if f.is_nan() => {
+                        "'nan'::Float64".to_string()
+                    }
+                    Scalar::Number(NumberScalar::Float32(f)) if f.is_infinite() => {
+                        if *f != f32::NEG_INFINITY {
+                            "'inf'::Float32".to_string()
+                        } else {
+                            "'-inf'::Float32".to_string()
+                        }
+                    }
+                    Scalar::Number(NumberScalar::Float64(f)) if f.is_infinite() => {
+                        if *f != f64::NEG_INFINITY {
+                            "'inf'::Float64".to_string()
+                        } else {
+                            "'-inf'::Float64".to_string()
+                        }
+                    }
+                    other => other.as_ref().to_string(),
+                },
                 Expr::ColumnRef { display_name, .. } => display_name.clone(),
                 Expr::Cast {
                     is_try,

diff --git a/src/query/sql/src/planner/expression_parser.rs b/src/query/sql/src/planner/expression_parser.rs
@@ -268,6 +268,7 @@ pub fn parse_default_expr_to_string(
     } else {
         (expr, false)
     };
+
     Ok((expr.sql_display(), is_deterministic))
 }
 

diff --git a/tests/sqllogictests/suites/base/03_common/03_0041_insert_into_binary.test b/tests/sqllogictests/suites/base/03_common/03_0041_insert_into_binary.test
@@ -46,5 +46,16 @@ SELECT id, v FROM t1 order by id
 3 616161
 4 616161
 
+statement ok
+create table t2(a int, b binary NOT NULL DEFAULT 'abc', c double default 'inf', e float default 'nan' );
+
+statement ok
+insert into t2 (a) values (3);
+
+query ITTT
+select a, b::string, c, e from t2;
+----
+3 abc Infinity NaN
+
 statement ok
 DROP DATABASE db_binary
diff --git a/tests/suites/1_stateful/09_http_handler/09_0000_invalid_utf8.result b/tests/suites/1_stateful/09_http_handler/09_0000_invalid_utf8.result
@@ -1,2 +1,2 @@
-Error: APIError: ResponseError with 1006: invalid utf8 sequence while evaluating function `to_string(D00C)` in expr `to_string()`, during run expr: `CAST(D00C AS String NULL)`
+Error: APIError: ResponseError with 1006: invalid utf8 sequence while evaluating function `to_string(D00C)` in expr `to_string()`, during run expr: `CAST(from_hex('D00C')::string AS String NULL)`
 null