cellular/jspg
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "queryer: NULL-tolerant bound for optional single-family forward relations"

Browse Source 
This reverts commit 94477b677d.
This commit is contained in:
Satya
2026-06-19 15:34:24 -04:00
parent 98a9719509
commit 7f666e0ece
3 changed files with 11 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/queryer/compiler.rs
View File

@ -574,7 +574,7 @@ impl<'a> Compiler<'a> {
fn compile_polymorphic_bounds(
&self,
r#type: &crate::database::r#type::Type,
_type: &crate::database::r#type::Type,
type_aliases: &std::collections::HashMap<String, String>,
node: &Node,
where_clauses: &mut Vec<String>,
@ -607,21 +607,10 @@ impl<'a> Compiler<'a> {
if let Some(relation) = self.db.relations.get(&edge.constraint) {
let mut poly_col = None;
let mut table_to_alias = "";
// An OPTIONAL forward polymorphic relation on a real entity (e.g.
// invoice.counterparty, order.counterparty) keeps its discriminator column on the
// entity row itself; the auto-generated type bound then sits in that row's WHERE
// and would wrongly drop the row when the relation is absent (NULL discriminator).
// Such a row must still be returned (with the property resolving to null), so the
// bound is made NULL-tolerant below. This does NOT apply to edge entities
// (relationship == true): there the same source_type/target_type columns
// partition typed sub-collections (phone_numbers vs email_addresses), so the
// bound must stay exact — a NULL endpoint genuinely belongs to no partition.
let mut null_tolerant = false;
if edge.forward && relation.source_columns.len() > 1 {
poly_col = Some(&relation.source_columns[1]); // e.g., target_type
table_to_alias = &relation.source_type; // e.g., relationship
null_tolerant = !r#type.relationship;
} else if !edge.forward && relation.destination_columns.len() > 1 {
poly_col = Some(&relation.destination_columns[1]); // e.g., source_type
table_to_alias = &relation.destination_type; // e.g., relationship
@ -632,25 +621,20 @@ impl<'a> Compiler<'a> {
.get(table_to_alias)
.or_else(|| type_aliases.get(&node.parent_alias))
{
let predicate = if type_def.variations.len() > 1 {
if type_def.variations.len() > 1 {
let quoted: Vec<String> = type_def
.variations
.iter()
.map(|v| format!("'{}'", v))
.collect();
format!("{}.{} IN ({})", alias, col, quoted.join(", "))
where_clauses.push(format!(
"{}.{} IN ({})",
alias,
col,
quoted.join(", ")
));
} else {
format!("{}.{} = '{}'", alias, col, type_name)
};
// NULL-tolerant for parent-level (forward FK) filters: an OPTIONAL
// polymorphic relation that is absent (NULL discriminator) must NOT exclude
// the parent — the inner CASE resolves it to NULL. (e.g. an invoice with no
// counterparty yet must still be returned, with counterparty = null.)
if null_tolerant {
where_clauses.push(format!("({} OR {}.{} IS NULL)", predicate, alias, col));
} else {
where_clauses.push(predicate);
where_clauses.push(format!("{}.{} = '{}'", alias, col, type_name));
}
}
}