refine: substr error (apache#7339)

* refine: substr error * fix format * Update datafusion/expr/src/built_in_function.rs Co-authored-by: jakevin <[email protected]> * Update datafusion/expr/src/built_in_function.rs Co-authored-by: jakevin <[email protected]> * add more tests --------- Co-authored-by: jakevin <[email protected]>
thinh2 · Aug 21, 2023 · 4275e15 · 4275e15
1 parent 25e6c7d
commit 4275e15
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 17 deletions.
diff --git a/datafusion/expr/src/built_in_function.rs b/datafusion/expr/src/built_in_function.rs
@@ -1395,25 +1395,25 @@ macro_rules! make_utf8_to_return_type {
                 DataType::LargeUtf8 => $largeUtf8Type,
                 DataType::Utf8 => $utf8Type,
                 DataType::Null => DataType::Null,
-                DataType::Dictionary(_, value_type) => {
-                    match **value_type {
-                        DataType::LargeUtf8 => $largeUtf8Type,
-                        DataType::Utf8 => $utf8Type,
-                        DataType::Null => DataType::Null,
-                        _ => {
-                            // this error is internal as `data_types` should have captured this.
-                            return internal_err!(
-                                "The {:?} function can only accept strings.",
-                                name
-                            );
-                        }
+                DataType::Dictionary(_, value_type) => match **value_type {
+                    DataType::LargeUtf8 => $largeUtf8Type,
+                    DataType::Utf8 => $utf8Type,
+                    DataType::Null => DataType::Null,
+                    _ => {
+                        // this error is internal as `data_types` should have captured this.
+                        return plan_err!(
+                            "The {:?} function can only accept strings, but got {:?}.",
+                            name,
+                            **value_type
+                        );
                     }
-                }
-                _ => {
+                },
+                data_type => {
                     // this error is internal as `data_types` should have captured this.
-                    return internal_err!(
-                        "The {:?} function can only accept strings.",
-                        name
+                    return plan_err!(
+                        "The {:?} function can only accept strings, but got {:?}.",
+                        name,
+                        data_type
                     );
                 }
             })

diff --git a/datafusion/sqllogictest/test_files/functions.slt b/datafusion/sqllogictest/test_files/functions.slt
@@ -413,6 +413,12 @@ SELECT substr('alphabet', 3, CAST(NULL AS int))
 ----
 NULL
 
+statement error The "substr" function can only accept strings, but got Int64.
+SELECT substr(1, 3)
+
+statement error The "substr" function can only accept strings, but got Int64.
+SELECT substr(1, 3, 4)
+
 query T
 SELECT translate('12345', '143', 'ax')
 ----