prevent wildcard aliasing

PRQL · Oct 29, 2022 · 12bc32c · 12bc32c
1 parent 672bff8
commit 12bc32c
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 14 deletions.
diff --git a/book/tests/prql/semantics/functions-0.prql b/book/tests/prql/semantics/functions-0.prql
diff --git a/book/tests/prql/semantics/functions-1.prql b/book/tests/prql/semantics/functions-1.prql
diff --git a/book/tests/prql/semantics/name-resolving-0.prql b/book/tests/prql/semantics/name-resolving-0.prql
diff --git a/book/tests/prql/semantics/name-resolving-1.prql b/book/tests/prql/semantics/name-resolving-1.prql
diff --git a/prql-compiler/src/semantic/resolver.rs b/prql-compiler/src/semantic/resolver.rs
@@ -226,7 +226,6 @@ impl Resolver {
                 match res {
                     Ok(id) => id,
                     Err(e) => {
-                        dbg!(&self.context);
                         bail!(Error::new(Reason::Simple(e)).with_span(span))
                     }
                 }

diff --git a/prql-compiler/src/sql/anchor.rs b/prql-compiler/src/sql/anchor.rs
@@ -66,10 +66,17 @@ impl AnchorContext {
         let def = self.columns_defs.get_mut(cid).unwrap();
 
         if def.name.is_none() {
-            let id = self.next_col_name_id;
-            self.next_col_name_id += 1;
+            match &def.expr.kind {
+                ExprKind::ExternRef { variable, .. } if variable == "*" => {
+                    def.name = Some("*".into());
+                }
+                _ => {
+                    let id = self.next_col_name_id;
+                    self.next_col_name_id += 1;
 
-            def.name = Some(format!("_expr_{id}"));
+                    def.name = Some(format!("_expr_{id}"));
+                }
+            }
         }
 
         def.name.clone().unwrap()