From c2c0e62c2db2a229065c55a6279a4d0a70a42d00 Mon Sep 17 00:00:00 2001
From: Alex Groleau <agroleau@teampalmtree.com>
Date: Tue, 17 Mar 2026 05:12:03 -0400
Subject: [PATCH] queryer fixes checkpoint

---
 Cargo.toml              |  4 ----
 src/bin/ast_explore.rs  | 17 -----------------
 src/queryer/compiler.rs |  7 ++++++-
 3 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 src/bin/ast_explore.rs

diff --git a/Cargo.toml b/Cargo.toml
index c948a72..5d4e917 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,10 +39,6 @@ crate-type = ["cdylib", "lib"]
 name = "pgrx_embed_jspg"
 path = "src/bin/pgrx_embed.rs"
 
-[[bin]]
-name = "ast_explore"
-path = "src/bin/ast_explore.rs"
-
 [features]
 default = ["pg18"]
 pg18 = ["pgrx/pg18", "pgrx-tests/pg18" ]
diff --git a/src/bin/ast_explore.rs b/src/bin/ast_explore.rs
deleted file mode 100644
index 1ecefba..0000000
--- a/src/bin/ast_explore.rs
+++ /dev/null
@@ -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);
-        }
-    }
-}
diff --git a/src/queryer/compiler.rs b/src/queryer/compiler.rs
index 8649f84..82db9d1 100644
--- a/src/queryer/compiler.rs
+++ b/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(':');