queryer: don't emit a parent type-bound for reified-relationship properties

A SINGLE reified-relationship property (e.g. invoice.counterparty,
person.primary_contact — a property whose type is a relationship
subtype) 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.

For such a property the resolved edge is a REVERSE traversal
(forward = false) over a generic relationship FK
(fk_relationship_source_entity, destination = entity). compile_
polymorphic_bounds then took the `!edge.forward` branch with
poly_col = destination_columns[1] = "type" and
table_to_alias = "entity", which resolves to the PARENT's entity alias
— emitting a bound like `entity_1.type = 'counterparty'` into the
parent WHERE. No parent row has that type, so EVERY parent was dropped
(e.g. get_invoice returned null for an existing invoice whose
counterparty edge was absent).

Array reified traversals (contacts, occupancies) never hit this: an
array property has no bound_type_name. Only the single form did, and it
was previously unexercised.

Fix: in compile_polymorphic_bounds, skip the bound when the property's
resolved type is itself a relationship (type_def.relationship) — there
is no parent-row discriminator column to bound.

Test: new queryer case (person.primary_contact, type=contact) asserts
the parent WHERE has no spurious entity.type bound while the subquery
keeps its discriminator + source_id correlation. Full suite green.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Cargo.toml

@@ -16,7 +16,7 @@ url = "2.5.8"
 fluent-uri = "0.3.2"
 idna = "1.1.0"
 percent-encoding = "2.3.2"
-uuid = { version = "1.20.0", features = ["v4", "serde"] }
+uuid = { version = "1.20.0", features = ["v7", "serde"] }
 chrono = { version = "0.4.43", features = ["serde"] }
 json-pointer = "0.3.4"
 indexmap = { version = "2.13.0", features = ["serde"] }

GEMINI.md

@@ -175,6 +175,7 @@ In the Punc architecture, filters are automatically synthesized, strongly-typed
 
 *   **Conditions**: A condition schema is the contract defining the mathematical operations allowed on a primitive field. For example, a `string.condition` allows `$eq`, `$ne`, `$gt`, `$gte`, `$lt`, `$lte`, `$of` (IN), and `$nof` (NOT IN). 
     *   **Enum Conditions**: When JSPG synthesizes an enum, it dynamically generates an `<enum>.condition` (e.g., `address_kind.condition`). This strongly-typed condition perfectly mirrors the operations of a `string.condition`, but strictly limits the arrays and inputs of `$eq`, `$ne`, `$of`, and `$nof` to the exact variations defined by that Enum. This context ensures that UI generators know exactly when to render `<Select>` dropdowns instead of generic `<Text>` boxes.
+    *   **Pre-compiled Condition and Filter Mapping**: To prevent redundant double-wrapping of search structures, any schema property whose type is already a `.condition` or `.filter` type (such as `"string.condition"` or `"$kind.filter"`) maps directly to itself during filter synthesis rather than receiving a redundant `.filter` suffix.
 *   **Filters**: A filter schema (e.g., `person.filter`) is an object containing condition properties used to filter entities. It natively supports structural composition:
     *   **Inherited Properties**: Filters automatically inherit all valid database columns from their base type schema, immediately converting them to their respective `.condition` schemas.
     *   **Relational Proxies**: If a table has a foreign key to another table, the filter automatically generates a proxy property pointing to the related entity's filter (e.g., the `person` filter automatically gains an `organization` property that points to `organization.filter`), allowing infinitely deep nested queries natively.

fixtures/database.json

@@ -791,8 +791,8 @@
             }
           },
           "hierarchy": [
-            "invoice",
-            "entity"
+            "entity",
+            "invoice"
           ],
           "fields": [
             "id",
@@ -867,8 +867,8 @@
             }
           },
           "hierarchy": [
-            "invoice_line",
-            "entity"
+            "entity",
+            "invoice_line"
           ],
           "fields": [
             "id",

fixtures/filter.json

@@ -466,7 +466,7 @@
                 },
                 "filter": {
                   "type": [
-                    "$kind.filter.filter",
+                    "$kind.filter",
                     "null"
                   ]
                 },

fixtures/invoice.json

@@ -110,8 +110,8 @@
             }
           },
           "hierarchy": [
-            "activity",
-            "entity"
+            "entity",
+            "activity"
           ],
           "variations": [
             "activity",
@@ -166,9 +166,9 @@
             }
           },
           "hierarchy": [
-            "invoice",
+            "entity",
             "activity",
-            "entity"
+            "invoice"
           ],
           "variations": [
             "invoice"
@@ -237,8 +237,8 @@
             }
           },
           "hierarchy": [
-            "attachment",
-            "entity"
+            "entity",
+            "attachment"
           ],
           "variations": [
             "attachment"

src/database/compile/filter.rs

@@ -159,7 +159,9 @@ impl Schema {
       },
       "null" => None,
       custom => {
-        if db.enums.contains_key(custom) {
+        if custom.ends_with(".condition") || custom.ends_with(".filter") {
+          Some(vec![custom.to_string()])
+        } else if db.enums.contains_key(custom) {
           Some(vec![format!("{}.condition", custom)])
         } else {
           // Assume anything else is a Relational cross-boundary that already has its own .filter dynamically built

src/database/executors/mock.rs

@@ -85,7 +85,6 @@ impl DatabaseExecutor for MockExecutor {
     Ok("2026-03-10T00:00:00Z".to_string())
   }
 
-
   #[cfg(test)]
   fn get_queries(&self) -> Vec<String> {
     MOCK_STATE.with(|state| state.borrow().captured_queries.clone())

src/database/executors/mod.rs

@@ -20,7 +20,6 @@ pub trait DatabaseExecutor: Send + Sync {
   /// Returns the current transaction timestamp
   fn timestamp(&self) -> Result<String, String>;
 
-
   #[cfg(test)]
   fn get_queries(&self) -> Vec<String>;
 

src/database/executors/pgrx.rs

@@ -150,5 +150,4 @@ impl DatabaseExecutor for SpiExecutor {
       })
     })
   }
-
 }

src/merger/mod.rs

@@ -138,7 +138,9 @@ impl Merger {
     is_child: bool,
   ) -> Result<Value, String> {
     match data {
-      Value::Array(items) => self.merge_array(schema, items, notifications, parent_org_id, is_child),
+      Value::Array(items) => {
+        self.merge_array(schema, items, notifications, parent_org_id, is_child)
+      }
       Value::Object(map) => {
         if let Some(options) = schema.obj.compiled_options.get() {
           if let Some(disc) = schema.obj.compiled_discriminator.get() {
@@ -210,7 +212,13 @@ impl Merger {
 
     let mut resolved_items = Vec::new();
     for item in items {
-      let resolved = self.merge_internal(item_schema.clone(), item, notifications, parent_org_id.clone(), is_child)?;
+      let resolved = self.merge_internal(
+        item_schema.clone(),
+        item,
+        notifications,
+        parent_org_id.clone(),
+        is_child,
+      )?;
       resolved_items.push(resolved);
     }
     Ok(Value::Array(resolved_items))
@@ -340,7 +348,10 @@ impl Merger {
           if let Some(relation) = self.db.relations.get(&edge.constraint) {
             let parent_is_source = edge.forward;
 
-            let org_id_to_pass = entity_fields.get("organization_id").and_then(|v| v.as_str()).map(|s| s.to_string());
+            let org_id_to_pass = entity_fields
+              .get("organization_id")
+              .and_then(|v| v.as_str())
+              .map(|s| s.to_string());
             if parent_is_source {
               let mut merged_relative = match self.merge_internal(
                 rel_schema.clone(),
@@ -443,7 +454,10 @@ impl Merger {
               }
             }
 
-            let org_id_to_pass = entity_fields.get("organization_id").and_then(|v| v.as_str()).map(|s| s.to_string());
+            let org_id_to_pass = entity_fields
+              .get("organization_id")
+              .and_then(|v| v.as_str())
+              .map(|s| s.to_string());
             let mut relative_responses = Vec::new();
             for relative_item_val in relative_arr {
               if let Value::Object(mut relative_item) = relative_item_val {
@@ -574,7 +588,7 @@ impl Merger {
         .and_then(|v| v.as_str())
         .unwrap_or("");
       let id_val = if entity_id.is_empty() {
-        Value::String(uuid::Uuid::new_v4().to_string())
+        Value::String(uuid::Uuid::now_v7().to_string())
       } else {
         Value::String(entity_id.to_string())
       };
@@ -777,13 +791,8 @@ impl Merger {
       }
     };
 
-    let mut execute_order: Vec<String> = entity_type.hierarchy.clone();
-    if change_kind == "create" {
-      execute_order.reverse();
-    }
-
-    for table_name in execute_order {
-      let table_fields = match grouped_fields.get(&table_name).and_then(|v| v.as_array()) {
+    for table_name in &entity_type.hierarchy {
+      let table_fields = match grouped_fields.get(table_name).and_then(|v| v.as_array()) {
         Some(arr) => arr
           .iter()
           .filter_map(|v| v.as_str().map(|s| s.to_string()))
@@ -946,12 +955,10 @@ impl Merger {
       Value::Object(old_vals)
     };
 
-    let entity_type_name = type_name.as_str().unwrap_or(&type_obj.name);
-
     let mut notification = serde_json::Map::new();
+    notification.insert("kind".to_string(), Value::String(change_kind.to_string()));
     notification.insert("complete".to_string(), Value::Object(complete));
     notification.insert("new".to_string(), new_val_obj.clone());
-    notification.insert("kind".to_string(), Value::String(change_kind.to_string()));
 
     if old_val_obj != Value::Null {
       notification.insert("old".to_string(), old_val_obj.clone());
@@ -964,15 +971,14 @@ impl Merger {
     let mut notify_sql = None;
     if type_obj.historical && change_kind != "replace" {
       let change_sql = format!(
-        "INSERT INTO agreego.change (\"old\", \"new\", \"entity_id\", \"id\", \"kind\", \"modified_at\", \"modified_by\", \"entity_type\") VALUES ({}, {}, {}, {}, {}, {}, {}, {})",
+        "INSERT INTO agreego.change (\"old\", \"new\", \"entity_id\", \"id\", \"kind\", \"modified_at\", \"modified_by\") VALUES ({}, {}, {}, {}, {}, {}, {})",
         Self::quote_literal(&old_val_obj),
         Self::quote_literal(&new_val_obj),
         Self::quote_literal(id_str),
-        Self::quote_literal(&Value::String(uuid::Uuid::new_v4().to_string())),
+        Self::quote_literal(&Value::String(uuid::Uuid::now_v7().to_string())),
         Self::quote_literal(&Value::String(change_kind.to_string())),
         Self::quote_literal(&Value::String(timestamp.to_string())),
-        Self::quote_literal(&Value::String(user_id.to_string())),
-        Self::quote_literal(&Value::String(entity_type_name.to_string()))
+        Self::quote_literal(&Value::String(user_id.to_string()))
       );
 
       self.db.execute(&change_sql, None)?;

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<String, String>,
     node: &Node,
     where_clauses: &mut Vec<String>,
@@ -604,13 +604,35 @@ 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
@@ -621,20 +643,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<String> = 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);
                       }
                     }
                   }

src/tests/fixtures.rs

@@ -1517,6 +1517,18 @@ 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"));

src/tests/mod.rs

@@ -44,7 +44,7 @@ fn test_library_api() {
           {
               "name": "source_schema",
               "variations": ["source_schema"],
-              "hierarchy": ["source_schema", "entity"],
+              "hierarchy": ["entity", "source_schema"],
               "schemas": {
                   "source_schema": {
                       "type": "object",
@@ -60,7 +60,7 @@ fn test_library_api() {
           {
               "name": "target_schema",
               "variations": ["target_schema"],
-              "hierarchy": ["target_schema", "entity"],
+              "hierarchy": ["entity", "target_schema"],
               "schemas": {
                   "target_schema": {
                       "type": "object",
@@ -109,7 +109,7 @@ fn test_library_api() {
                     "field_types": null,
                     "fields": [],
                     "grouped_fields": null,
-                    "hierarchy": ["source_schema", "entity"],
+                    "hierarchy": ["entity", "source_schema"],
                     "historical": false,
                     "id": "",
                     "longevity": null,
@@ -174,7 +174,7 @@ fn test_library_api() {
                     "field_types": null,
                     "fields": [],
                     "grouped_fields": null,
-                    "hierarchy": ["target_schema", "entity"],
+                    "hierarchy": ["entity", "target_schema"],
                     "historical": false,
                     "id": "",
                     "longevity": null,
@@ -251,12 +251,18 @@ fn test_library_api() {
             {
                 "code": "REQUIRED_FIELD_MISSING",
                 "message": "Missing name",
-                "details": { "path": "name" }
+                "details": {
+                    "path": "name",
+                    "schema": "source_schema"
+                }
             },
             {
                 "code": "STRICT_PROPERTY_VIOLATION",
                 "message": "Unexpected property 'wrong'",
-                "details": { "path": "wrong" }
+                "details": {
+                    "path": "wrong",
+                    "schema": "source_schema"
+                }
             }
         ]
     })

src/validator/mod.rs

@@ -69,7 +69,7 @@ impl Validator {
                   path: Some(e.path),
                   cause: None,
                   context: None,
-                  schema: None,
+                  schema: Some(schema_id.to_string()),
                 },
               })
               .collect();
@@ -83,7 +83,7 @@ impl Validator {
             path: Some(e.path),
             cause: None,
             context: None,
-            schema: None,
+            schema: Some(schema_id.to_string()),
           },
         }]),
       }
@@ -95,7 +95,7 @@ impl Validator {
           path: Some("/".to_string()),
           cause: None,
           context: None,
-          schema: None,
+          schema: Some(schema_id.to_string()),
         },
       }])
     }

version

@@ -1 +1 @@
-1.0.155
+1.0.160