Merge pull request #7525 from xudong963/fix_using_0

fix: change generated alias name for scalar expression to lowercase

Author: mergify[bot]

src/query/service/src/sql/planner/binder/project.rs

@@ -220,7 +220,7 @@ impl<'a> Binder {
                     // If alias is not specified, we will generate a name for the scalar expression.
                     let expr_name = match alias {
                         Some(alias) => normalize_identifier(alias, &self.name_resolution_ctx).name,
-                        None => format!("{:#}", expr),
+                        None => format!("{:#}", expr).to_lowercase(),
                     };
 
                     output.items.push(SelectItem {

src/query/service/tests/it/interpreters/interpreter_show_engines.rs

@@ -34,7 +34,7 @@ async fn test_show_engines_interpreter() -> Result<()> {
         let result = stream.try_collect::<Vec<_>>().await?;
         let expected = vec![
             "+--------+-----------------------------+",
-            "| Engine | Comment                     |",
+            "| engine | comment                     |",
             "+--------+-----------------------------+",
             "| FUSE   | FUSE Storage Engine         |",
             "| MEMORY | MEMORY Storage Engine       |",

src/query/service/tests/it/interpreters/interpreter_table_recluster.rs

@@ -107,7 +107,7 @@ async fn test_alter_recluster_interpreter() -> Result<()> {
         let result = stream.try_collect::<Vec<_>>().await?;
         let expected = vec![
             "+----------+",
-            "| COUNT(*) |",
+            "| count(*) |",
             "+----------+",
             "| 4        |",
             "+----------+",

src/query/service/tests/it/storages/fuse/operations/optimize.rs

@@ -95,7 +95,7 @@ async fn test_fuse_snapshot_optimize_compact() -> Result<()> {
     // there should be 6 history items there, 5 for the above insertions, 1 for that compaction
     let expected = vec![
         "+----------+",
-        "| COUNT(*) |",
+        "| count(*) |",
         "+----------+",
         "| 6        |",
         "+----------+",

tests/logictest/suites/base/15_query/case_sensitivity/join.test

@@ -22,3 +22,17 @@ select * from t join t t1 using(A, "A");
 statement ok
 drop table t;
 
+statement ok
+create table t(A int);
+
+statement ok
+insert into t values(1);
+
+statement query I
+select A from (select A from t) t1 join (select A from t) t2 using(A);
+
+----
+1
+
+statement ok
+drop table t;

tests/logictest/suites/mode/standalone/explain/fold_count.test

@@ -9,7 +9,7 @@ explain select count(*) from t;
 
 ----
 Project
-├── columns: [COUNT(*) (#1)]
+├── columns: [count(*) (#1)]
 └── EvalScalar
     ├── expressions: [COUNT(*) (#2)]
     └── EvalScalar
@@ -24,7 +24,7 @@ explain select count(*) from t;
 
 ----
 Project
-├── columns: [COUNT(*) (#1)]
+├── columns: [count(*) (#1)]
 └── EvalScalar
     ├── expressions: [COUNT(*) (#2)]
     └── EvalScalar
@@ -36,7 +36,7 @@ explain select count(*) from t where number > 10;
 
 ----
 Project
-├── columns: [COUNT(*) (#1)]
+├── columns: [count(*) (#1)]
 └── EvalScalar
     ├── expressions: [COUNT(*) (#2)]
     └── AggregateFinal

tests/logictest/suites/mode/standalone/explain/limit.test

@@ -70,14 +70,14 @@ Limit
             ├── group by: [number]
             ├── aggregate functions: []
             └── Filter
-                ├── filters: [=(numbers.number (#0), CAST(if(is_not_null(COUNT(*) (#4)), COUNT(*) (#4), 0) AS BIGINT UNSIGNED))]
+                ├── filters: [=(numbers.number (#0), CAST(if(is_not_null(count(*) (#4)), count(*) (#4), 0) AS BIGINT UNSIGNED))]
                 └── HashJoin
                     ├── join type: SINGLE
                     ├── build keys: [number (#6)]
                     ├── probe keys: [numbers.number (#0)]
                     ├── filters: []
                     ├── Project(Build)
-                    │   ├── columns: [COUNT(*) (#4), number (#6)]
+                    │   ├── columns: [count(*) (#4), number (#6)]
                     │   └── EvalScalar
                     │       ├── expressions: [COUNT(*) (#5)]
                     │       └── AggregateFinal

tests/logictest/suites/mode/standalone/explain/prune_column.test

@@ -104,14 +104,14 @@ explain select t1.a from (select number + 1 as a, number + 1 as b from numbers(1
 Project
 ├── columns: [a (#1)]
 └── Filter
-    ├── filters: [=(a (#1), COUNT(*) (#21))]
+    ├── filters: [=(a (#1), count(*) (#21))]
     └── HashJoin
         ├── join type: SINGLE
         ├── build keys: []
         ├── probe keys: []
         ├── filters: []
         ├── Project(Build)
-        │   ├── columns: [COUNT(*) (#21)]
+        │   ├── columns: [count(*) (#21)]
         │   └── EvalScalar
         │       ├── expressions: [COUNT(*) (#22)]
         │       └── AggregateFinal

tests/logictest/suites/mode/standalone/explain/subquery.test

@@ -5,14 +5,14 @@ explain select t.number from numbers(1) as t, numbers(1) as t1 where t.number =
 Project
 ├── columns: [number (#0)]
 └── Filter
-    ├── filters: [=(numbers.number (#0), CAST(if(is_not_null(COUNT(*) (#4)), COUNT(*) (#4), 0) AS BIGINT UNSIGNED))]
+    ├── filters: [=(numbers.number (#0), CAST(if(is_not_null(count(*) (#4)), count(*) (#4), 0) AS BIGINT UNSIGNED))]
     └── HashJoin
         ├── join type: SINGLE
         ├── build keys: [number (#6)]
         ├── probe keys: [numbers.number (#0)]
         ├── filters: []
         ├── Project(Build)
-        │   ├── columns: [COUNT(*) (#4), number (#6)]
+        │   ├── columns: [count(*) (#4), number (#6)]
         │   └── EvalScalar
         │       ├── expressions: [COUNT(*) (#5)]
         │       └── AggregateFinal
@@ -366,14 +366,14 @@ explain select t.number from numbers(1) as t, numbers(1) as t1 where (select cou
 Project
 ├── columns: [number (#0)]
 └── Filter
-    ├── filters: [CAST(if(is_not_null(COUNT(*) = 1 (#3)), COUNT(*) = 1 (#3), 0) AS BIGINT UNSIGNED)]
+    ├── filters: [CAST(if(is_not_null(count(*) = 1 (#3)), count(*) = 1 (#3), 0) AS BIGINT UNSIGNED)]
     └── HashJoin
         ├── join type: SINGLE
         ├── build keys: [number (#5)]
         ├── probe keys: [numbers.number (#0)]
         ├── filters: []
         ├── Project(Build)
-        │   ├── columns: [COUNT(*) = 1 (#3), number (#5)]
+        │   ├── columns: [count(*) = 1 (#3), number (#5)]
         │   └── EvalScalar
         │       ├── expressions: [=(COUNT(*) (#4), 1)]
         │       └── AggregateFinal

tests/suites/0_stateless/14_clickhouse_http_handler/14_0002_select_formats.result

@@ -11,35 +11,35 @@ regexp_like(\'fo\nfo\', \'^fo$\')
 Boolean
 0
 ----NDJSON
-{"number":0,"number::STRING":"0"}
-{"number":1,"number::STRING":"1"}
+{"number":0,"number::string":"0"}
+{"number":1,"number::string":"1"}
 ----JSONEachRow
-{"number":0,"number::STRING":"0"}
-{"number":1,"number::STRING":"1"}
+{"number":0,"number::string":"0"}
+{"number":1,"number::string":"1"}
 ----JSONStringsEachRow
-{"number":"0","number::STRING":"0"}
-{"number":"1","number::STRING":"1"}
+{"number":"0","number::string":"0"}
+{"number":"1","number::string":"1"}
 ----JSONCompactEachRow
 [0,"0"]
 [1,"1"]
 ----JSONCompactEachRowWithNames
-["number","number::STRING"]
+["number","number::string"]
 [0,"0"]
 [1,"1"]
 ----JSONCompactEachRowWithNamesAndTypes
-["number","number::STRING"]
+["number","number::string"]
 ["UInt64","String"]
 [0,"0"]
 [1,"1"]
 ----JSONCompactStringsEachRow
 ["0","0"]
 ["1","1"]
 ----JSONCompactStringsEachRowWithNames
-["number","number::STRING"]
+["number","number::string"]
 ["0","0"]
 ["1","1"]
 ----JSONCompactStringsEachRowWithNamesAndTypes
-["number","number::STRING"]
+["number","number::string"]
 ["UInt64","String"]
 ["0","0"]
 ["1","1"]