Merge pull request #10656 from SkyFan2002/exclude

fix(exclude): column name case issue

Author: mergify[bot]

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

@@ -168,8 +168,13 @@ impl Binder {
                     // Handle qualified name as select target
                     let mut exclude_cols: HashSet<String> = HashSet::new();
                     if let Some(cols) = exclude {
+                        let is_unquoted_ident_case_sensitive =
+                            self.name_resolution_ctx.unquoted_ident_case_sensitive;
                         for col in cols {
-                            exclude_cols.insert(col.name.clone());
+                            let name = is_unquoted_ident_case_sensitive
+                                .then(|| col.name.clone())
+                                .unwrap_or_else(|| col.name.to_lowercase());
+                            exclude_cols.insert(name);
                         }
                         if exclude_cols.len() < cols.len() {
                             // * except (id, id)

src/query/sql/src/planner/optimizer/rule/rewrite/rule_push_down_filter_eval_scalar.rs

@@ -34,7 +34,6 @@ use crate::plans::PatternPlan;
 use crate::plans::RelOp;
 use crate::plans::ScalarExpr;
 use crate::plans::ScalarItem;
-use crate::plans::Unnest;
 use crate::plans::WindowFunc;
 
 pub struct RulePushDownFilterEvalScalar {
@@ -249,18 +248,6 @@ impl RulePushDownFilterEvalScalar {
                         func_name: func.func_name.clone(),
                     }))
                 }
-                ScalarExpr::Unnest(unnest) => {
-                    let arg = Self::replace_predicate(
-                        &unnest.argument,
-                        items,
-                        eval_scalar_columns,
-                        eval_scalar_child_columns,
-                    )?;
-                    Ok(ScalarExpr::Unnest(Unnest {
-                        argument: Box::new(arg),
-                        return_type: unnest.return_type.clone(),
-                    }))
-                }
                 ScalarExpr::CastExpr(cast) => {
                     let arg = Self::replace_predicate(
                         &cast.argument,

tests/sqllogictests/suites/base/03_common/03_0034_select_exclude_list

@@ -140,6 +140,92 @@ statement error 1065
 select * exclude (id, id) from db.t
 
 
+query I
+select * exclude C1 from db.t
+----
+1
+
+
+query T
+select * exclude (ID) from db.t
+----
+(0,0)
+
+
+query T
+select t.* exclude (ID) from db.t
+----
+(0,0)
+
+
+query T
+select db.t.* exclude (ID) from db.t
+----
+(0,0)
+
+
+statement error 1065
+select db.t.* exclude (ID, C1) from db.t
+
+
+query T
+select c.* exclude (ID) from db.t as c
+----
+(0,0)
+
+
+statement error 1065
+select db.c.* exclude (ID) from db.t as c
+
+
+statement error 1065
+select * exclude ID from (select t.id as id, t.c1 as id from db.t) t1
+
+
+statement error 1065
+select t1.* exclude ID from (select t.id as id, t.c1 as id from db.t) t1
+
+
+query ITITITIIT
+select *, t.* exclude C1, t1.* exclude (C1), t2.* exclude ID from db.t join db.t1 on t.id != t1.id join default.t as t2 on t.id=t2.id
+----
+1 (0,0)    2 (0,0)    1 (100,100)    1    2 (100,100)
+
+
+query IT
+select db.t.* exclude (C1), default.t1.* exclude ID from db.t join default.t1
+----
+1 (200,200)
+
+
+statement error 1065
+select * exclude ID from default.t1 join db.t
+
+
+statement error 1065
+select db.t.* exclude (C1), default.t1.* exclude IDCC from db.t join default.t1
+
+
+statement error 1065
+select * exclude C10 from (select * from db.t) t1
+
+
+statement error 1065
+select * exclude (ID, C1) from (select * from db.t) t1
+
+
+statement error 1065
+select t1.* exclude (ID, C1) from (select * from db.t) t1
+
+
+statement error 1065
+select * exclude (C1, C1) from db.t
+
+
+statement error 1065
+select * exclude (ID, ID) from db.t
+
+
 statement ok
 drop database if exists db