fix: refactor source as alias (#13293)

* refactor source as alias

* fix test

* fix test

Author: JackTan25

src/query/ast/src/ast/statements/merge_into.rs

@@ -92,7 +92,6 @@ pub struct MergeIntoStmt {
     pub database: Option<Identifier>,
     pub table_ident: Identifier,
     pub source: MergeSource,
-    pub source_alias: Option<TableAlias>,
     // target_alias is belong to target
     pub target_alias: Option<TableAlias>,
     pub join_expr: Expr,
@@ -221,6 +220,7 @@ pub enum MergeSource {
 
     Select {
         query: Box<Query>,
+        source_alias: TableAlias,
     },
 }
 
@@ -232,18 +232,21 @@ pub struct StreamingSource {
 }
 
 impl MergeSource {
-    pub fn transform_table_reference(&self, alias: Option<TableAlias>) -> TableReference {
+    pub fn transform_table_reference(&self) -> TableReference {
         match self {
             Self::StreamingV2 {
                 settings: _,
                 on_error_mode: _,
                 start: _,
             } => unimplemented!(),
 
-            Self::Select { query } => TableReference::Subquery {
+            Self::Select {
+                query,
+                source_alias,
+            } => TableReference::Subquery {
                 span: None,
                 subquery: query.clone(),
-                alias,
+                alias: Some(source_alias.clone()),
             },
         }
     }
@@ -267,7 +270,10 @@ impl Display for MergeSource {
                 )
             }
 
-            MergeSource::Select { query } => write!(f, "{query}"),
+            MergeSource::Select {
+                query,
+                source_alias,
+            } => write!(f, "{query} as {source_alias}"),
         }
     }
 }

src/query/ast/src/parser/statement.rs

@@ -156,7 +156,7 @@ pub fn statement(i: Input) -> IResult<StatementMsg> {
     let merge = map(
         rule! {
             MERGE ~ #hint? ~ INTO ~ #dot_separated_idents_1_to_3  ~ #table_alias? ~ USING
-            ~ #merge_source  ~ #table_alias? ~ ON ~ #expr ~ (#match_clause | #unmatch_clause)*
+            ~ #merge_source ~ ON ~ #expr ~ (#match_clause | #unmatch_clause)*
         },
         |(
             _,
@@ -166,7 +166,6 @@ pub fn statement(i: Input) -> IResult<StatementMsg> {
             target_alias,
             _,
             source,
-            source_alias,
             _,
             join_expr,
             merge_options,
@@ -177,7 +176,6 @@ pub fn statement(i: Input) -> IResult<StatementMsg> {
                 database,
                 table_ident: table,
                 source,
-                source_alias,
                 target_alias,
                 join_expr,
                 merge_options,
@@ -1618,8 +1616,11 @@ pub fn merge_source(i: Input) -> IResult<MergeSource> {
         },
     );
 
-    let query = map(query, |query| MergeSource::Select {
-        query: Box::new(query),
+    let query = map(rule! {#query ~ #table_alias}, |(query, source_alias)| {
+        MergeSource::Select {
+            query: Box::new(query),
+            source_alias,
+        }
     });
 
     rule!(

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

@@ -77,7 +77,6 @@ impl Binder {
             database,
             table_ident,
             source,
-            source_alias,
             target_alias,
             join_expr,
             merge_options,
@@ -121,7 +120,7 @@ impl Binder {
         };
 
         // get_source_table_reference
-        let source_data = source.transform_table_reference(source_alias.clone());
+        let source_data = source.transform_table_reference();
 
         // bind source data
         let (source_expr, mut left_context) =

tests/sqllogictests/suites/base/09_fuse_engine/09_0026_merge_into

@@ -40,13 +40,17 @@ select * from t2 order by a,b,c;
 2 b_7 c_7
 3 b_6 c_6
 
+## test source alias 
+statement error 1005
+merge into t1 using (select * from t2 ) on t1.a = t2.a  when matched then update set t1.c = t2.c,t1.c = t2.c;
+
 # section I: basic test for match and unmatch
 
 statement error 1006
-merge into t1 using (select * from t2 as t2) on t1.a = t2.a  when matched then update set t1.c = t2.c,t1.c = t2.c;
+merge into t1 using (select * from t2 ) as t2 on t1.a = t2.a  when matched then update set t1.c = t2.c,t1.c = t2.c;
 
 statement ok
-merge into t1 using (select * from t2 as t2) on t1.a = t2.a  when matched then update set t1.c = t2.c;
+merge into t1 using (select * from t2 ) as t2 on t1.a = t2.a  when matched then update set t1.c = t2.c;
 
 query TTT
 select * from t1 order by a,b,c;
@@ -68,7 +72,7 @@ select * from t2 order by a,b,c;
 4 b_8 c_8
 
 statement ok
-merge into t1 using (select * from t2 as t2) on t1.a = t2.a  when matched then update set t1.c = t2.c  when not matched then insert (a,b,c) values(t2.a,t2.b,t2.c);
+merge into t1 using (select * from t2 ) as t2 on t1.a = t2.a  when matched then update set t1.c = t2.c  when not matched then insert (a,b,c) values(t2.a,t2.b,t2.c);
 
 query TTT
 select * from t1 order by a,b,c;
@@ -83,7 +87,7 @@ statement ok
 insert into t2 values(1,'b_9','c_9');
 
 statement error 4001
-merge into t1 using (select * from t2 as t2) on t1.a = t2.a  when matched then update set t1.c = t2.c  when not matched then insert (a,b,c) values(t2.a,t2.b,t2.c);
+merge into t1 using (select * from t2 ) as t2 on t1.a = t2.a  when matched then update set t1.c = t2.c  when not matched then insert (a,b,c) values(t2.a,t2.b,t2.c);
 
 query TTT
 select * from t1 order by a,b,c;
@@ -116,7 +120,7 @@ select * from t2 order by a,b,c;
 5 b_9 c_9
 
 statement ok
-merge into t1 using (select * from t2 as t2) on t1.a = t2.a  when matched then delete;
+merge into t1 using (select * from t2 ) as t2 on t1.a = t2.a  when matched then delete;
 
 query ITT
 select * from t1 order by a,b,c;
@@ -135,10 +139,10 @@ select * from t1 order by a,b,c;
 3 b_2 c_2
 
 statement error 1065
-merge into t1 using (select * from t2 as t2) on t1.a = t2.a  when matched then delete when matched then update set t1.c = t2.c when not matched and t2.c = 'c_8' then insert (a,b,c) values(t2.a,t2.b,t2.c);
+merge into t1 using (select * from t2 ) as t2 on t1.a = t2.a  when matched then delete when matched then update set t1.c = t2.c when not matched and t2.c = 'c_8' then insert (a,b,c) values(t2.a,t2.b,t2.c);
 
 statement ok
-merge into t1 using (select * from t2 as t2) on t1.a = t2.a  when matched and t1.b = 'b_1' then delete when matched then update set t1.c = t2.c when not matched and t2.c = 'c_8' then insert (a,b,c) values(t2.a,t2.b,t2.c);
+merge into t1 using (select * from t2 ) as t2 on t1.a = t2.a  when matched and t1.b = 'b_1' then delete when matched then update set t1.c = t2.c when not matched and t2.c = 'c_8' then insert (a,b,c) values(t2.a,t2.b,t2.c);
 
 query TTT
 select * from t1 order by a,b,c;
@@ -148,7 +152,7 @@ select * from t1 order by a,b,c;
 4 b_8 c_8
 
 statement ok
-merge into t1 using (select * from t2 as t2) on t1.a = t2.a  when matched then delete when not matched and t2.c = 'c_9' then insert (a,b,c) values(t2.a,t2.b,t2.c);
+merge into t1 using (select * from t2 ) as t2 on t1.a = t2.a  when matched then delete when not matched and t2.c = 'c_9' then insert (a,b,c) values(t2.a,t2.b,t2.c);
 
 query TTT
 select * from t1 order by a,b,c;
@@ -157,7 +161,7 @@ select * from t1 order by a,b,c;
 5 b_9 c_9
 
 statement ok
-merge into t1 using (select * from t2 as t2) on t1.a = t2.a when not matched and t2.c = 'c_8' then insert (a,b) values(t2.a,t2.b) when not matched and t2.c = 'c_7' then insert (a,c) values(t2.a,t2.c);
+merge into t1 using (select * from t2 ) as t2 on t1.a = t2.a when not matched and t2.c = 'c_8' then insert (a,b) values(t2.a,t2.b) when not matched and t2.c = 'c_7' then insert (a,c) values(t2.a,t2.c);
 
 query TTT
 select * from t1 order by a,b,c;
@@ -180,11 +184,11 @@ select * from t2 order by a,b,c;
 5 b_9 c_9
 
 statement error 4001
-merge into t1 using (select * from t2 as t2) on t1.a = t2.a when matched and t2.c = 'c_9' then update set t1.b = 'b_11' when matched and t2.c = 'c_10' then delete;
+merge into t1 using (select * from t2 ) as t2 on t1.a = t2.a when matched and t2.c = 'c_9' then update set t1.b = 'b_11' when matched and t2.c = 'c_10' then delete;
 
 ## idempotent delete test
 statement ok
-merge into t1 using (select * from t2 as t2) on t1.a = t2.a when matched then delete;
+merge into t1 using (select * from t2 ) as t2 on t1.a = t2.a when matched then delete;
 
 query TTT
 select * from t1 order by a,b,c;
@@ -228,10 +232,10 @@ select * from t2 order by a,b,c;
 
 ## test insert columns mismatch
 statement error 1065
-merge into t1 using (select * from t2 as t2) on t1.a = t2.a when not matched then insert values(t2.a,t2.c);
+merge into t1 using (select * from t2 ) as t2 on t1.a = t2.a when not matched then insert values(t2.a,t2.c);
 
 statement ok
-merge into t1 using (select * from t2 as t2) on t1.a = t2.a  when matched then update *  when not matched then insert *;
+merge into t1 using (select * from t2 ) as t2 on t1.a = t2.a  when matched then update *  when not matched then insert *;
 
 query TTT
 select * from t1 order by a,b,c;
@@ -242,10 +246,10 @@ select * from t1 order by a,b,c;
 
 ## test multi same name for star
 statement error 1065
-merge into t1 using (select a,b,c,a from t2 as t2) on t1.a = t2.a  when matched then update *;
+merge into t1 using (select a,b,c,a from t2 ) as t2 on t1.a = t2.a  when matched then update *;
 
 statement error 1065
-merge into t1 using (select a,b,c,a,b from t2 as t2) on t1.a = t2.a  when not matched then insert *;
+merge into t1 using (select a,b,c,a,b from t2 ) as t2 on t1.a = t2.a  when not matched then insert *;
 
 ## stage file test
 statement ok
@@ -389,7 +393,7 @@ select * from t2 order by a,b,c;
 NULL b_3 c_3
 
 statement ok
-merge into t1 using (select * from t2) on t1.a = t2.a when matched then delete when not matched then insert *;
+merge into t1 using (select * from t2) as t2 on t1.a = t2.a when matched then delete when not matched then insert *;
 
 query TTT
 select * from t1 order by a,b,c;
@@ -400,7 +404,7 @@ NULL b_1 c_1
 NULL b_3 c_3
 
 statement ok
-merge into t1 using (select * from t2) on t1.a = t2.a when matched then delete;
+merge into t1 using (select * from t2) as t2 on t1.a = t2.a when matched then delete;
 
 query TTT
 select * from t1 order by a,b,c;
@@ -429,7 +433,7 @@ statement ok
 insert into t2 values(1,'a1','b1');
 
 statement ok
-merge into t1 as t3 using (select * from t2 as t2) on t3.a = t2.a  when not matched  then insert (a,b,c) values(t2.a,t2.b,t2.c);
+merge into t1 as t3 using (select * from t2 ) as t2 on t3.a = t2.a  when not matched  then insert (a,b,c) values(t2.a,t2.b,t2.c);
 
 query TTT
 select * from t1 order by a,b,c;
@@ -449,7 +453,7 @@ statement ok
 INSERT INTO salaries VALUES(1, 50000.00),(2, 60000.00);
 
 statement ok
-MERGE INTO salaries USING (SELECT * FROM employees) ON salaries.employee_id = employees.employee_id WHEN MATCHED AND employees.department = 'HR' THEN UPDATE SET salaries.salary = salaries.salary + 1000.00 WHEN MATCHED THEN UPDATE SET salaries.salary = salaries.salary + 500.00 WHEN NOT MATCHED THEN INSERT (employee_id, salary) VALUES (employees.employee_id, 55000.00);
+MERGE INTO salaries USING (SELECT * FROM employees) as employees ON salaries.employee_id = employees.employee_id WHEN MATCHED AND employees.department = 'HR' THEN UPDATE SET salaries.salary = salaries.salary + 1000.00 WHEN MATCHED THEN UPDATE SET salaries.salary = salaries.salary + 500.00 WHEN NOT MATCHED THEN INSERT (employee_id, salary) VALUES (employees.employee_id, 55000.00);
 
 query TTT
 select * from salaries order by employee_id;
@@ -473,7 +477,7 @@ statement ok
 insert into t2_source values(1),(2);
 
 statement ok
-merge into t1_target using (select * from t2_source) on t1_target.a = t2_source.a when matched then update * when not matched then insert *;
+merge into t1_target using (select * from t2_source) as t2_source on t1_target.a = t2_source.a when matched then update * when not matched then insert *;
 
 query T
 select * from t1_target order by a;

tests/sqllogictests/suites/ee/01_ee_system/01_0001_computed_column

@@ -211,13 +211,13 @@ statement ok
 insert into t_source_merge values('a1','b1','c1'),('a2','b2','c2');
 
 statement error 1006
-merge into t_stored_merge as t1 using (select * from t_source_merge as t2) on t1.a = t2.a when not matched then insert (a,b,c) values(t2.a,t2.b,t2.c); 
+merge into t_stored_merge as t1 using (select * from t_source_merge as t2) as t2 on t1.a = t2.a when not matched then insert (a,b,c) values(t2.a,t2.b,t2.c); 
 
 statement error 1006
-merge into t_stored_merge as t1 using (select * from t_source_merge as t2) on t1.a = t2.a  when matched then update set t1.b = t2.b  when not matched then insert (a,c) values(t2.a,t2.c);
+merge into t_stored_merge as t1 using (select * from t_source_merge as t2) as t2 on t1.a = t2.a  when matched then update set t1.b = t2.b  when not matched then insert (a,c) values(t2.a,t2.c);
 
 statement ok
-merge into t_stored_merge as t1 using (select * from t_source_merge as t2) on t1.a = t2.a when not matched then insert (a,c) values(t2.a,t2.c);
+merge into t_stored_merge as t1 using (select * from t_source_merge as t2) as t2 on t1.a = t2.a when not matched then insert (a,c) values(t2.a,t2.c);
 
 query TTT
 select * from t_stored_merge order by a,b,c;
@@ -248,7 +248,7 @@ a1 b1 c1
 a2 b2 c2
 
 statement ok
-merge into t_stored_merge as t1 using (select * from t_source_merge as t2)  on t1.a = t2.a  when matched then update set t1.c = t2.c  when not matched then insert (a,c) values(t2.a,t2.c);
+merge into t_stored_merge as t1 using (select * from t_source_merge as t2) as t2  on t1.a = t2.a  when matched then update set t1.c = t2.c  when not matched then insert (a,c) values(t2.a,t2.c);
 
 query TTT
 select * from t_stored_merge order by a,b,c;