Compare commits

...

2 Commits

Author SHA1 Message Date
2c18163961 version: 1.0.150 2026-05-25 18:30:01 -04:00
0b241c5227 feat(queryer): support polymorphic inherited queries with IN clause and SQL notices 2026-05-25 18:29:43 -04:00
4 changed files with 24 additions and 4 deletions

View File

@ -2432,7 +2432,7 @@
" JOIN agreego.entity entity_2 ON entity_2.id = order_1.id",
" WHERE",
" NOT entity_2.archived",
" AND order_1.counterparty_type = 'organization'",
" AND order_1.counterparty_type IN ('bot', 'organization', 'person')",
"))))"
]
]

View File

@ -603,7 +603,7 @@ impl<'a> Compiler<'a> {
if let Some(type_name) = bound_type_name {
// Ensure this type actually exists
if self.db.types.contains_key(&type_name) {
if let Some(type_def) = self.db.types.get(&type_name) {
if let Some(relation) = self.db.relations.get(&edge.constraint) {
let mut poly_col = None;
let mut table_to_alias = "";
@ -621,7 +621,23 @@ impl<'a> Compiler<'a> {
.get(table_to_alias)
.or_else(|| type_aliases.get(&node.parent_alias))
{
where_clauses.push(format!("{}.{} = '{}'", alias, col, type_name));
// DEBUG: See what variations we have for this type
#[cfg(not(test))]
pgrx::notice!("JSPG_POLY_BOUNDS: type={}, col={}, variations_len={}, variations={:?}", type_name, col, type_def.variations.len(), type_def.variations);
// Use IN clause with all variations to support inherited types.
// e.g., "asset" has variations ["asset", "property", "unit", ...]
// so target_type IN ('asset','property','unit') instead of = 'asset'
if type_def.variations.len() > 1 {
let quoted: Vec<String> = type_def.variations.iter()
.map(|v| format!("'{}'", v))
.collect();
where_clauses.push(format!(
"{}.{} IN ({})", alias, col, quoted.join(", ")
));
} else {
where_clauses.push(format!("{}.{} = '{}'", alias, col, type_name));
}
}
}
}

View File

@ -50,6 +50,10 @@ impl Queryer {
Err(drop) => return drop,
};
// DEBUG: Emit compiled SQL as a NOTICE for inspection
#[cfg(not(test))]
pgrx::notice!("JSPG_SQL[{}]: {}", schema_id, sql);
// 3. Execute via Database Executor
self.execute_sql(schema_id, &sql, args)
}

View File

@ -1 +1 @@
1.0.149
1.0.150