Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 10e388421d | |||
| 7f666e0ece | |||
| 98a9719509 |
@ -70,17 +70,6 @@
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"name": "get_oneof_counterparty_orders",
|
||||
"schemas": {
|
||||
"get_oneof_counterparty_orders.response": {
|
||||
"type": "array",
|
||||
"items": {
|
||||
"type": "oneof.order"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
],
|
||||
"enums": [],
|
||||
@ -430,19 +419,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"single.person": {
|
||||
"type": "person",
|
||||
"properties": {
|
||||
"primary_contact": {
|
||||
"type": "contact",
|
||||
"properties": {
|
||||
"target": {
|
||||
"type": "email_address"
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"full.person": {
|
||||
"type": "person",
|
||||
"properties": {
|
||||
@ -777,21 +753,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"oneof.order": {
|
||||
"type": "order",
|
||||
"properties": {
|
||||
"counterparty": {
|
||||
"oneOf": [
|
||||
{
|
||||
"type": "person"
|
||||
},
|
||||
{
|
||||
"type": "widget"
|
||||
}
|
||||
]
|
||||
}
|
||||
}
|
||||
},
|
||||
"light.order": {
|
||||
"type": "order",
|
||||
"properties": {
|
||||
@ -2392,7 +2353,7 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"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)",
|
||||
"description": "Order select with nested polymorphic counterparty family relation",
|
||||
"action": "query",
|
||||
"schema_id": "get_counterparty_orders.response",
|
||||
"expect": {
|
||||
@ -2471,128 +2432,7 @@
|
||||
" 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')",
|
||||
" 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",
|
||||
"))))"
|
||||
]
|
||||
]
|
||||
}
|
||||
},
|
||||
{
|
||||
"description": "Single reified-relationship property (person.primary_contact, type=contact): discriminator + source correlation live INSIDE the subquery; the parent WHERE must NOT get a spurious entity.type bound (regression: reverse reified edges previously emitted entity_1.type = 'contact', excluding every parent)",
|
||||
"action": "query",
|
||||
"schema_id": "single.person",
|
||||
"expect": {
|
||||
"success": true,
|
||||
"sql": [
|
||||
[
|
||||
"((SELECT jsonb_strip_nulls((",
|
||||
" SELECT jsonb_build_object(",
|
||||
" 'id', entity_1.id,",
|
||||
" 'type', entity_1.type,",
|
||||
" 'archived', entity_1.archived,",
|
||||
" 'created_at', entity_1.created_at,",
|
||||
" 'name', organization_2.name,",
|
||||
" 'first_name', person_3.first_name,",
|
||||
" 'last_name', person_3.last_name,",
|
||||
" 'age', person_3.age,",
|
||||
" 'primary_contact', (",
|
||||
" SELECT jsonb_build_object(",
|
||||
" 'id', entity_4.id,",
|
||||
" 'type', entity_4.type,",
|
||||
" 'archived', entity_4.archived,",
|
||||
" 'created_at', entity_4.created_at,",
|
||||
" 'is_primary', contact_6.is_primary,",
|
||||
" 'target', (",
|
||||
" SELECT jsonb_build_object(",
|
||||
" 'id', entity_7.id,",
|
||||
" 'type', entity_7.type,",
|
||||
" 'archived', entity_7.archived,",
|
||||
" 'created_at', entity_7.created_at,",
|
||||
" 'address', email_address_8.address",
|
||||
" )",
|
||||
" FROM agreego.entity entity_7",
|
||||
" JOIN agreego.email_address email_address_8 ON email_address_8.id = entity_7.id",
|
||||
" WHERE",
|
||||
" NOT entity_7.archived",
|
||||
" AND relationship_5.target_id = entity_7.id",
|
||||
" )",
|
||||
" )",
|
||||
" FROM agreego.entity entity_4",
|
||||
" JOIN agreego.relationship relationship_5 ON relationship_5.id = entity_4.id",
|
||||
" JOIN agreego.contact contact_6 ON contact_6.id = relationship_5.id",
|
||||
" WHERE",
|
||||
" NOT entity_4.archived",
|
||||
" AND relationship_5.target_type = 'email_address'",
|
||||
" AND relationship_5.source_id = entity_1.id",
|
||||
" )",
|
||||
" )",
|
||||
" FROM agreego.entity entity_1",
|
||||
" JOIN agreego.organization organization_2 ON organization_2.id = entity_1.id",
|
||||
" JOIN agreego.person person_3 ON person_3.id = organization_2.id",
|
||||
" WHERE",
|
||||
" NOT entity_1.archived",
|
||||
" AND order_2.counterparty_type IN ('bot', 'organization', 'person')",
|
||||
"))))"
|
||||
]
|
||||
]
|
||||
|
||||
@ -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>,
|
||||
@ -604,35 +604,13 @@ impl<'a> Compiler<'a> {
|
||||
if let Some(type_name) = bound_type_name {
|
||||
// Ensure this type actually exists
|
||||
if let Some(type_def) = self.db.types.get(&type_name) {
|
||||
// A reified-relationship property (e.g. invoice.counterparty, person.primary_contact)
|
||||
// is hydrated by a correlated subquery that joins the relationship table and correlates
|
||||
// source_id/target_id = parent.id; its discriminators (the relationship subtype and the
|
||||
// target's type CASE) are constrained INSIDE that subquery. There is no parent-row column
|
||||
// to bound here — emitting one wrongly constrains the PARENT entity's own `type` column
|
||||
// (e.g. `entity_1.type = 'counterparty'`), which no parent row satisfies, dropping every
|
||||
// parent. (Array reified traversals never reach this code: an array prop has no
|
||||
// bound_type_name.) So skip the bound entirely for relationship-typed properties.
|
||||
if type_def.relationship {
|
||||
continue;
|
||||
}
|
||||
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
|
||||
@ -643,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));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -1517,18 +1517,6 @@ 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_queryer_0_17() {
|
||||
let path = format!("{}/fixtures/queryer.json", env!("CARGO_MANIFEST_DIR"));
|
||||
crate::tests::runner::run_test_case(&path, 0, 17).unwrap();
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_polymorphism_0_0() {
|
||||
let path = format!("{}/fixtures/polymorphism.json", env!("CARGO_MANIFEST_DIR"));
|
||||
|
||||
Reference in New Issue
Block a user