added kind to merge notifications, re-instated sql pattern matching

GEMINI.md

@@ -179,7 +179,37 @@ In the Punc architecture, filters are automatically synthesized, strongly-typed
     *   **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.
     *   **Logical Operators (`$and`, `$or`)**: Every filter automatically includes `$and` and `$or` arrays, which recursively accept the exact same filter schema, allowing complex logical grouping.
-    *   **Ad-Hoc Extensions (`ad_hoc`)**: Fields stored purely in JSONB bubbles that lack formal database columns can still be queried using the `ad_hoc` object, which passes standard, unvalidated string conditions.
+    *   Ad-Hoc Extensions (`ad_hoc`)**: Fields stored purely in JSONB bubbles that lack formal database columns can still be queried using the `ad_hoc` object, which passes standard, unvalidated string conditions.
+
+### Trait-Based Schema Composition (`traits` & `include`)
+Traits are reusable, non-generating schema fragments used to share properties and relationships horizontally across multiple schemas. They do not generate separate Go/Dart classes.
+
+*   **Traits Namespace**: Defined in a sibling `"traits"` block next to `"schemas"` inside table comments:
+    ```json
+    "traits": {
+      "emailable": {
+        "properties": {
+          "email_addresses": {
+            "type": "array",
+            "items": { "type": "contact", "properties": { "target": { "type": "email_address" } } }
+          }
+        }
+      }
+    }
+    ```
+*   **Include Keyword**: Schemas or traits can use the `"include"` array to compose traits or other schemas:
+    ```json
+    "full.person": {
+      "type": "person",
+      "include": ["contactable", "owner"]
+    }
+    ```
+*   **Resolution and Merging**: During `Database::new()`, includes are resolved and merged at the raw JSON level:
+    *   **`properties` / `patternProperties`**: Map keys from the host schema override/shadow included traits.
+    *   **`required` / `display`**: Lists are merged and deduped.
+    *   **`dependencies`**: Merged by combining and deduping lists.
+    *   **Scalars / Arrays / Items**: Host definitions completely override included traits.
+    *   The `"include"` keyword is stripped, and `"traits"` maps are omitted from serialization.
 
 ---
 
@@ -265,6 +295,7 @@ 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,6 +37,14 @@
                 },
                 "filter": {
                   "type": "$kind.filter"
+                },
+                "conditions": {
+                  "type": "object",
+                  "properties": {
+                    "new": { "type": "$kind.filter" },
+                    "old": { "type": "$kind.filter" },
+                    "complete": { "type": "$kind.filter" }
+                  }
                 }
               }
             }
@@ -149,7 +157,48 @@
             }
           ]
         }
+      },
+      {
+        "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"
+              }
+            }
+          ]
+        }
       }
     ]
   }
 ]
+

fixtures/filter.json

@@ -70,6 +70,10 @@
                   "type": "string",
                   "format": "date-time"
                 },
+                "uuid_field": {
+                  "type": "string",
+                  "format": "uuid"
+                },
                 "tags": {
                   "type": "array",
                   "items": {
@@ -181,6 +185,17 @@
                   ]
                 }
               }
+            },
+            "uuid.condition": {
+              "type": "condition",
+              "properties": {
+                "$eq": {
+                  "type": [
+                    "string",
+                    "null"
+                  ]
+                }
+              }
             }
           }
         }
@@ -244,6 +259,7 @@
                 "billing_address",
                 "gender",
                 "birth_date",
+                "uuid_field",
                 "tags",
                 "ad_hoc",
                 "$and",
@@ -258,6 +274,7 @@
                       "billing_address",
                       "gender",
                       "birth_date",
+                      "uuid_field",
                       "tags",
                       "ad_hoc",
                       "$and",
@@ -278,6 +295,7 @@
                       "billing_address",
                       "gender",
                       "birth_date",
+                      "uuid_field",
                       "tags",
                       "ad_hoc",
                       "$and",
@@ -325,6 +343,12 @@
                     "null"
                   ]
                 },
+                "uuid_field": {
+                  "type": [
+                    "uuid.condition",
+                    "null"
+                  ]
+                },
                 "first_name": {
                   "type": [
                     "string.condition",
@@ -396,6 +420,7 @@
             "string.condition": {},
             "integer.condition": {},
             "date.condition": {},
+            "uuid.condition": {},
             "search": {},
             "search.filter": {
               "type": "filter",

fixtures/merger.json

@@ -1242,7 +1242,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -1255,7 +1256,8 @@
               "  '{{uuid:generated_1}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'person'",
               ")"
             ],
             [
@@ -1274,7 +1276,8 @@
               "      \"first_name\": \"IncompleteFirst\",",
               "      \"last_name\": \"IncompleteLast\",",
               "      \"type\": \"person\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ]
           ]
@@ -1339,7 +1342,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  '{",
@@ -1353,7 +1357,8 @@
               "  '{{uuid:generated_0}}',",
               "  'update',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'person'",
               ")"
             ],
             [
@@ -1373,6 +1378,7 @@
               "      \"contact_id\": \"abc-contact\",",
               "      \"type\": \"person\"",
               "    },",
+              "    \"kind\": \"update\",",
               "    \"old\": {",
               "      \"contact_id\": \"old-contact\"",
               "    }",
@@ -1442,7 +1448,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  '{",
@@ -1456,7 +1463,8 @@
               "  '{{uuid:generated_0}}',",
               "  'update',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'person'",
               ")"
             ],
             [
@@ -1476,6 +1484,7 @@
               "      \"contact_id\": \"abc-contact\",",
               "      \"type\": \"person\"",
               "    },",
+              "    \"kind\": \"update\",",
               "    \"old\": {",
               "      \"contact_id\": \"old-contact\"",
               "    },",
@@ -1540,6 +1549,7 @@
               "    \"new\": {",
               "      \"type\": \"person\"",
               "    },",
+              "    \"kind\": \"replace\",",
               "    \"replaces\": \"{{uuid:data.id}}\"",
               "}'))"
             ]
@@ -1598,7 +1608,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  '{",
@@ -1614,7 +1625,8 @@
               "  '{{uuid:generated_0}}',",
               "  'update',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'person'",
               ")"
             ],
             [
@@ -1632,6 +1644,7 @@
               "      \"last_name\": \"NewLast\",",
               "      \"type\": \"person\"",
               "    },",
+              "    \"kind\": \"update\",",
               "    \"old\": {",
               "      \"first_name\": \"OldFirst\",",
               "      \"last_name\": \"OldLast\"",
@@ -1729,7 +1742,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -1744,7 +1758,8 @@
               "  '{{uuid:generated_0}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'person'",
               ")"
             ],
             [
@@ -1767,7 +1782,8 @@
               "      \"date_of_birth\": \"{{timestamp}}\",",
               "      \"pronouns\": \"\",",
               "      \"type\": \"person\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ]
           ]
@@ -1854,7 +1870,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -1869,7 +1886,8 @@
               "  '{{uuid:generated_2}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'person'",
               ")"
             ],
             [
@@ -1912,7 +1930,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -1925,7 +1944,8 @@
               "  '{{uuid:generated_4}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'order'",
               ")"
             ],
             [
@@ -1944,7 +1964,8 @@
               "      \"total\": 100.0,",
               "      \"type\": \"order\",",
               "      \"customer_id\": \"{{uuid:generated_0}}\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ],
             [
@@ -1967,7 +1988,8 @@
               "      \"date_of_birth\": \"2000-01-01\",",
               "      \"type\": \"person\",",
               "      \"organization_id\": \"{{uuid:generated_1}}\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ]
           ]
@@ -2072,7 +2094,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -2086,7 +2109,8 @@
               "  '{{uuid:generated_1}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'order_line'",
               ")"
             ],
             [
@@ -2097,7 +2121,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -2109,7 +2134,8 @@
               "  '{{uuid:generated_2}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'order'",
               ")"
             ],
             [
@@ -2126,7 +2152,8 @@
               "    \"new\": {",
               "      \"total\": 99.0,",
               "      \"type\": \"order\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ],
             [
@@ -2147,7 +2174,8 @@
               "      \"price\": 99.0,",
               "      \"order_id\": \"abc\",",
               "      \"type\": \"order_line\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ]
           ]
@@ -2279,7 +2307,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -2291,7 +2320,8 @@
               "  '{{uuid:generated_2}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'phone_number'",
               ")"
             ],
             [
@@ -2342,7 +2372,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -2358,7 +2389,8 @@
               "  '{{uuid:generated_4}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'contact'",
               ")"
             ],
             [
@@ -2395,7 +2427,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -2407,7 +2440,8 @@
               "  '{{uuid:generated_6}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'email_address'",
               ")"
             ],
             [
@@ -2458,7 +2492,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -2474,7 +2509,8 @@
               "  '{{uuid:generated_8}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'contact'",
               ")"
             ],
             [
@@ -2511,7 +2547,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -2523,7 +2560,8 @@
               "  '{{uuid:generated_10}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'email_address'",
               ")"
             ],
             [
@@ -2574,7 +2612,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -2590,7 +2629,8 @@
               "  '{{uuid:generated_12}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'contact'",
               ")"
             ],
             [
@@ -2601,7 +2641,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -2614,7 +2655,8 @@
               "  '{{uuid:generated_13}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'person'",
               ")"
             ],
             [
@@ -2633,7 +2675,8 @@
               "      \"first_name\": \"Relation\",",
               "      \"last_name\": \"Test\",",
               "      \"type\": \"person\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ],
             [
@@ -2658,7 +2701,8 @@
               "      \"target_id\": \"{{uuid:generated_1}}\",",
               "      \"target_type\": \"phone_number\",",
               "      \"type\": \"contact\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ],
             [
@@ -2675,7 +2719,8 @@
               "    \"new\": {",
               "      \"number\": \"555-0001\",",
               "      \"type\": \"phone_number\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ],
             [
@@ -2700,7 +2745,8 @@
               "      \"target_id\": \"{{uuid:generated_5}}\",",
               "      \"target_type\": \"email_address\",",
               "      \"type\": \"contact\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ],
             [
@@ -2717,7 +2763,8 @@
               "    \"new\": {",
               "      \"address\": \"test@example.com\",",
               "      \"type\": \"email_address\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ],
             [
@@ -2742,7 +2789,8 @@
               "      \"target_id\": \"{{uuid:generated_9}}\",",
               "      \"target_type\": \"email_address\",",
               "      \"type\": \"contact\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ],
             [
@@ -2759,7 +2807,8 @@
               "    \"new\": {",
               "      \"address\": \"test2@example.com\",",
               "      \"type\": \"email_address\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ]
           ]
@@ -2811,7 +2860,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  '{",
@@ -2825,7 +2875,8 @@
               "  '{{uuid:generated_0}}',",
               "  'delete',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'person'",
               ")"
             ],
             [
@@ -2843,6 +2894,7 @@
               "      \"archived\": true,",
               "      \"type\": \"person\"",
               "    },",
+              "    \"kind\": \"delete\",",
               "    \"old\": {",
               "      \"archived\": false",
               "    }",
@@ -2917,7 +2969,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -2938,7 +2991,8 @@
               "  '{{uuid:generated_1}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'attachment'",
               ")"
             ],
             [
@@ -2973,7 +3027,8 @@
               "        \"type\": \"type_metadata\"",
               "      },",
               "      \"type\": \"attachment\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ]
           ]
@@ -3039,7 +3094,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -3053,7 +3109,8 @@
               "  '{{uuid:generated_1}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'order_line'",
               ")"
             ],
             [
@@ -3074,7 +3131,8 @@
               "      \"price\": 99.0,",
               "      \"order_id\": \"abc\",",
               "      \"type\": \"order_line\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ]
           ]
@@ -3148,7 +3206,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -3162,7 +3221,8 @@
               "  '{{uuid:generated_0}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'order_line'",
               ")"
             ],
             [
@@ -3183,7 +3243,8 @@
               "      \"price\": 99.0,",
               "      \"order_id\": \"abc\",",
               "      \"type\": \"order_line\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ]
           ]
@@ -3288,7 +3349,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -3320,7 +3382,8 @@
               "  '{{uuid:generated_0}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'invoice'",
               ")"
             ]
           ]
@@ -3386,7 +3449,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -3399,7 +3463,8 @@
               "  '{{uuid:generated_0}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'account'",
               ")"
             ],
             [
@@ -3418,7 +3483,8 @@
               "      \"kind\": \"checking\",",
               "      \"routing_number\": \"123456789\",",
               "      \"type\": \"account\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ]
           ]
@@ -3511,7 +3577,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -3525,7 +3592,8 @@
               "  '{{uuid:generated_2}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'person'",
               ")"
             ],
             [
@@ -3600,7 +3668,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -3613,7 +3682,8 @@
               "  '{{uuid:generated_5}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'order_line'",
               ")"
             ],
             [
@@ -3656,7 +3726,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -3669,7 +3740,8 @@
               "  '{{uuid:generated_7}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'order_line'",
               ")"
             ],
             [
@@ -3680,7 +3752,8 @@
               "  \"id\",",
               "  \"kind\",",
               "  \"modified_at\",",
-              "  \"modified_by\"",
+              "  \"modified_by\",",
+              "  \"entity_type\"",
               ")",
               "VALUES (",
               "  NULL,",
@@ -3693,7 +3766,8 @@
               "  '{{uuid:generated_8}}',",
               "  'create',",
               "  '{{timestamp}}',",
-              "  '00000000-0000-0000-0000-000000000000'",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'order'",
               ")"
             ],
             [
@@ -3712,7 +3786,8 @@
               "      \"organization_id\": \"parent-org-id\",",
               "      \"type\": \"order\",",
               "      \"customer_id\": \"{{uuid:generated_0}}\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ],
             [
@@ -3733,7 +3808,8 @@
               "      \"last_name\": \"Person\",",
               "      \"type\": \"person\",",
               "      \"organization_id\": \"{{uuid:generated_1}}\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ],
             [
@@ -3752,7 +3828,8 @@
               "      \"order_id\": \"{{uuid:generated_3}}\",",
               "      \"type\": \"order_line\",",
               "      \"organization_id\": \"parent-org-id\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ],
             [
@@ -3771,7 +3848,8 @@
               "      \"organization_id\": \"explicit-org-id\",",
               "      \"order_id\": \"{{uuid:generated_3}}\",",
               "      \"type\": \"order_line\"",
-              "    }",
+              "    },",
+              "    \"kind\": \"create\"",
               "}'))"
             ]
           ]

fixtures/queryer.json

@@ -59,6 +59,17 @@
               }
             }
           }
+        },
+        {
+          "name": "get_counterparty_orders",
+          "schemas": {
+            "get_counterparty_orders.response": {
+              "type": "array",
+              "items": {
+                "type": "counterparty.order"
+              }
+            }
+          }
         }
       ],
       "enums": [],
@@ -734,6 +745,14 @@
                 }
               }
             },
+            "counterparty.order": {
+              "type": "order",
+              "properties": {
+                "counterparty": {
+                  "family": "organization"
+                }
+              }
+            },
             "light.order": {
               "type": "order",
               "properties": {
@@ -2332,6 +2351,92 @@
             ]
           ]
         }
+      },
+      {
+        "description": "Order select with nested polymorphic counterparty family relation",
+        "action": "query",
+        "schema_id": "get_counterparty_orders.response",
+        "expect": {
+          "success": true,
+          "sql": [
+            [
+              "((SELECT jsonb_strip_nulls((",
+              "  SELECT COALESCE(jsonb_agg(jsonb_build_object(",
+              "    'id', order_1.id,",
+              "    'type', order_1.type,",
+              "    'archived', entity_2.archived,",
+              "    'created_at', entity_2.created_at,",
+              "    'total', order_1.total,",
+              "    'customer_id', order_1.customer_id,",
+              "    'counterparty', (",
+              "      SELECT CASE",
+              "        WHEN organization_3.type = 'bot' THEN ((",
+              "          SELECT jsonb_build_object(",
+              "            'id', entity_7.id,",
+              "            'type', entity_7.type,",
+              "            'archived', entity_7.archived,",
+              "            'created_at', entity_7.created_at,",
+              "            'name', organization_6.name,",
+              "            'token', bot_5.token,",
+              "            'role', bot_5.role",
+              "          )",
+              "          FROM agreego.bot bot_5",
+              "          JOIN agreego.organization organization_6 ON organization_6.id = bot_5.id",
+              "          JOIN agreego.entity entity_7 ON entity_7.id = organization_6.id",
+              "          WHERE",
+              "            NOT entity_7.archived",
+              "            AND entity_7.id = entity_4.id",
+              "        ))",
+              "        WHEN organization_3.type = 'organization' THEN ((",
+              "          SELECT jsonb_build_object(",
+              "            'id', entity_9.id,",
+              "            'type', entity_9.type,",
+              "            'archived', entity_9.archived,",
+              "            'created_at', entity_9.created_at,",
+              "            'name', organization_8.name",
+              "          )",
+              "          FROM agreego.organization organization_8",
+              "          JOIN agreego.entity entity_9 ON entity_9.id = organization_8.id",
+              "          WHERE",
+              "            NOT entity_9.archived",
+              "            AND entity_9.id = entity_4.id",
+              "        ))",
+              "        WHEN organization_3.type = 'person' THEN ((",
+              "          SELECT jsonb_build_object(",
+              "            'id', entity_12.id,",
+              "            'type', entity_12.type,",
+              "            'archived', entity_12.archived,",
+              "            'created_at', entity_12.created_at,",
+              "            'name', organization_11.name,",
+              "            'first_name', person_10.first_name,",
+              "            'last_name', person_10.last_name,",
+              "            'age', person_10.age",
+              "          )",
+              "          FROM agreego.person person_10",
+              "          JOIN agreego.organization organization_11 ON organization_11.id = person_10.id",
+              "          JOIN agreego.entity entity_12 ON entity_12.id = organization_11.id",
+              "          WHERE",
+              "            NOT entity_12.archived",
+              "            AND entity_12.id = entity_4.id",
+              "        ))",
+              "        ELSE NULL",
+              "      END",
+              "      FROM agreego.organization organization_3",
+              "      JOIN agreego.entity entity_4 ON entity_4.id = organization_3.id",
+              "      WHERE",
+              "        NOT entity_4.archived",
+              "        AND order_1.counterparty_id = entity_4.id",
+              "    )",
+              "  )), '[]'::jsonb)",
+              "  FROM agreego.order order_1",
+              "  JOIN agreego.entity entity_2 ON entity_2.id = order_1.id",
+              "  WHERE",
+              "    NOT entity_2.archived",
+              "    AND order_1.counterparty_type IN ('bot', 'organization', 'person')",
+              "))))"
+            ]
+          ]
+        }
       }
     ]
   }

fixtures/traits.json

@@ -0,0 +1,191 @@
+[
+  {
+    "description": "Granular trait composition and list merging",
+    "database": {
+      "types": [
+        {
+          "name": "person",
+          "schemas": {
+            "full.person": {
+              "type": "object",
+              "include": ["emailable", "phonable"],
+              "properties": {
+                "name": { "type": "string" }
+              },
+              "required": ["name"]
+            }
+          },
+          "traits": {
+            "emailable": {
+              "properties": {
+                "email": { "type": "string" }
+              },
+              "required": ["email"],
+              "display": ["email"]
+            },
+            "phonable": {
+              "properties": {
+                "phone": { "type": "string" }
+              },
+              "required": ["phone"],
+              "display": ["phone"]
+            }
+          }
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "valid person with name, email, and phone passes",
+        "schema_id": "full.person",
+        "action": "validate",
+        "data": {
+          "name": "Jane Doe",
+          "email": "jane@example.com",
+          "phone": "555-1234"
+        },
+        "expect": {
+          "success": true
+        }
+      },
+      {
+        "description": "missing email fails validation",
+        "schema_id": "full.person",
+        "action": "validate",
+        "data": {
+          "name": "Jane Doe",
+          "phone": "555-1234"
+        },
+        "expect": {
+          "success": false,
+          "errors": [
+            {
+              "code": "REQUIRED_FIELD_MISSING",
+              "details": {
+                "path": "email"
+              }
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "description": "Local property shadowing",
+    "database": {
+      "types": [
+        {
+          "name": "person",
+          "schemas": {
+            "full.person": {
+              "type": "object",
+              "include": ["emailable"],
+              "properties": {
+                "email": {
+                  "type": "string",
+                  "maxLength": 5
+                }
+              }
+            }
+          },
+          "traits": {
+            "emailable": {
+              "properties": {
+                "email": { "type": "string" }
+              }
+            }
+          }
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "local maxLength overrides trait properties",
+        "schema_id": "full.person",
+        "action": "validate",
+        "data": {
+          "email": "longerthanfive@example.com"
+        },
+        "expect": {
+          "success": false,
+          "errors": [
+            {
+              "code": "MAX_LENGTH_VIOLATED",
+              "details": {
+                "path": "email"
+              }
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "description": "Missing trait compiler error",
+    "database": {
+      "types": [
+        {
+          "name": "person",
+          "schemas": {
+            "full.person": {
+              "type": "object",
+              "include": ["nonexistent_trait"]
+            }
+          }
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "emits TRAIT_NOT_FOUND compile error",
+        "action": "compile",
+        "expect": {
+          "success": false,
+          "errors": [
+            {
+              "code": "TRAIT_NOT_FOUND"
+            }
+          ]
+        }
+      }
+    ]
+  },
+  {
+    "description": "Circular inclusion compiler error",
+    "database": {
+      "types": [
+        {
+          "name": "person",
+          "schemas": {
+            "full.person": {
+              "type": "object",
+              "include": ["trait_a"]
+            }
+          },
+          "traits": {
+            "trait_a": {
+              "include": ["trait_b"]
+            },
+            "trait_b": {
+              "include": ["trait_a"]
+            }
+          }
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "emits CIRCULAR_INCLUDE_DETECTED compile error",
+        "action": "compile",
+        "expect": {
+          "success": false,
+          "errors": [
+            {
+              "code": "CIRCULAR_INCLUDE_DETECTED"
+            }
+          ]
+        }
+      }
+    ]
+  }
+]

src/database/compile/filter.rs

@@ -141,6 +141,8 @@ impl Schema {
         if let Some(fmt) = &schema.obj.format {
           if fmt == "date-time" {
             return Some(vec!["date.condition".to_string()]);
+          } else if fmt == "uuid" {
+            return Some(vec!["uuid.condition".to_string()]);
           }
         }
         Some(vec!["string.condition".to_string()])

src/database/compose/mod.rs

@@ -0,0 +1,419 @@
+use serde_json::Value;
+use std::collections::{HashMap, HashSet};
+
+pub fn compose(val: &mut Value, errors: &mut Vec<crate::drop::Error>) -> Result<(), String> {
+  let mut traits = HashMap::new();
+  let mut schemas = HashMap::new();
+
+  // 1. Gather all traits and schemas from enums, types, and puncs arrays
+  let arrays = ["enums", "types", "puncs"];
+  for arr_name in &arrays {
+    if let Some(arr) = val.get(arr_name).and_then(|v| v.as_array()) {
+      for item in arr {
+        if let Some(item_traits) = item.get("traits").and_then(|v| v.as_object()) {
+          for (name, trait_val) in item_traits {
+            traits.insert(name.clone(), trait_val.clone());
+          }
+        }
+        if let Some(item_schemas) = item.get("schemas").and_then(|v| v.as_object()) {
+          for (name, schema_val) in item_schemas {
+            schemas.insert(name.clone(), schema_val.clone());
+          }
+        }
+      }
+    }
+  }
+
+  // 2. Resolve inclusions recursively in all schema objects
+  for arr_name in &arrays {
+    if let Some(arr) = val.get_mut(arr_name).and_then(|v| v.as_array_mut()) {
+      for item in arr {
+        if let Some(item_schemas) = item.get_mut("schemas").and_then(|v| v.as_object_mut()) {
+          for (schema_id, schema_val) in item_schemas {
+            let mut visited = HashSet::new();
+            resolve_in_place(
+              schema_val,
+              &traits,
+              &schemas,
+              errors,
+              schema_id,
+              schema_id,
+              &mut visited,
+            );
+          }
+        }
+      }
+    }
+  }
+
+  // 3. Strip the "traits" block from each item in enums, types, puncs so it doesn't serialize
+  for arr_name in &arrays {
+    if let Some(arr) = val.get_mut(arr_name).and_then(|v| v.as_array_mut()) {
+      for item in arr {
+        if let Some(obj) = item.as_object_mut() {
+          obj.remove("traits");
+        }
+      }
+    }
+  }
+
+  Ok(())
+}
+
+fn resolve_in_place(
+  current: &mut Value,
+  traits: &HashMap<String, Value>,
+  schemas: &HashMap<String, Value>,
+  errors: &mut Vec<crate::drop::Error>,
+  schema_id: &str,
+  path: &str,
+  visited: &mut HashSet<String>,
+) {
+  if !current.is_object() {
+    return;
+  }
+
+  let include_opt = current
+    .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();
+      let mut merged_required = HashSet::new();
+      let mut merged_display = HashSet::new();
+      let mut merged_dependencies = serde_json::Map::new();
+      let mut merged_pattern_props = serde_json::Map::new();
+
+      // Read current values first to let host override included properties
+      if let Some(req) = current.get("required").and_then(|v| v.as_array()) {
+        for r in req {
+          if let Some(s) = r.as_str() {
+            merged_required.insert(s.to_string());
+          }
+        }
+      }
+      if let Some(disp) = current.get("display").and_then(|v| v.as_array()) {
+        for d in disp {
+          if let Some(s) = d.as_str() {
+            merged_display.insert(s.to_string());
+          }
+        }
+      }
+      if let Some(deps) = current.get("dependencies").and_then(|v| v.as_object()) {
+        for (k, v) in deps {
+          merged_dependencies.insert(k.clone(), v.clone());
+        }
+      }
+      if let Some(pat_props) = current.get("patternProperties").and_then(|v| v.as_object()) {
+        for (k, v) in pat_props {
+          merged_pattern_props.insert(k.clone(), v.clone());
+        }
+      }
+      if let Some(props) = current.get("properties").and_then(|v| v.as_object()) {
+        for (k, v) in props {
+          merged_props.insert(k.clone(), v.clone());
+        }
+      }
+
+      for inc in include_arr {
+        if let Some(inc_name) = inc.as_str() {
+          if visited.contains(inc_name) {
+            errors.push(crate::drop::Error {
+              code: "CIRCULAR_INCLUDE_DETECTED".to_string(),
+              message: format!("Circular inclusion detected for '{}'", inc_name),
+              details: crate::drop::ErrorDetails {
+                schema: Some(schema_id.to_string()),
+                path: Some(path.to_string()),
+                ..Default::default()
+              },
+            });
+            continue;
+          }
+
+          let target_opt = traits.get(inc_name).or_else(|| schemas.get(inc_name));
+          if let Some(target_val) = target_opt {
+            let mut resolved_target = target_val.clone();
+            visited.insert(inc_name.to_string());
+            resolve_in_place(
+              &mut resolved_target,
+              traits,
+              schemas,
+              errors,
+              schema_id,
+              &format!("{}/include/{}", path, inc_name),
+              visited,
+            );
+            visited.remove(inc_name);
+
+            // Merge properties (host overrides trait)
+            if let Some(target_props) = resolved_target
+              .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());
+                }
+              }
+            }
+
+            // Merge patternProperties (host overrides trait)
+            if let Some(target_pat_props) = resolved_target
+              .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());
+                }
+              }
+            }
+
+            // Merge required
+            if let Some(target_req) = resolved_target.get("required").and_then(|v| v.as_array()) {
+              for r in target_req {
+                if let Some(s) = r.as_str() {
+                  merged_required.insert(s.to_string());
+                }
+              }
+            }
+
+            // Merge display
+            if let Some(target_disp) = resolved_target.get("display").and_then(|v| v.as_array()) {
+              for d in target_disp {
+                if let Some(s) = d.as_str() {
+                  merged_display.insert(s.to_string());
+                }
+              }
+            }
+
+            // Merge dependencies
+            if let Some(target_deps) = resolved_target
+              .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)) =
+                    (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();
+                    for x in arr_target {
+                      if let Some(s) = x.as_str() {
+                        if set.insert(s.to_string()) {
+                          arr_existing.push(Value::String(s.to_string()));
+                        }
+                      }
+                    }
+                  }
+                } else {
+                  merged_dependencies.insert(dep_prop.clone(), dep_val.clone());
+                }
+              }
+            }
+
+            // 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"
+                  && k != "patternProperties"
+                  && k != "required"
+                  && k != "display"
+                  && k != "dependencies"
+                  && k != "include"
+                {
+                  if !obj.contains_key(k) {
+                    obj.insert(k.clone(), v.clone());
+                  }
+                }
+              }
+            }
+          } else {
+            errors.push(crate::drop::Error {
+              code: "TRAIT_NOT_FOUND".to_string(),
+              message: format!("Trait or schema '{}' not found for inclusion", inc_name),
+              details: crate::drop::ErrorDetails {
+                schema: Some(schema_id.to_string()),
+                path: Some(path.to_string()),
+                ..Default::default()
+              },
+            });
+          }
+        }
+      }
+
+      if let Some(obj) = current.as_object_mut() {
+        if !merged_props.is_empty() {
+          obj.insert("properties".to_string(), Value::Object(merged_props));
+        }
+        if !merged_pattern_props.is_empty() {
+          obj.insert(
+            "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();
+          req_vec.sort_by(|a, b| a.as_str().unwrap().cmp(b.as_str().unwrap()));
+          obj.insert("required".to_string(), Value::Array(req_vec));
+        }
+        if !merged_display.is_empty() {
+          let mut disp_vec: Vec<Value> = merged_display.into_iter().map(Value::String).collect();
+          disp_vec.sort_by(|a, b| a.as_str().unwrap().cmp(b.as_str().unwrap()));
+          obj.insert("display".to_string(), Value::Array(disp_vec));
+        }
+        if !merged_dependencies.is_empty() {
+          obj.insert(
+            "dependencies".to_string(),
+            Value::Object(merged_dependencies),
+          );
+        }
+      }
+    }
+  }
+
+  // Recursively process children
+  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(
+          v,
+          traits,
+          schemas,
+          errors,
+          schema_id,
+          &format!("{}/{}", path, k),
+          visited,
+        );
+      }
+    }
+    if let Some(pat_props) = obj
+      .get_mut("patternProperties")
+      .and_then(|v| v.as_object_mut())
+    {
+      for (k, v) in pat_props {
+        resolve_in_place(
+          v,
+          traits,
+          schemas,
+          errors,
+          schema_id,
+          &format!("{}/{}", path, k),
+          visited,
+        );
+      }
+    }
+    if let Some(items) = obj.get_mut("items") {
+      resolve_in_place(
+        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(
+          v,
+          traits,
+          schemas,
+          errors,
+          schema_id,
+          &format!("{}/prefixItems/{}", path, i),
+          visited,
+        );
+      }
+    }
+    if let Some(additional_props) = obj.get_mut("additionalProperties") {
+      resolve_in_place(
+        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(
+          v,
+          traits,
+          schemas,
+          errors,
+          schema_id,
+          &format!("{}/oneOf/{}", path, i),
+          visited,
+        );
+      }
+    }
+    if let Some(contains) = obj.get_mut("contains") {
+      resolve_in_place(
+        contains,
+        traits,
+        schemas,
+        errors,
+        schema_id,
+        &format!("{}/contains", path),
+        visited,
+      );
+    }
+    if let Some(not) = obj.get_mut("not") {
+      resolve_in_place(
+        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(
+              when,
+              traits,
+              schemas,
+              errors,
+              schema_id,
+              &format!("{}/cases/{}/when", path, i),
+              visited,
+            );
+          }
+          if let Some(then) = c_obj.get_mut("then") {
+            resolve_in_place(
+              then,
+              traits,
+              schemas,
+              errors,
+              schema_id,
+              &format!("{}/cases/{}/then", path, i),
+              visited,
+            );
+          }
+          if let Some(else_) = c_obj.get_mut("else") {
+            resolve_in_place(
+              else_,
+              traits,
+              schemas,
+              errors,
+              schema_id,
+              &format!("{}/cases/{}/else", path, i),
+              visited,
+            );
+          }
+        }
+      }
+    }
+  }
+}

src/database/executors/mock.rs

@@ -85,6 +85,7 @@ 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,6 +20,7 @@ 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,4 +150,5 @@ impl DatabaseExecutor for SpiExecutor {
       })
     })
   }
+
 }

src/database/mod.rs

@@ -1,5 +1,6 @@
 pub mod action;
 pub mod compile;
+pub mod compose;
 pub mod edge;
 pub mod r#enum;
 pub mod executors;
@@ -41,7 +42,7 @@ pub struct Database {
 }
 
 impl Database {
-  pub fn new(val: &serde_json::Value) -> (Self, crate::drop::Drop) {
+  pub fn new(mut val: serde_json::Value) -> (Self, crate::drop::Drop) {
     let mut db = Self {
       enums: IndexMap::new(),
       types: IndexMap::new(),
@@ -56,101 +57,115 @@ impl Database {
 
     let mut errors = Vec::new();
 
-    if let Some(arr) = val.get("enums").and_then(|v| v.as_array()) {
-      for item in arr {
-        match serde_json::from_value::<Enum>(item.clone()) {
-          Ok(def) => {
-            db.enums.insert(def.name.clone(), def);
-          }
-          Err(e) => {
-            let name = item
-              .get("name")
-              .and_then(|v| v.as_str())
-              .unwrap_or("unknown");
-            errors.push(crate::drop::Error {
-              code: "DATABASE_ENUM_PARSE_FAILED".to_string(),
-              message: format!("Failed to parse database enum '{}': {}", name, e),
-              details: crate::drop::ErrorDetails {
-                context: Some(serde_json::json!(name)),
-                ..Default::default()
-              },
-            });
-          }
-        }
-      }
+    if let Err(e) = compose::compose(&mut val, &mut errors) {
+      errors.push(crate::drop::Error {
+        code: "COMPOSE_FAILED".to_string(),
+        message: format!("Fatal error during trait composition: {}", e),
+        details: crate::drop::ErrorDetails::default(),
+      });
     }
 
-    if let Some(arr) = val.get("types").and_then(|v| v.as_array()) {
-      for item in arr {
-        match serde_json::from_value::<Type>(item.clone()) {
-          Ok(def) => {
-            db.types.insert(def.name.clone(), def);
-          }
-          Err(e) => {
-            let name = item
-              .get("name")
-              .and_then(|v| v.as_str())
-              .unwrap_or("unknown");
-            errors.push(crate::drop::Error {
-              code: "DATABASE_TYPE_PARSE_FAILED".to_string(),
-              message: format!("Failed to parse database type '{}': {}", name, e),
-              details: crate::drop::ErrorDetails {
-                context: Some(serde_json::json!(name)),
-                ..Default::default()
-              },
-            });
-          }
-        }
-      }
-    }
-
-    if let Some(arr) = val.get("relations").and_then(|v| v.as_array()) {
-      for item in arr {
-        match serde_json::from_value::<Relation>(item.clone()) {
-          Ok(def) => {
-            if db.types.contains_key(&def.source_type)
-              && db.types.contains_key(&def.destination_type)
-            {
-              db.relations.insert(def.constraint.clone(), def);
+    if let serde_json::Value::Object(mut map) = val {
+      if let Some(serde_json::Value::Array(arr)) = map.remove("enums") {
+        for item in arr {
+          let name = item
+            .get("name")
+            .and_then(|v| v.as_str())
+            .unwrap_or("unknown")
+            .to_string();
+          match serde_json::from_value::<Enum>(item) {
+            Ok(def) => {
+              db.enums.insert(def.name.clone(), def);
+            }
+            Err(e) => {
+              errors.push(crate::drop::Error {
+                code: "DATABASE_ENUM_PARSE_FAILED".to_string(),
+                message: format!("Failed to parse database enum '{}': {}", name, e),
+                details: crate::drop::ErrorDetails {
+                  context: Some(serde_json::json!(name)),
+                  ..Default::default()
+                },
+              });
             }
           }
-          Err(e) => {
-            let constraint = item
-              .get("constraint")
-              .and_then(|v| v.as_str())
-              .unwrap_or("unknown");
-            errors.push(crate::drop::Error {
-              code: "DATABASE_RELATION_PARSE_FAILED".to_string(),
-              message: format!("Failed to parse database relation '{}': {}", constraint, e),
-              details: crate::drop::ErrorDetails {
-                context: Some(serde_json::json!(constraint)),
-                ..Default::default()
-              },
-            });
+        }
+      }
+
+      if let Some(serde_json::Value::Array(arr)) = map.remove("types") {
+        for item in arr {
+          let name = item
+            .get("name")
+            .and_then(|v| v.as_str())
+            .unwrap_or("unknown")
+            .to_string();
+          match serde_json::from_value::<Type>(item) {
+            Ok(def) => {
+              db.types.insert(def.name.clone(), def);
+            }
+            Err(e) => {
+              errors.push(crate::drop::Error {
+                code: "DATABASE_TYPE_PARSE_FAILED".to_string(),
+                message: format!("Failed to parse database type '{}': {}", name, e),
+                details: crate::drop::ErrorDetails {
+                  context: Some(serde_json::json!(name)),
+                  ..Default::default()
+                },
+              });
+            }
           }
         }
       }
-    }
 
-    if let Some(arr) = val.get("puncs").and_then(|v| v.as_array()) {
-      for item in arr {
-        match serde_json::from_value::<Punc>(item.clone()) {
-          Ok(def) => {
-            db.puncs.insert(def.name.clone(), def);
+      if let Some(serde_json::Value::Array(arr)) = map.remove("relations") {
+        for item in arr {
+          let constraint = item
+            .get("constraint")
+            .and_then(|v| v.as_str())
+            .unwrap_or("unknown")
+            .to_string();
+          match serde_json::from_value::<Relation>(item) {
+            Ok(def) => {
+              if db.types.contains_key(&def.source_type)
+                && db.types.contains_key(&def.destination_type)
+              {
+                db.relations.insert(def.constraint.clone(), def);
+              }
+            }
+            Err(e) => {
+              errors.push(crate::drop::Error {
+                code: "DATABASE_RELATION_PARSE_FAILED".to_string(),
+                message: format!("Failed to parse database relation '{}': {}", constraint, e),
+                details: crate::drop::ErrorDetails {
+                  context: Some(serde_json::json!(constraint)),
+                  ..Default::default()
+                },
+              });
+            }
           }
-          Err(e) => {
-            let name = item
-              .get("name")
-              .and_then(|v| v.as_str())
-              .unwrap_or("unknown");
-            errors.push(crate::drop::Error {
-              code: "DATABASE_PUNC_PARSE_FAILED".to_string(),
-              message: format!("Failed to parse database punc '{}': {}", name, e),
-              details: crate::drop::ErrorDetails {
-                context: Some(serde_json::json!(name)),
-                ..Default::default()
-              },
-            });
+        }
+      }
+
+      if let Some(serde_json::Value::Array(arr)) = map.remove("puncs") {
+        for item in arr {
+          let name = item
+            .get("name")
+            .and_then(|v| v.as_str())
+            .unwrap_or("unknown")
+            .to_string();
+          match serde_json::from_value::<Punc>(item) {
+            Ok(def) => {
+              db.puncs.insert(def.name.clone(), def);
+            }
+            Err(e) => {
+              errors.push(crate::drop::Error {
+                code: "DATABASE_PUNC_PARSE_FAILED".to_string(),
+                message: format!("Failed to parse database punc '{}': {}", name, e),
+                details: crate::drop::ErrorDetails {
+                  context: Some(serde_json::json!(name)),
+                  ..Default::default()
+                },
+              });
+            }
           }
         }
       }
@@ -191,6 +206,7 @@ impl Database {
     self.executor.timestamp()
   }
 
+
   pub fn compile(&mut self, errors: &mut Vec<crate::drop::Error>) {
     // Phase 1: Registration
     self.collect_schemas(errors);

src/jspg.rs

@@ -12,7 +12,7 @@ pub struct Jspg {
 }
 
 impl Jspg {
-  pub fn new(database_val: &serde_json::Value) -> (Self, crate::drop::Drop) {
+  pub fn new(database_val: serde_json::Value) -> (Self, crate::drop::Drop) {
     let (database_instance, drop) = Database::new(database_val);
     let database = Arc::new(database_instance);
     let validator = Validator::new(database.clone());

src/lib.rs

@@ -45,7 +45,7 @@ fn jspg_failure() -> JsonB {
 
 #[cfg_attr(not(test), pg_extern(strict))]
 pub fn jspg_setup(database: Json) -> Json {
-  let (new_jspg, drop) = crate::jspg::Jspg::new(&database.0);
+  let (new_jspg, drop) = crate::jspg::Jspg::new(database.0);
   let new_arc = Arc::new(new_jspg);
 
   // 3. ATOMIC SWAP

src/merger/mod.rs

@@ -946,9 +946,12 @@ 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("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());
@@ -961,14 +964,15 @@ 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) VALUES ({}, {}, {}, {}, {}, {}, {})",
+        "INSERT INTO agreego.change (\"old\", \"new\", \"entity_id\", \"id\", \"kind\", \"modified_at\", \"modified_by\", \"entity_type\") 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(&Value::String(entity_type_name.to_string()))
       );
 
       self.db.execute(&change_sql, None)?;

src/queryer/compiler.rs

@@ -213,6 +213,7 @@ impl<'a> Compiler<'a> {
 
       let mut case_node = node.clone();
       case_node.parent_alias = base_alias.clone();
+      case_node.property_name = None;
       let arc_aliases = std::sync::Arc::new(table_aliases.clone());
       case_node.parent_type_aliases = Some(arc_aliases);
       case_node.parent_type = Some(r#type);
@@ -602,7 +603,7 @@ impl<'a> Compiler<'a> {
 
             if let Some(type_name) = bound_type_name {
               // Ensure this type actually exists
-              if self.db.types.contains_key(&type_name) {
+              if let Some(type_def) = self.db.types.get(&type_name) {
                 if let Some(relation) = self.db.relations.get(&edge.constraint) {
                   let mut poly_col = None;
                   let mut table_to_alias = "";
@@ -620,7 +621,21 @@ impl<'a> Compiler<'a> {
                       .get(table_to_alias)
                       .or_else(|| type_aliases.get(&node.parent_alias))
                     {
-                      where_clauses.push(format!("{}.{} = '{}'", alias, col, type_name));
+                      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(", ")
+                        ));
+                      } else {
+                        where_clauses.push(format!("{}.{} = '{}'", alias, col, type_name));
+                      }
                     }
                   }
                 }

src/tests/fixtures.rs

@@ -1277,6 +1277,18 @@ 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"));
@@ -1499,6 +1511,12 @@ fn test_queryer_0_14() {
     crate::tests::runner::run_test_case(&path, 0, 14).unwrap();
 }
 
+#[test]
+fn test_queryer_0_15() {
+    let path = format!("{}/fixtures/queryer.json", env!("CARGO_MANIFEST_DIR"));
+    crate::tests::runner::run_test_case(&path, 0, 15).unwrap();
+}
+
 #[test]
 fn test_polymorphism_0_0() {
     let path = format!("{}/fixtures/polymorphism.json", env!("CARGO_MANIFEST_DIR"));
@@ -2141,6 +2159,36 @@ fn test_items_15_2() {
     crate::tests::runner::run_test_case(&path, 15, 2).unwrap();
 }
 
+#[test]
+fn test_traits_0_0() {
+    let path = format!("{}/fixtures/traits.json", env!("CARGO_MANIFEST_DIR"));
+    crate::tests::runner::run_test_case(&path, 0, 0).unwrap();
+}
+
+#[test]
+fn test_traits_0_1() {
+    let path = format!("{}/fixtures/traits.json", env!("CARGO_MANIFEST_DIR"));
+    crate::tests::runner::run_test_case(&path, 0, 1).unwrap();
+}
+
+#[test]
+fn test_traits_1_0() {
+    let path = format!("{}/fixtures/traits.json", env!("CARGO_MANIFEST_DIR"));
+    crate::tests::runner::run_test_case(&path, 1, 0).unwrap();
+}
+
+#[test]
+fn test_traits_2_0() {
+    let path = format!("{}/fixtures/traits.json", env!("CARGO_MANIFEST_DIR"));
+    crate::tests::runner::run_test_case(&path, 2, 0).unwrap();
+}
+
+#[test]
+fn test_traits_3_0() {
+    let path = format!("{}/fixtures/traits.json", env!("CARGO_MANIFEST_DIR"));
+    crate::tests::runner::run_test_case(&path, 3, 0).unwrap();
+}
+
 #[test]
 fn test_enum_0_0() {
     let path = format!("{}/fixtures/enum.json", env!("CARGO_MANIFEST_DIR"));

src/tests/runner.rs

@@ -42,7 +42,7 @@ fn get_cached_file(path: &str) -> CompiledSuite {
 
         let mut compiled_suites = Vec::new();
         for suite in suites {
-          let (db, drop) = crate::database::Database::new(&suite.database);
+          let (db, drop) = crate::database::Database::new(suite.database.clone());
           let compiled_db = if drop.errors.is_empty() {
             Ok(Arc::new(db))
           } else {

src/tests/types/case.rs

@@ -96,8 +96,10 @@ impl Case {
         let queries = db.executor.get_queries();
         if std::env::var("UPDATE_EXPECT").is_ok() {
           crate::tests::runner::update_sql_fixture(path, suite_idx, case_idx, &queries);
+          Ok(())
+        } else {
+          expect.assert_sql(&queries)
         }
-        expect.assert_sql(&queries)
       } else {
         Ok(())
       }
@@ -128,8 +130,10 @@ impl Case {
         let queries = db.executor.get_queries();
         if std::env::var("UPDATE_EXPECT").is_ok() {
           crate::tests::runner::update_sql_fixture(path, suite_idx, case_idx, &queries);
+          Ok(())
+        } else {
+          expect.assert_sql(&queries)
         }
-        expect.assert_sql(&queries)
       } else {
         Ok(())
       }

src/tests/types/expect/mod.rs

@@ -1,4 +1,3 @@
-pub mod pattern;
 pub mod sql;
 pub mod drop;
 pub mod schema;

src/tests/types/expect/pattern.rs

@@ -1,132 +0,0 @@
-use super::Expect;
-use regex::Regex;
-use std::collections::HashMap;
-
-impl Expect {
-  /// Advanced SQL execution assertion algorithm ported from `assert.go`.
-  /// This compares two arrays of strings, one containing {{uuid:name}} or {{timestamp}} placeholders,
-  /// and the other containing actual executed database queries. It ensures that placeholder UUIDs
-  /// are consistently mapped to the same actual UUIDs across all lines, and strictly validates line-by-line sequences.
-  pub fn assert_pattern(&self, actual: &[String]) -> Result<(), String> {
-    let patterns = match &self.sql {
-      Some(s) => s,
-      None => return Ok(()),
-    };
-
-    if patterns.len() != actual.len() {
-      return Err(format!(
-        "Length mismatch: expected {} SQL executions, got {}.\nActual Execution Log:\n{}",
-        patterns.len(),
-        actual.len(),
-        actual.join("\n")
-      ));
-    }
-
-    let ws_re = Regex::new(r"\s+").unwrap();
-
-    let types = HashMap::from([
-      (
-        "uuid",
-        r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}",
-      ),
-      (
-        "timestamp",
-        r"\d{4}-\d{2}-\d{2}(?:[ T])\d{2}:\d{2}:\d{2}(?:\.\d{1,6})?(?:Z|\+\d{2}(?::\d{2})?)?",
-      ),
-      ("integer", r"-?\d+"),
-      ("float", r"-?\d+\.\d+"),
-      ("text", r"(?:''|[^'])*"),
-      ("json", r"(?:''|[^'])*"),
-    ]);
-
-    let mut seen: HashMap<String, String> = HashMap::new();
-    let system_uuid = "00000000-0000-0000-0000-000000000000";
-
-    // Placeholder regex: {{type:name}} or {{type}}
-    let ph_rx = Regex::new(r"\{\{([a-z]+)(?:[:]([^}]+))?\}\}").unwrap();
-
-    let clean_str = |s: &str| -> String {
-      let mut s = ws_re.replace_all(s, " ").into_owned();
-      for token in ["(", ")", ",", "{", "}", "\"", "=", "'"] {
-        s = s.replace(&format!(" {}", token), token);
-        s = s.replace(&format!("{} ", token), token);
-      }
-      s.trim().to_string()
-    };
-
-    for (i, pattern_expect) in patterns.iter().enumerate() {
-      let aline_raw = &actual[i];
-      let aline = clean_str(aline_raw);
-
-      let pattern_str_raw = match pattern_expect {
-        super::SqlExpectation::Single(s) => s.clone(),
-        super::SqlExpectation::Multi(m) => m.join(" "),
-      };
-
-      let pattern_str = clean_str(&pattern_str_raw);
-
-      let mut pp = regex::escape(&pattern_str);
-      pp = pp.replace(r"\{\{", "{{").replace(r"\}\}", "}}");
-
-      let mut cap_names = HashMap::new(); // cg_X -> var_name
-      let mut group_idx = 0;
-
-      let mut final_rx_str = String::new();
-      let mut last_match = 0;
-
-      let pp_clone = pp.clone();
-      for caps in ph_rx.captures_iter(&pp_clone) {
-        let full_match = caps.get(0).unwrap();
-        final_rx_str.push_str(&pp[last_match..full_match.start()]);
-
-        let type_name = caps.get(1).unwrap().as_str();
-        let var_name = caps.get(2).map(|m| m.as_str());
-
-        if let Some(name) = var_name {
-          if let Some(val) = seen.get(name) {
-            final_rx_str.push_str(&regex::escape(val));
-          } else {
-            let type_pattern = types.get(type_name).unwrap_or(&".*?");
-            let cg_name = format!("cg_{}", group_idx);
-            final_rx_str.push_str(&format!("(?P<{}>{})", cg_name, type_pattern));
-            cap_names.insert(cg_name, name.to_string());
-            group_idx += 1;
-          }
-        } else {
-          let type_pattern = types.get(type_name).unwrap_or(&".*?");
-          final_rx_str.push_str(&format!("(?:{})", type_pattern));
-        }
-
-        last_match = full_match.end();
-      }
-      final_rx_str.push_str(&pp[last_match..]);
-
-      let final_rx = match Regex::new(&format!("^{}$", final_rx_str)) {
-        Ok(r) => r,
-        Err(e) => return Err(format!("Bad constructed regex: {} -> {}", final_rx_str, e)),
-      };
-
-      if let Some(captures) = final_rx.captures(&aline) {
-        for (cg_name, var_name) in cap_names {
-          if let Some(m) = captures.name(&cg_name) {
-            let matched_str = m.as_str();
-            if matched_str != system_uuid {
-              seen.insert(var_name, matched_str.to_string());
-            }
-          }
-        }
-      } else {
-        return Err(format!(
-          "Line mismatched at execution sequence {}.\nExpected Pattern: {}\nActual SQL: {}\nRegex used: {}\nVariables Mapped: {:?}",
-          i + 1,
-          pattern_str,
-          aline,
-          final_rx_str,
-          seen
-        ));
-      }
-    }
-
-    Ok(())
-  }
-}

src/tests/types/expect/sql.rs

@@ -1,8 +1,9 @@
 use super::Expect;
+use regex::Regex;
 use sqlparser::ast::{Expr, Query, SelectItem, Statement, TableFactor};
 use sqlparser::dialect::PostgreSqlDialect;
 use sqlparser::parser::Parser;
-use std::collections::HashSet;
+use std::collections::{HashMap, HashSet};
 
 impl Expect {
   pub fn assert_sql(&self, actual: &[String]) -> Result<(), String> {
@@ -11,6 +12,7 @@ impl Expect {
         return Err(e);
       }
     }
+    self.assert_pattern(actual)?;
     Ok(())
   }
 
@@ -203,4 +205,132 @@ impl Expect {
     }
     Ok(())
   }
+
+  /// Advanced SQL execution assertion algorithm ported from `assert.go`.
+  /// This compares two arrays of strings, one containing {{uuid:name}} or {{timestamp}} placeholders,
+  /// and the other containing actual executed database queries. It ensures that placeholder UUIDs
+  /// are consistently mapped to the same actual UUIDs across all lines, and strictly validates line-by-line sequences.
+  pub fn assert_pattern(&self, actual: &[String]) -> Result<(), String> {
+    let patterns = match &self.sql {
+      Some(s) => s,
+      None => return Ok(()),
+    };
+
+    if patterns.len() != actual.len() {
+      return Err(format!(
+        "Length mismatch: expected {} SQL executions, got {}.\nActual Execution Log:\n{}",
+        patterns.len(),
+        actual.len(),
+        actual.join("\n")
+      ));
+    }
+
+    let ws_re = Regex::new(r"\s+").unwrap();
+
+    let types = HashMap::from([
+      (
+        "uuid",
+        r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}",
+      ),
+      (
+        "timestamp",
+        r"\d{4}-\d{2}-\d{2}(?:[ T])\d{2}:\d{2}:\d{2}(?:\.\d{1,6})?(?:Z|\+\d{2}(?::\d{2})?)?",
+      ),
+      ("integer", r"-?\d+"),
+      ("float", r"-?\d+\.\d+"),
+      ("text", r"(?:''|[^'])*"),
+      ("json", r"(?:''|[^'])*"),
+    ]);
+
+    let mut seen: HashMap<String, String> = HashMap::new();
+    let system_uuid = "00000000-0000-0000-0000-000000000000";
+
+    // Placeholder regex: {{type:name}} or {{type}}
+    let ph_rx = Regex::new(r"\{\{([a-z]+)(?:[:]([^}]+))?\}\}").unwrap();
+
+    let clean_str = |s: &str| -> String {
+      let mut s = ws_re.replace_all(s, " ").into_owned();
+      for token in ["(", ")", ",", "{", "}", "\"", "=", "'"] {
+        s = s.replace(&format!(" {}", token), token);
+        s = s.replace(&format!("{} ", token), token);
+      }
+      s.trim().to_string()
+    };
+
+    for (i, pattern_expect) in patterns.iter().enumerate() {
+      let aline_raw = &actual[i];
+      let formatted_actual = crate::tests::formatter::SqlFormatter::format(aline_raw).join(" ");
+      let aline = clean_str(&formatted_actual);
+
+      let pattern_str_raw = match pattern_expect {
+        super::SqlExpectation::Single(s) => s.clone(),
+        super::SqlExpectation::Multi(m) => m.join(" "),
+      };
+
+      let pattern_str = clean_str(&pattern_str_raw);
+
+      let mut pp = regex::escape(&pattern_str);
+      pp = pp.replace(r"\{\{", "{{").replace(r"\}\}", "}}");
+
+      let mut cap_names = HashMap::new(); // cg_X -> var_name
+      let mut group_idx = 0;
+
+      let mut final_rx_str = String::new();
+      let mut last_match = 0;
+
+      let pp_clone = pp.clone();
+      for caps in ph_rx.captures_iter(&pp_clone) {
+        let full_match = caps.get(0).unwrap();
+        final_rx_str.push_str(&pp[last_match..full_match.start()]);
+
+        let type_name = caps.get(1).unwrap().as_str();
+        let var_name = caps.get(2).map(|m| m.as_str());
+
+        if let Some(name) = var_name {
+          if let Some(val) = seen.get(name) {
+            final_rx_str.push_str(&regex::escape(val));
+          } else {
+            let type_pattern = types.get(type_name).unwrap_or(&".*?");
+            let cg_name = format!("cg_{}", group_idx);
+            final_rx_str.push_str(&format!("(?P<{}>{})", cg_name, type_pattern));
+            cap_names.insert(cg_name, name.to_string());
+            group_idx += 1;
+          }
+        } else {
+          let type_pattern = types.get(type_name).unwrap_or(&".*?");
+          final_rx_str.push_str(&format!("(?:{})", type_pattern));
+        }
+
+        last_match = full_match.end();
+      }
+      final_rx_str.push_str(&pp[last_match..]);
+
+      let final_rx = match Regex::new(&format!("^{}$", final_rx_str)) {
+        Ok(r) => r,
+        Err(e) => return Err(format!("Bad constructed regex: {} -> {}", final_rx_str, e)),
+      };
+
+      if let Some(captures) = final_rx.captures(&aline) {
+        for (cg_name, var_name) in cap_names {
+          if let Some(m) = captures.name(&cg_name) {
+            let matched_str = m.as_str();
+            if matched_str != system_uuid {
+              seen.insert(var_name, matched_str.to_string());
+            }
+          }
+        }
+      } else {
+        return Err(format!(
+          "Line mismatched at execution sequence {}.\nExpected Pattern: {}\nActual SQL: {}\nRegex used: {}\nVariables Mapped: {:?}",
+          i + 1,
+          pattern_str,
+          aline,
+          final_rx_str,
+          seen
+        ));
+      }
+    }
+
+    Ok(())
+  }
 }

src/validator/context.rs

@@ -15,7 +15,7 @@ pub struct ValidationContext<'a> {
   pub extensible: bool,
   pub reporter: bool,
   pub overrides: HashSet<String>,
-  pub parent: Option<&'a serde_json::Value>,
+  pub parents: Vec<&'a serde_json::Value>,
 }
 
 impl<'a> ValidationContext<'a> {
@@ -39,7 +39,7 @@ impl<'a> ValidationContext<'a> {
       extensible: effective_extensible,
       reporter,
       overrides,
-      parent: None,
+      parents: Vec::new(),
     }
   }
 
@@ -63,6 +63,11 @@ 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,
@@ -73,7 +78,7 @@ impl<'a> ValidationContext<'a> {
       extensible: effective_extensible,
       reporter,
       overrides,
-      parent: parent_instance,
+      parents,
     }
   }
 
@@ -85,7 +90,7 @@ impl<'a> ValidationContext<'a> {
       HashSet::new(),
       self.extensible,
       reporter,
-      self.parent,
+      None,
     )
   }
 

src/validator/rules/type.rs

@@ -59,12 +59,13 @@ impl<'a> ValidationContext<'a> {
         };
 
         let mut resolved = false;
-        if let Some(parent) = self.parent {
+        for parent in self.parents.iter().rev() {
           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;
               }
             }
           }
@@ -97,7 +98,7 @@ impl<'a> ValidationContext<'a> {
           new_overrides,
           self.extensible,
           true, // Reporter mode
-          self.parent,
+          None,
         );
         shadow.root = &global_schema;
         result.merge(shadow.validate()?);

version

@@ -1 +1 @@
-1.0.145
+1.0.155