queryer fixes checkpoint

src/bin/ast_explore.rs

@@ -1,17 +0,0 @@
-use sqlparser::dialect::PostgreSqlDialect;
-use sqlparser::parser::Parser;
-use std::env;
-
-fn main() {
-    let sql = "SELECT t1_obj_t1_addresses_t1_target_t2.archived, t1.id FROM person t1 JOIN address t1_obj_t1_addresses ON true";
-    let dialect = PostgreSqlDialect {};
-    
-    match Parser::parse_sql(&dialect, sql) {
-        Ok(ast) => {
-            println!("{:#?}", ast);
-        }
-        Err(e) => {
-            println!("Error: {:?}", e);
-        }
-    }
-}

src/queryer/compiler.rs

@@ -457,8 +457,13 @@ impl SqlCompiler {
       .cloned()
       .unwrap_or_else(|| "err".to_string());
 
+    let entity_alias = table_aliases
+      .get("entity")
+      .cloned()
+      .unwrap_or_else(|| base_alias.clone());
+
     let mut where_clauses = Vec::new();
-    where_clauses.push(format!("NOT {}.archived", base_alias));
+    where_clauses.push(format!("NOT {}.archived", entity_alias));
 
     for (i, filter_key) in filter_keys.iter().enumerate() {
       let mut parts = filter_key.split(':');