fix

Author: andylokandy

src/query/sql/src/planner/binder/aggregate.rs

@@ -249,7 +249,7 @@ impl<'a> AggregateRewriter<'a> {
         // grouping(b, a) will be rewritten to grouping<1, 0>(grouping_id).
         let mut replaced_params = Vec::with_capacity(function.arguments.len());
         for arg in &function.arguments {
-            if let Some(index) = agg_info.group_items_map.get(&format!("{:?}", arg)) {
+            if let Some(index) = agg_info.group_items_map.get(arg) {
                 replaced_params.push(*index);
             } else {
                 return Err(ErrorCode::BadArguments(
@@ -259,9 +259,11 @@ impl<'a> AggregateRewriter<'a> {
         }
 
         let replaced_func = FunctionCall {
+            span: function.span,
             func_name: function.func_name.clone(),
             params: replaced_params,
             arguments: vec![ScalarExpr::BoundColumnRef(BoundColumnRef {
+                span: function.span,
                 column: grouping_id_column,
             })],
         };
@@ -434,12 +436,10 @@ impl Binder {
         let index = grouping_id_column.index;
         agg_info.grouping_id_column = Some(grouping_id_column.clone());
         agg_info.group_items_map.insert(
-            format!(
-                "{:?}",
-                ScalarExpr::BoundColumnRef(BoundColumnRef {
-                    column: grouping_id_column.clone()
-                })
-            ),
+            ScalarExpr::BoundColumnRef(BoundColumnRef {
+                span: None,
+                column: grouping_id_column.clone(),
+            }),
             agg_info.group_items.len(),
         );
         agg_info.group_items.push(ScalarItem {

src/query/sql/src/planner/semantic/type_check.rs

@@ -1006,6 +1006,7 @@ impl<'a> TypeChecker<'a> {
             // `grouping` will be rewritten again after resolving grouping sets.
             return Ok(Box::new((
                 ScalarExpr::FunctionCall(FunctionCall {
+                    span,
                     params: vec![],
                     arguments: args,
                     func_name: "grouping".to_string(),

tests/suites/0_stateless/20+_others/20_0013_pretty_error.result

@@ -0,0 +1,54 @@
+ERROR 1105 (HY000) at line 1: Code: 1065, displayText = error: 
+  --> SQL:1:8
+  |
+1 | select *
+  |        ^ SELECT * with no tables specified is not valid
+
+.
+ERROR 1105 (HY000) at line 1: Code: 1025, displayText = error: 
+  --> SQL:1:15
+  |
+1 | select * from t
+  |               ^ Unknown table 't'
+
+.
+ERROR 1105 (HY000) at line 1: Code: 1008, displayText = error: 
+  --> SQL:1:8
+  |
+1 | select base64(1)
+  |        ^^^^^^^^^ no function matches the given name: base64
+
+.
+ERROR 1105 (HY000) at line 1: Code: 1065, displayText = error: 
+  --> SQL:1:8
+  |
+1 | select to_base64(1)
+  |        ^^^^^^^^^^^^ no overload satisfies `to_base64(UInt8)`
+
+has tried possible overloads:
+  to_base64(String) :: String            : unable to unify `UInt8` with `String`
+  to_base64(String NULL) :: String NULL  : unable to unify `UInt8` with `String`
+
+.
+ERROR 1105 (HY000) at line 1: Code: 1001, displayText = error: 
+  --> SQL:1:12
+  |
+1 | select 1 + 'a'
+  |            ^^^ invalid digit found in string while evaluating function `to_uint8("a")`
+
+.
+ERROR 1105 (HY000) at line 1: Code: 1025, displayText = error: 
+  --> SQL:1:20
+  |
+1 | select t1.a:z from t
+  |                    ^ Unknown table 't'
+
+.
+ERROR 1105 (HY000) at line 1: Code: 2302, displayText = Table 't3' already exists.
+ERROR 1105 (HY000) at line 1: Code: 1065, displayText = error: 
+  --> SQL:1:33
+  |
+1 | select * from t2 join t3 using (c)
+  |                                 ^ column c specified in USING clause does not exist in left table
+
+.

tests/suites/0_stateless/20+_others/20_0013_pretty_error.sh

@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+CURDIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+. "$CURDIR"/../../../shell_env.sh
+
+
+echo "DROP DATABASE IF EXISTS db20_13;" | $MYSQL_CLIENT_CONNECT
+echo "CREATE DATABASE db20_13;" | $MYSQL_CLIENT_CONNECT
+echo "USE db20_13;" | $MYSQL_CLIENT_CONNECT
+
+
+echo "select *;" |  $MYSQL_CLIENT_CONNECT
+echo "select * from t;" |  $MYSQL_CLIENT_CONNECT
+echo "select base64(1);" |  $MYSQL_CLIENT_CONNECT
+echo "select to_base64(1);" | $MYSQL_CLIENT_CONNECT
+echo "select 1 + 'a';" | $MYSQL_CLIENT_CONNECT
+
+echo "create table t1 (a tuple(b int, c int))" | $MYSQL_CLIENT_CONNECT
+echo "select t1.a:z from t" | $MYSQL_CLIENT_CONNECT
+
+echo "create table t2 (a int, b int)" | $MYSQL_CLIENT_CONNECT
+echo "create table t3 (c int, d int)" | $MYSQL_CLIENT_CONNECT
+echo "select * from t2 join t3 using (c)" | $MYSQL_CLIENT_CONNECT
+
+echo "DROP DATABASE db20_13;" | $MYSQL_CLIENT_CONNECT