fix(query): fix create table tuple default value painc (datafuselabs#…

…13946) * fix(query): fix create table tuple default value painc * add tests * fix * fix tests
getong · Dec 7, 2023 · 50a1b39 · 50a1b39
1 parent 526f904
commit 50a1b39
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 16 deletions.
diff --git a/src/query/expression/src/evaluator.rs b/src/query/expression/src/evaluator.rs
@@ -586,17 +586,40 @@ impl<'a> Evaluator<'a> {
             },
             (DataType::Array(inner_src_ty), DataType::Array(inner_dest_ty)) => match value {
                 Value::Scalar(Scalar::Array(array)) => {
-                    let new_array = self
-                        .run_try_cast(span, inner_src_ty, inner_dest_ty, Value::Column(array))?
-                        .into_column()
-                        .unwrap();
+                    let new_array = if inner_dest_ty.is_nullable() {
+                        self.run_try_cast(span, inner_src_ty, inner_dest_ty, Value::Column(array))?
+                    } else {
+                        self.run_cast(
+                            span,
+                            inner_src_ty,
+                            inner_dest_ty,
+                            Value::Column(array),
+                            None,
+                        )?
+                    }
+                    .into_column()
+                    .unwrap();
                     Ok(Value::Scalar(Scalar::Array(new_array)))
                 }
                 Value::Column(Column::Array(col)) => {
-                    let new_values = self
-                        .run_try_cast(span, inner_src_ty, inner_dest_ty, Value::Column(col.values))?
-                        .into_column()
-                        .unwrap();
+                    let new_values = if inner_dest_ty.is_nullable() {
+                        self.run_try_cast(
+                            span,
+                            inner_src_ty,
+                            inner_dest_ty,
+                            Value::Column(col.values),
+                        )?
+                    } else {
+                        self.run_cast(
+                            span,
+                            inner_src_ty,
+                            inner_dest_ty,
+                            Value::Column(col.values),
+                            None,
+                        )?
+                    }
+                    .into_column()
+                    .unwrap();
                     let new_col = Column::Array(Box::new(ArrayColumn {
                         values: new_values,
                         offsets: col.offsets,
@@ -656,10 +679,20 @@ impl<'a> Evaluator<'a> {
                             .zip(fields_src_ty.iter())
                             .zip(fields_dest_ty.iter())
                             .map(|((field, src_ty), dest_ty)| {
-                                Ok(self
-                                    .run_try_cast(span, src_ty, dest_ty, Value::Scalar(field))?
-                                    .into_scalar()
-                                    .unwrap())
+                                let new_value = if dest_ty.is_nullable() {
+                                    self.run_try_cast(span, src_ty, dest_ty, Value::Scalar(field))?
+                                } else {
+                                    self.run_cast(
+                                        span,
+                                        src_ty,
+                                        dest_ty,
+                                        Value::Scalar(field),
+                                        None,
+                                    )?
+                                }
+                                .into_scalar()
+                                .unwrap();
+                                Ok(new_value)
                             })
                             .collect::<Result<_>>()?;
                         Ok(Value::Scalar(Scalar::Tuple(new_fields)))
@@ -670,10 +703,20 @@ impl<'a> Evaluator<'a> {
                             .zip(fields_src_ty.iter())
                             .zip(fields_dest_ty.iter())
                             .map(|((field, src_ty), dest_ty)| {
-                                Ok(self
-                                    .run_try_cast(span, src_ty, dest_ty, Value::Column(field))?
-                                    .into_column()
-                                    .unwrap())
+                                let new_column = if dest_ty.is_nullable() {
+                                    self.run_try_cast(span, src_ty, dest_ty, Value::Column(field))?
+                                } else {
+                                    self.run_cast(
+                                        span,
+                                        src_ty,
+                                        dest_ty,
+                                        Value::Column(field),
+                                        None,
+                                    )?
+                                }
+                                .into_column()
+                                .unwrap();
+                                Ok(new_column)
                             })
                             .collect::<Result<_>>()?;
                         let new_col = Column::Tuple(new_fields);

diff --git a/tests/sqllogictests/suites/base/05_ddl/05_0000_ddl_create_tables.test b/tests/sqllogictests/suites/base/05_ddl/05_0000_ddl_create_tables.test
@@ -237,6 +237,25 @@ use db2
 statement ok
 create table test9 like test8
 
+statement ok
+create table test10(a int, b tuple(int, int) default (1, 2), c array(int) default [10,20])
+
+query TTTTT
+desc test10
+----
+a INT YES NULL (empty)
+b TUPLE(1 INT32, 2 INT32) YES (1, 2) (empty)
+c ARRAY(INT32) YES [10, 20] (empty)
+
+statement ok
+insert into test10 (a) values (100),(200)
+
+query ITT
+select * from test10
+----
+100 (1,2) [10,20]
+200 (1,2) [10,20]
+
 statement ok
 use default