Merge pull request #9046 from xudong963/fix_cte

fix: try to fix cte with duplicate name

Author: BohuTANG

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

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 use std::hash::Hash;
-use std::sync::Arc;
 
 use common_ast::ast::TableAlias;
 use common_ast::parser::token::Token;
@@ -95,7 +94,7 @@ pub struct BindContext {
     /// functions, otherwise a grouping error will be raised.
     pub in_grouping: bool,
 
-    pub ctes_map: Arc<DashMap<String, CteInfo>>,
+    pub ctes_map: Box<DashMap<String, CteInfo>>,
 }
 
 #[derive(Clone, Debug)]
@@ -112,7 +111,7 @@ impl BindContext {
             columns: Vec::new(),
             aggregate_info: AggregateInfo::default(),
             in_grouping: false,
-            ctes_map: Arc::new(DashMap::new()),
+            ctes_map: Box::new(DashMap::new()),
         }
     }
 

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

@@ -153,23 +153,26 @@ impl<'a> Binder {
                         let tokens = tokenize_sql(query.as_str())?;
                         let backtrace = Backtrace::new();
                         let (stmt, _) = parse_sql(&tokens, Dialect::PostgreSQL, &backtrace)?;
-
+                        // For view, we need use a new context to bind it.
+                        let new_bind_context =
+                            BindContext::with_parent(Box::new(bind_context.clone()));
                         if let Statement::Query(query) = &stmt {
-                            let (s_expr, mut bind_context) =
-                                self.bind_query(bind_context, query).await?;
+                            let (s_expr, mut new_bind_context) =
+                                self.bind_query(&new_bind_context, query).await?;
                             if let Some(alias) = alias {
                                 // view maybe has alias, e.g. select v1.col1 from v as v1;
-                                bind_context.apply_table_alias(alias, &self.name_resolution_ctx)?;
+                                new_bind_context
+                                    .apply_table_alias(alias, &self.name_resolution_ctx)?;
                             } else {
                                 // e.g. select v0.c0 from v0;
-                                for column in bind_context.columns.iter_mut() {
+                                for column in new_bind_context.columns.iter_mut() {
                                     column.database_name = None;
                                     column.table_name = Some(
                                         normalize_identifier(table, &self.name_resolution_ctx).name,
                                     );
                                 }
                             }
-                            Ok((s_expr, bind_context))
+                            Ok((s_expr, new_bind_context))
                         } else {
                             Err(ErrorCode::Internal(format!(
                                 "Invalid VIEW object: {}",
@@ -261,11 +264,14 @@ impl<'a> Binder {
                 subquery,
                 alias,
             } => {
-                let (s_expr, mut bind_context) = self.bind_query(bind_context, subquery).await?;
+                // For subquery, we need use a new context to bind it.
+                let new_bind_context = BindContext::with_parent(Box::new(bind_context.clone()));
+                let (s_expr, mut new_bind_context) =
+                    self.bind_query(&new_bind_context, subquery).await?;
                 if let Some(alias) = alias {
-                    bind_context.apply_table_alias(alias, &self.name_resolution_ctx)?;
+                    new_bind_context.apply_table_alias(alias, &self.name_resolution_ctx)?;
                 }
-                Ok((s_expr, bind_context))
+                Ok((s_expr, new_bind_context))
             }
         }
     }

tests/logictest/suites/query/cte.test

@@ -382,3 +382,9 @@ with it as ( select * from numbers(1) ) select i.number from it as i;
 
 ----
 0
+
+statement query II
+select * from  (WITH source AS (select 1 as e) SELECT * FROM source) A,   (WITH source AS (select 2 as e) SELECT * FROM source) B;
+
+----
+1 2