version: 1.0.150

GEMINI.md

@@ -295,7 +295,6 @@ The Queryer transforms Postgres into a pre-compiled Semantic Query Engine, desig
     *   **The Dot Convention**: When a schema requests `family: "target.schema"`, the compiler extracts the base type (e.g. `schema`) and looks up its Physical Table definition.
     *   **Multi-Table Branching**: If the Physical Table is a parent to other tables (e.g. `organization` has variations `["organization", "bot", "person"]`), the compiler generates a dynamic `CASE WHEN type = '...' THEN ...` query, expanding into sub-queries for each variation. To ensure safe resolution, the compiler dynamically evaluates correlation boundaries: it attempts standard Relational Edge discovery first. If no explicit relational edge exists (indicating pure Table Inheritance rather than a standard foreign-key graph relationship), it safely invokes a **Table Parity Fallback**. This generates an explicit ID correlation constraint (`AND inner.id = outer.id`), perfectly binding the structural variations back to the parent row to eliminate Cartesian products.
     *   **Single-Table Bypass**: If the Physical Table is a leaf node with only one variation (e.g. `person` has variations `["person"]`), the compiler cleanly bypasses `CASE` generation and compiles a simple `SELECT` across the base table, as all schema extensions (e.g. `light.person`, `full.person`) are guaranteed to reside in the exact same physical row.
-    *   **Polymorphic Relation Type Filtering**: When a relationship maps to a polymorphic target with variations, the Queryer compiles an `IN` clause containing all allowed table variations (e.g., `counterparty_type IN ('bot', 'organization', 'person')`) rather than matching the base type literal, ensuring all polymorphic types are loaded correctly.
 
 ---
 

fixtures/dynamicType.json

@@ -37,14 +37,6 @@
                 },
                 "filter": {
                   "type": "$kind.filter"
-                },
-                "conditions": {
-                  "type": "object",
-                  "properties": {
-                    "new": { "type": "$kind.filter" },
-                    "old": { "type": "$kind.filter" },
-                    "complete": { "type": "$kind.filter" }
-                  }
                 }
               }
             }
@@ -157,48 +149,7 @@
             }
           ]
         }
-      },
-      {
-        "description": "Valid nested filter payload",
-        "data": {
-          "kind": "person",
-          "conditions": {
-            "new": {
-              "age": 30
-            }
-          }
-        },
-        "schema_id": "search",
-        "action": "validate",
-        "expect": {
-          "success": true
-        }
-      },
-      {
-        "description": "Invalid nested filter payload (fails constraint)",
-        "data": {
-          "kind": "person",
-          "conditions": {
-            "new": {
-              "age": "thirty"
-            }
-          }
-        },
-        "schema_id": "search",
-        "action": "validate",
-        "expect": {
-          "success": false,
-          "errors": [
-            {
-              "code": "INVALID_TYPE",
-              "details": {
-                "path": "conditions/new/age"
-              }
-            }
-          ]
-        }
       }
     ]
   }
 ]
-

src/database/compose/mod.rs

@@ -1,7 +1,8 @@
-use serde_json::Value;
 use std::collections::{HashMap, HashSet};
+use serde_json::Value;
 
 pub fn compose(val: &mut Value, errors: &mut Vec<crate::drop::Error>) -> Result<(), String> {
+  let _ = std::fs::write("/Users/awgneo/Repositories/thoughtpatterns/cellular/jspg/traits_debug_val.json", serde_json::to_string_pretty(val).unwrap());
   let mut traits = HashMap::new();
   let mut schemas = HashMap::new();
 
@@ -73,9 +74,7 @@ fn resolve_in_place(
     return;
   }
 
-  let include_opt = current
+  let include_opt = current.as_object_mut().and_then(|obj| obj.remove("include"));
-    .as_object_mut()
-    .and_then(|obj| obj.remove("include"));
   if let Some(include_val) = include_opt {
     if let Some(include_arr) = include_val.as_array() {
       let mut merged_props = serde_json::Map::new();
@@ -146,10 +145,7 @@ fn resolve_in_place(
             visited.remove(inc_name);
 
             // Merge properties (host overrides trait)
-            if let Some(target_props) = resolved_target
+            if let Some(target_props) = resolved_target.get("properties").and_then(|v| v.as_object()) {
-              .get("properties")
-              .and_then(|v| v.as_object())
-            {
               for (k, v) in target_props {
                 if !merged_props.contains_key(k) {
                   merged_props.insert(k.clone(), v.clone());
@@ -158,10 +154,7 @@ fn resolve_in_place(
             }
 
             // Merge patternProperties (host overrides trait)
-            if let Some(target_pat_props) = resolved_target
+            if let Some(target_pat_props) = resolved_target.get("patternProperties").and_then(|v| v.as_object()) {
-              .get("patternProperties")
-              .and_then(|v| v.as_object())
-            {
               for (k, v) in target_pat_props {
                 if !merged_pattern_props.contains_key(k) {
                   merged_pattern_props.insert(k.clone(), v.clone());
@@ -188,19 +181,11 @@ fn resolve_in_place(
             }
 
             // Merge dependencies
-            if let Some(target_deps) = resolved_target
+            if let Some(target_deps) = resolved_target.get("dependencies").and_then(|v| v.as_object()) {
-              .get("dependencies")
-              .and_then(|v| v.as_object())
-            {
               for (dep_prop, dep_val) in target_deps {
                 if let Some(existing_val) = merged_dependencies.get_mut(dep_prop) {
-                  if let (Some(arr_existing), Some(arr_target)) =
+                  if let (Some(arr_existing), Some(arr_target)) = (existing_val.as_array_mut(), dep_val.as_array()) {
-                    (existing_val.as_array_mut(), dep_val.as_array())
+                    let mut set: HashSet<String> = arr_existing.iter().filter_map(|x| x.as_str().map(String::from)).collect();
-                  {
-                    let mut set: HashSet<String> = arr_existing
-                      .iter()
-                      .filter_map(|x| x.as_str().map(String::from))
-                      .collect();
                     for x in arr_target {
                       if let Some(s) = x.as_str() {
                         if set.insert(s.to_string()) {
@@ -218,13 +203,7 @@ fn resolve_in_place(
             // Inherit other non-merged schemas/scalars if not defined in host (type, items, cases, family, format, etc.)
             if let Some(obj) = current.as_object_mut() {
               for (k, v) in resolved_target.as_object().unwrap() {
-                if k != "properties"
+                if k != "properties" && k != "patternProperties" && k != "required" && k != "display" && k != "dependencies" && k != "include" {
-                  && k != "patternProperties"
-                  && k != "required"
-                  && k != "display"
-                  && k != "dependencies"
-                  && k != "include"
-                {
                   if !obj.contains_key(k) {
                     obj.insert(k.clone(), v.clone());
                   }
@@ -250,10 +229,7 @@ fn resolve_in_place(
           obj.insert("properties".to_string(), Value::Object(merged_props));
         }
         if !merged_pattern_props.is_empty() {
-          obj.insert(
+          obj.insert("patternProperties".to_string(), Value::Object(merged_pattern_props));
-            "patternProperties".to_string(),
-            Value::Object(merged_pattern_props),
-          );
         }
         if !merged_required.is_empty() {
           let mut req_vec: Vec<Value> = merged_required.into_iter().map(Value::String).collect();
@@ -266,10 +242,7 @@ fn resolve_in_place(
           obj.insert("display".to_string(), Value::Array(disp_vec));
         }
         if !merged_dependencies.is_empty() {
-          obj.insert(
+          obj.insert("dependencies".to_string(), Value::Object(merged_dependencies));
-            "dependencies".to_string(),
-            Value::Object(merged_dependencies),
-          );
         }
       }
     }
@@ -279,138 +252,47 @@ fn resolve_in_place(
   if let Some(obj) = current.as_object_mut() {
     if let Some(props) = obj.get_mut("properties").and_then(|v| v.as_object_mut()) {
       for (k, v) in props {
-        resolve_in_place(
+        resolve_in_place(v, traits, schemas, errors, schema_id, &format!("{}/{}", path, k), visited);
-          v,
-          traits,
-          schemas,
-          errors,
-          schema_id,
-          &format!("{}/{}", path, k),
-          visited,
-        );
       }
     }
-    if let Some(pat_props) = obj
+    if let Some(pat_props) = obj.get_mut("patternProperties").and_then(|v| v.as_object_mut()) {
-      .get_mut("patternProperties")
-      .and_then(|v| v.as_object_mut())
-    {
       for (k, v) in pat_props {
-        resolve_in_place(
+        resolve_in_place(v, traits, schemas, errors, schema_id, &format!("{}/{}", path, k), visited);
-          v,
-          traits,
-          schemas,
-          errors,
-          schema_id,
-          &format!("{}/{}", path, k),
-          visited,
-        );
       }
     }
     if let Some(items) = obj.get_mut("items") {
-      resolve_in_place(
+      resolve_in_place(items, traits, schemas, errors, schema_id, &format!("{}/items", path), visited);
-        items,
-        traits,
-        schemas,
-        errors,
-        schema_id,
-        &format!("{}/items", path),
-        visited,
-      );
     }
     if let Some(prefix_items) = obj.get_mut("prefixItems").and_then(|v| v.as_array_mut()) {
       for (i, v) in prefix_items.iter_mut().enumerate() {
-        resolve_in_place(
+        resolve_in_place(v, traits, schemas, errors, schema_id, &format!("{}/prefixItems/{}", path, i), visited);
-          v,
-          traits,
-          schemas,
-          errors,
-          schema_id,
-          &format!("{}/prefixItems/{}", path, i),
-          visited,
-        );
       }
     }
     if let Some(additional_props) = obj.get_mut("additionalProperties") {
-      resolve_in_place(
+      resolve_in_place(additional_props, traits, schemas, errors, schema_id, &format!("{}/additionalProperties", path), visited);
-        additional_props,
-        traits,
-        schemas,
-        errors,
-        schema_id,
-        &format!("{}/additionalProperties", path),
-        visited,
-      );
     }
     if let Some(one_of) = obj.get_mut("oneOf").and_then(|v| v.as_array_mut()) {
       for (i, v) in one_of.iter_mut().enumerate() {
-        resolve_in_place(
+        resolve_in_place(v, traits, schemas, errors, schema_id, &format!("{}/oneOf/{}", path, i), visited);
-          v,
-          traits,
-          schemas,
-          errors,
-          schema_id,
-          &format!("{}/oneOf/{}", path, i),
-          visited,
-        );
       }
     }
     if let Some(contains) = obj.get_mut("contains") {
-      resolve_in_place(
+      resolve_in_place(contains, traits, schemas, errors, schema_id, &format!("{}/contains", path), visited);
-        contains,
-        traits,
-        schemas,
-        errors,
-        schema_id,
-        &format!("{}/contains", path),
-        visited,
-      );
     }
     if let Some(not) = obj.get_mut("not") {
-      resolve_in_place(
+      resolve_in_place(not, traits, schemas, errors, schema_id, &format!("{}/not", path), visited);
-        not,
-        traits,
-        schemas,
-        errors,
-        schema_id,
-        &format!("{}/not", path),
-        visited,
-      );
     }
     if let Some(cases) = obj.get_mut("cases").and_then(|v| v.as_array_mut()) {
       for (i, c_val) in cases.iter_mut().enumerate() {
         if let Some(c_obj) = c_val.as_object_mut() {
           if let Some(when) = c_obj.get_mut("when") {
-            resolve_in_place(
+            resolve_in_place(when, traits, schemas, errors, schema_id, &format!("{}/cases/{}/when", path, i), visited);
-              when,
-              traits,
-              schemas,
-              errors,
-              schema_id,
-              &format!("{}/cases/{}/when", path, i),
-              visited,
-            );
           }
           if let Some(then) = c_obj.get_mut("then") {
-            resolve_in_place(
+            resolve_in_place(then, traits, schemas, errors, schema_id, &format!("{}/cases/{}/then", path, i), visited);
-              then,
-              traits,
-              schemas,
-              errors,
-              schema_id,
-              &format!("{}/cases/{}/then", path, i),
-              visited,
-            );
           }
           if let Some(else_) = c_obj.get_mut("else") {
-            resolve_in_place(
+            resolve_in_place(else_, traits, schemas, errors, schema_id, &format!("{}/cases/{}/else", path, i), visited);
-              else_,
-              traits,
-              schemas,
-              errors,
-              schema_id,
-              &format!("{}/cases/{}/else", path, i),
-              visited,
-            );
           }
         }
       }

src/database/executors/mock.rs

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

src/database/executors/mod.rs

@@ -20,12 +20,6 @@ pub trait DatabaseExecutor: Send + Sync {
   /// Returns the current transaction timestamp
   fn timestamp(&self) -> Result<String, String>;
 
-  /// Returns the current auth.origin session context if configured
-  fn auth_origin(&self) -> Result<Option<Value>, String>;
-
-  /// Returns the current punc.name session context if configured
-  fn punc_trigger(&self) -> Result<Option<String>, String>;
-
   #[cfg(test)]
   fn get_queries(&self) -> Vec<String>;
 

src/database/executors/pgrx.rs

@@ -150,46 +150,4 @@ impl DatabaseExecutor for SpiExecutor {
       })
     })
   }
-
-  fn auth_origin(&self) -> Result<Option<Value>, String> {
-    self.transact(|| {
-      Spi::connect(|client| {
-        let mut tup_table = client
-          .select(
-            "SELECT NULLIF(current_setting('auth.origin', true), '')::jsonb",
-            None,
-            &[],
-          )
-          .map_err(|e| format!("SPI Select Error: {}", e))?;
-
-        if let Some(row) = tup_table.next() {
-          if let Ok(Some(jsonb)) = row.get::<pgrx::JsonB>(1) {
-            return Ok(Some(jsonb.0));
-          }
-        }
-        Ok(None)
-      })
-    })
-  }
-
-  fn punc_trigger(&self) -> Result<Option<String>, String> {
-    self.transact(|| {
-      Spi::connect(|client| {
-        let mut tup_table = client
-          .select(
-            "SELECT NULLIF(current_setting('punc.name', true), '')",
-            None,
-            &[],
-          )
-          .map_err(|e| format!("SPI Select Error: {}", e))?;
-
-        if let Some(row) = tup_table.next() {
-          if let Ok(val_opt) = row.get::<String>(1) {
-            return Ok(val_opt);
-          }
-        }
-        Ok(None)
-      })
-    })
-  }
 }

src/database/mod.rs

@@ -206,16 +206,6 @@ impl Database {
     self.executor.timestamp()
   }
 
-  /// Returns the current auth.origin session context if configured
-  pub fn auth_origin(&self) -> Result<Option<Value>, String> {
-    self.executor.auth_origin()
-  }
-
-  /// Returns the current punc.name session context if configured
-  pub fn punc_trigger(&self) -> Result<Option<String>, String> {
-    self.executor.punc_trigger()
-  }
-
   pub fn compile(&mut self, errors: &mut Vec<crate::drop::Error>) {
     // Phase 1: Registration
     self.collect_schemas(errors);

src/merger/mod.rs

@@ -946,25 +946,7 @@ impl Merger {
       Value::Object(old_vals)
     };
 
-    let origin = match self.db.auth_origin() {
-      Ok(Some(orig)) => orig,
-      _ => serde_json::json!({
-        "kind": "user",
-        "user_id": user_id
-      }),
-    };
-
-    let trigger = match self.db.punc_trigger() {
-      Ok(Some(trig)) => trig,
-      _ => "merge_entity".to_string(),
-    };
-
-    let entity_type_name = type_name.as_str().unwrap_or(&type_obj.name);
-
     let mut notification = serde_json::Map::new();
-    notification.insert("type".to_string(), Value::String(entity_type_name.to_string()));
-    notification.insert("trigger".to_string(), Value::String(trigger));
-    notification.insert("origin".to_string(), origin.clone());
     notification.insert("complete".to_string(), Value::Object(complete));
     notification.insert("new".to_string(), new_val_obj.clone());
 
@@ -979,16 +961,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, origin, 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(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(user_id.to_string()))
-        Self::quote_literal(&origin),
-        Self::quote_literal(&Value::String(entity_type_name.to_string()))
       );
 
       self.db.execute(&change_sql, None)?;

src/queryer/compiler.rs

@@ -621,17 +621,19 @@ impl<'a> Compiler<'a> {
                       .get(table_to_alias)
                       .or_else(|| type_aliases.get(&node.parent_alias))
                     {
+                      // 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
+                        let quoted: Vec<String> = type_def.variations.iter()
-                          .variations
-                          .iter()
                           .map(|v| format!("'{}'", v))
                           .collect();
                         where_clauses.push(format!(
-                          "{}.{} IN ({})",
+                          "{}.{} IN ({})", alias, col, quoted.join(", ")
-                          alias,
-                          col,
-                          quoted.join(", ")
                         ));
                       } else {
                         where_clauses.push(format!("{}.{} = '{}'", alias, col, type_name));

src/queryer/mod.rs

@@ -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)
   }

src/tests/fixtures.rs

@@ -1277,18 +1277,6 @@ fn test_dynamic_type_0_4() {
     crate::tests::runner::run_test_case(&path, 0, 4).unwrap();
 }
 
-#[test]
-fn test_dynamic_type_0_5() {
-    let path = format!("{}/fixtures/dynamicType.json", env!("CARGO_MANIFEST_DIR"));
-    crate::tests::runner::run_test_case(&path, 0, 5).unwrap();
-}
-
-#[test]
-fn test_dynamic_type_0_6() {
-    let path = format!("{}/fixtures/dynamicType.json", env!("CARGO_MANIFEST_DIR"));
-    crate::tests::runner::run_test_case(&path, 0, 6).unwrap();
-}
-
 #[test]
 fn test_property_names_0_0() {
     let path = format!("{}/fixtures/propertyNames.json", env!("CARGO_MANIFEST_DIR"));

src/validator/context.rs

@@ -15,7 +15,7 @@ pub struct ValidationContext<'a> {
   pub extensible: bool,
   pub reporter: bool,
   pub overrides: HashSet<String>,
-  pub parents: Vec<&'a serde_json::Value>,
+  pub parent: Option<&'a serde_json::Value>,
 }
 
 impl<'a> ValidationContext<'a> {
@@ -39,7 +39,7 @@ impl<'a> ValidationContext<'a> {
       extensible: effective_extensible,
       reporter,
       overrides,
-      parents: Vec::new(),
+      parent: None,
     }
   }
 
@@ -63,11 +63,6 @@ impl<'a> ValidationContext<'a> {
   ) -> Self {
     let effective_extensible = schema.extensible.unwrap_or(extensible);
 
-    let mut parents = self.parents.clone();
-    if let Some(p) = parent_instance {
-      parents.push(p);
-    }
-
     Self {
       db: self.db,
       root: self.root,
@@ -78,7 +73,7 @@ impl<'a> ValidationContext<'a> {
       extensible: effective_extensible,
       reporter,
       overrides,
-      parents,
+      parent: parent_instance,
     }
   }
 
@@ -90,7 +85,7 @@ impl<'a> ValidationContext<'a> {
       HashSet::new(),
       self.extensible,
       reporter,
-      None,
+      self.parent,
     )
   }
 

src/validator/rules/type.rs

@@ -59,13 +59,12 @@ impl<'a> ValidationContext<'a> {
         };
 
         let mut resolved = false;
-        for parent in self.parents.iter().rev() {
+        if let Some(parent) = self.parent {
           if let Some(obj) = parent.as_object() {
             if let Some(val) = obj.get(var_name) {
               if let Some(str_val) = val.as_str() {
                 target_id = format!("{}{}", str_val, suffix);
                 resolved = true;
-                break;
               }
             }
           }
@@ -98,7 +97,7 @@ impl<'a> ValidationContext<'a> {
           new_overrides,
           self.extensible,
           true, // Reporter mode
-          None,
+          self.parent,
         );
         shadow.root = &global_schema;
         result.merge(shadow.validate()?);

version

@@ -1 +1 @@
-1.0.153
+1.0.150