From 94477b677d5beb3aa6a0432e58770f1e4ef1361a Mon Sep 17 00:00:00 2001 From: Satya Date: Fri, 19 Jun 2026 10:22:29 -0400 Subject: [PATCH] queryer: NULL-tolerant bound for optional single-family forward relations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit An OPTIONAL forward polymorphic relation declared via `family` (e.g. order.counterparty / invoice.counterparty) had its auto-generated type bound `{alias}.{disc} IN (variations)` emitted into the PARENT row's WHERE. When the relation is absent (NULL discriminator) the parent row was wrongly excluded — a counterparty-less order/invoice returned nothing instead of the row with `counterparty: null`. Fix: in `compile_polymorphic_bounds`, make the forward-FK bound NULL-tolerant (`(… IN (…) OR …_type IS NULL)`), gated on `!r#type.relationship`: - real entities get NULL-tolerance (the relation is an optional attribute; an absent one must not drop the row — the inner CASE already resolves it to NULL); - edge entities (`relationship == true`, e.g. `contact`) keep the bound EXACT, because there source_type/target_type *partition* typed sub-collections (phone_numbers vs email_addresses) and a NULL endpoint belongs to no partition. Note: the `oneOf` path was already correct — it emits no parent bound (resolves via CASE … ELSE NULL), so cross-family optional relations already hydrate NULL-safely. Added a fixture case documenting that. Tests (fixtures/queryer.json): case 15 (entity → NULL-tolerant), cases 3/5/10 (contact edges → exact, unchanged), new case 16 (oneOf cross-family → no bound). Full suite green. Co-Authored-By: Claude Opus 4.8 (1M context) --- fixtures/queryer.json | 92 ++++++++++++++++++++++++++++++++++++++++- src/queryer/compiler.rs | 34 +++++++++++---- src/tests/fixtures.rs | 6 +++ 3 files changed, 121 insertions(+), 11 deletions(-) diff --git a/fixtures/queryer.json b/fixtures/queryer.json index e09ed07..73cec19 100644 --- a/fixtures/queryer.json +++ b/fixtures/queryer.json @@ -70,6 +70,17 @@ } } } + }, + { + "name": "get_oneof_counterparty_orders", + "schemas": { + "get_oneof_counterparty_orders.response": { + "type": "array", + "items": { + "type": "oneof.order" + } + } + } } ], "enums": [], @@ -753,6 +764,21 @@ } } }, + "oneof.order": { + "type": "order", + "properties": { + "counterparty": { + "oneOf": [ + { + "type": "person" + }, + { + "type": "widget" + } + ] + } + } + }, "light.order": { "type": "order", "properties": { @@ -2353,7 +2379,7 @@ } }, { - "description": "Order select with nested polymorphic counterparty family relation", + "description": "Order select with nested polymorphic counterparty family relation; the optional forward FK bound is NULL-tolerant so orders without a counterparty are still returned (contrast the contact-array cases, where the edge discriminator stays exact)", "action": "query", "schema_id": "get_counterparty_orders.response", "expect": { @@ -2432,7 +2458,69 @@ " JOIN agreego.order order_2 ON order_2.id = entity_1.id", " WHERE", " NOT entity_1.archived", - " AND order_2.counterparty_type IN ('bot', 'organization', 'person')", + " AND (order_2.counterparty_type IN ('bot', 'organization', 'person')", + " OR order_2.counterparty_type IS NULL)", + "))))" + ] + ] + } + }, + { + "description": "Order select with optional cross-family oneOf counterparty (person | widget); the forward FK bound is NULL-tolerant so orders without a counterparty are still returned", + "action": "query", + "schema_id": "get_oneof_counterparty_orders.response", + "expect": { + "success": true, + "sql": [ + [ + "((SELECT jsonb_strip_nulls((", + " SELECT COALESCE(jsonb_agg(jsonb_build_object(", + " 'id', order_2.id,", + " 'type', order_2.type,", + " 'archived', entity_1.archived,", + " 'created_at', entity_1.created_at,", + " 'total', order_2.total,", + " 'customer_id', order_2.customer_id,", + " 'counterparty', CASE", + " WHEN order_2.counterparty_type = 'person' THEN ((", + " SELECT jsonb_build_object(", + " 'id', entity_3.id,", + " 'type', entity_3.type,", + " 'archived', entity_3.archived,", + " 'created_at', entity_3.created_at,", + " 'name', organization_4.name,", + " 'first_name', person_5.first_name,", + " 'last_name', person_5.last_name,", + " 'age', person_5.age", + " )", + " FROM agreego.entity entity_3", + " JOIN agreego.organization organization_4 ON organization_4.id = entity_3.id", + " JOIN agreego.person person_5 ON person_5.id = organization_4.id", + " WHERE", + " NOT entity_3.archived", + " AND order_2.counterparty_id = entity_3.id", + " ))", + " WHEN order_2.counterparty_type = 'widget' THEN ((", + " SELECT jsonb_build_object(", + " 'id', entity_6.id,", + " 'type', entity_6.type,", + " 'archived', entity_6.archived,", + " 'created_at', entity_6.created_at,", + " 'kind', widget_7.kind", + " )", + " FROM agreego.entity entity_6", + " JOIN agreego.widget widget_7 ON widget_7.id = entity_6.id", + " WHERE", + " NOT entity_6.archived", + " AND order_2.counterparty_id = entity_6.id", + " ))", + " ELSE NULL", + " END", + " )), '[]'::jsonb)", + " FROM agreego.entity entity_1", + " JOIN agreego.order order_2 ON order_2.id = entity_1.id", + " WHERE", + " NOT entity_1.archived", "))))" ] ] diff --git a/src/queryer/compiler.rs b/src/queryer/compiler.rs index 9108454..378e5e3 100644 --- a/src/queryer/compiler.rs +++ b/src/queryer/compiler.rs @@ -574,7 +574,7 @@ impl<'a> Compiler<'a> { fn compile_polymorphic_bounds( &self, - _type: &crate::database::r#type::Type, + r#type: &crate::database::r#type::Type, type_aliases: &std::collections::HashMap, node: &Node, where_clauses: &mut Vec, @@ -607,10 +607,21 @@ 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 @@ -621,20 +632,25 @@ impl<'a> Compiler<'a> { .get(table_to_alias) .or_else(|| type_aliases.get(&node.parent_alias)) { - if type_def.variations.len() > 1 { + let predicate = if type_def.variations.len() > 1 { let quoted: Vec = type_def .variations .iter() .map(|v| format!("'{}'", v)) .collect(); - where_clauses.push(format!( - "{}.{} IN ({})", - alias, - col, - quoted.join(", ") - )); + format!("{}.{} IN ({})", alias, col, quoted.join(", ")) } else { - where_clauses.push(format!("{}.{} = '{}'", alias, col, type_name)); + 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); } } } diff --git a/src/tests/fixtures.rs b/src/tests/fixtures.rs index a7c4136..739849a 100644 --- a/src/tests/fixtures.rs +++ b/src/tests/fixtures.rs @@ -1517,6 +1517,12 @@ fn test_queryer_0_15() { crate::tests::runner::run_test_case(&path, 0, 15).unwrap(); } +#[test] +fn test_queryer_0_16() { + let path = format!("{}/fixtures/queryer.json", env!("CARGO_MANIFEST_DIR")); + crate::tests::runner::run_test_case(&path, 0, 16).unwrap(); +} + #[test] fn test_polymorphism_0_0() { let path = format!("{}/fixtures/polymorphism.json", env!("CARGO_MANIFEST_DIR"));