version: 1.0.144

Cargo.lock

@@ -1663,6 +1663,7 @@ version = "1.0.149"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86"
 dependencies = [
+ "indexmap",
  "itoa",
  "memchr",
  "serde",

Cargo.toml

@@ -6,7 +6,7 @@ edition = "2024"
 [dependencies]
 pgrx = "0.16.1"
 serde = { version = "1.0.228", features = ["derive", "rc"] }
-serde_json = "1.0.149"
+serde_json = { version = "1.0.149", features = ["preserve_order"] }
 lazy_static = "1.5.0"
 once_cell = "1.21.3"
 ahash = "0.8.12"
@@ -30,7 +30,7 @@ pgrx-tests = "0.16.1"
 
 [build-dependencies]
 serde = { version = "1.0.228", features = ["derive"] }
-serde_json = "1.0.149"
+serde_json = { version = "1.0.149", features = ["preserve_order"] }
 
 [lib]
 crate-type = ["cdylib", "lib"]

GEMINI.md

@@ -111,6 +111,10 @@ Polymorphism is how an object boundary can dynamically take on entirely differen
         *   *Setup*: `{ "family": "widget" }` (Where `widget` is a table type but has no external variations).
         *   *Execution*: The engine queries `db.types.get("widget").variations` and finds only `["widget"]`. Since it lacks table inheritance, it is treated as STI. The engine scans the specific, confined `schemas` array directly under `db.types.get("widget")` for any registered key terminating in the base `.widget` (e.g., `stock.widget`). The `family` automatically uses `kind` as the discriminator.
         *   *Options*: `stock` -> `stock.widget`, `tasks` -> `tasks.widget`.
+    *   **Scenario D: JSONB Bubble Inheritance (Field-Backed)**
+        *   *Setup*: `{ "family": "panel" }` (Where `panel` is NOT a table type, but rather an isolated JSONB boundary defined within another table's `schemas`).
+        *   *Execution*: The engine observes `panel` is not in `db.types` (because it has no physical table). It falls back to scanning the global `db.schemas` registry for any registered key terminating in the base `.panel` (e.g., `balance.panel`, `units.panel`). The `family` automatically uses `kind` as the discriminator.
+        *   *Options*: `balance` -> `balance.panel`, `units` -> `units.panel`.
 
 *   **`oneOf` (Strict Tagged Unions)**: A hardcoded list of candidate schemas. Unlike `family` which relies on global DB metadata, `oneOf` forces pure mathematical structural evaluation of the provided candidates. It strictly bans typical JSON Schema "Union of Sets" fallback searches. Every candidate MUST possess a mathematically unique discriminator payload to allow $O(1)$ routing.
     *   **Disjoint Types**: `oneOf: [{ "type": "person" }, { "type": "widget" }]`. The engine succeeds because the native `type` acts as a unique discriminator (`"person"` vs `"widget"`).
@@ -166,6 +170,17 @@ It evaluates as an **Independent Declarative Rules Engine**. Every `Case` block
 ### Format Leniency for Empty Strings
 To simplify frontend form validation, format validators specifically for `uuid`, `date-time`, and `email` explicitly allow empty strings (`""`), treating them as "present but unset".
 
+### Filters & Conditions
+In the Punc architecture, filters are automatically synthesized, strongly-typed JSON Schema boundaries that dictate the exact querying capabilities for any given entity or enum. They are completely generated for you; you never write them manually.
+
+*   **Conditions**: A condition schema is the contract defining the mathematical operations allowed on a primitive field. For example, a `string.condition` allows `$eq`, `$ne`, `$gt`, `$gte`, `$lt`, `$lte`, `$of` (IN), and `$nof` (NOT IN). 
+    *   **Enum Conditions**: When JSPG synthesizes an enum, it dynamically generates an `<enum>.condition` (e.g., `address_kind.condition`). This strongly-typed condition perfectly mirrors the operations of a `string.condition`, but strictly limits the arrays and inputs of `$eq`, `$ne`, `$of`, and `$nof` to the exact variations defined by that Enum. This context ensures that UI generators know exactly when to render `<Select>` dropdowns instead of generic `<Text>` boxes.
+*   **Filters**: A filter schema (e.g., `person.filter`) is an object containing condition properties used to filter entities. It natively supports structural composition:
+    *   **Inherited Properties**: Filters automatically inherit all valid database columns from their base type schema, immediately converting them to their respective `.condition` schemas.
+    *   **Relational Proxies**: If a table has a foreign key to another table, the filter automatically generates a proxy property pointing to the related entity's filter (e.g., the `person` filter automatically gains an `organization` property that points to `organization.filter`), allowing infinitely deep nested queries natively.
+    *   **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.
+
 ---
 
 ## 3. Database
@@ -238,19 +253,14 @@ The Merger provides an automated, high-performance graph synchronization engine.
 The Queryer transforms Postgres into a pre-compiled Semantic Query Engine, designed to serve the exact shape of Punc responses directly via SQL.
 
 ### API Reference
-*   `jspg_query(schema_id text, filters jsonb) -> jsonb`: Compiles the JSON Schema AST of `schema_id` directly into pre-planned, nested multi-JOIN SQL execution trees. Processes `filters` structurally.
+*   `jspg_query(schema_id text, filter jsonb) -> jsonb`: Compiles the JSON Schema AST of `schema_id` directly into pre-planned, nested multi-JOIN SQL execution trees. Processes the `filter` structurally.
 
 ### Core Features
 
 *   **Caching Strategy (DashMap SQL Caching)**: The Queryer securely caches its compiled, static SQL string templates per schema permutation inside the `GLOBAL_JSPG` concurrent `DashMap`. This eliminates recursive AST schema crawling on consecutive requests. Furthermore, it evaluates the strings via Postgres SPI (Server Programming Interface) Prepared Statements, leveraging native database caching of execution plans for extreme performance.
 *   **Schema-to-SQL Compilation**: Compiles JSON Schema ASTs spanning deep arrays directly into static, pre-planned SQL multi-JOIN queries. This explicitly features the `Smart Merge` evaluation engine which natively translates properties through `type` inheritances, mapping JSON fields specifically to their physical database table aliases during translation.
 *   **Root Null-Stripping Optimization**: Unlike traditional nested document builders, the Queryer intelligently defers Postgres' natively recursive `jsonb_strip_nulls` execution to the absolute apex of the compiled query pipeline. The compiler organically layers millions of rapid `jsonb_build_object()` sub-query allocations instantly, wrapping them in a singular overarching pass. This strips all empty optionals uniformly before exiting the database, maximizing CPU throughput.
-*   **Dynamic Filtering**: Binds parameters natively through `cue.filters` objects. The queryer enforces a strict, structured, MongoDB-style operator syntax to map incoming JSON request constraints directly to their originating structural table columns. Filters support both flat path notation (e.g., `"contacts/is_primary": {...}`) and deeply nested recursive JSON structures (e.g., `{"contacts": {"is_primary": {...}}}`). The queryer recursively traverses and flattens these structures at AST compilation time.
-    *   **Equality / Inequality**: `{"$eq": value}`, `{"$ne": value}` automatically map to `=` and `!=`.
-    *   **Comparison**: `{"$gt": ...}`, `{"$gte": ...}`, `{"$lt": ...}`, `{"$lte": ...}` directly compile to Postgres comparison operators (`> `, `>=`, `<`, `<=`).
-    *   **Array Inclusion**: `{"$of": [values]}`, `{"$nof": [values]}` use native `jsonb_array_elements_text()` bindings to enforce `IN` and `NOT IN` logic without runtime SQL injection risks.
-    *   **Text Matching (ILIKE)**: Evaluates `$eq` or `$ne` against string fields containing the `%` character natively into Postgres `ILIKE` and `NOT ILIKE` partial substring matches.
-    *   **Type Casting**: Safely resolves dynamic combinations by casting values instantly into the physical database types mapped in the schema (e.g. parsing `uuid` bindings to `::uuid`, formatting DateTimes to `::timestamptz`, and numbers to `::numeric`).
+*   **Dynamic Filter Execution**: Evaluates the structured `filter` payload and recursively traverses and flattens its paths at AST compilation time. It safely binds parameter constraints using standard operations (e.g., mapping `$eq` to `=`, `$of` to `IN`, `$gt` to `>`) and automatically casts values instantly into the physical database types mapped in the schema (e.g. parsing `uuid` bindings to `::uuid`, formatting DateTimes to `::timestamptz`, and numbers to `::numeric`). Text matching naturally evaluates `$eq` or `$ne` against string fields containing the `%` character natively into Postgres `ILIKE` and `NOT ILIKE`.
 *   **Polymorphic SQL Generation (`family`)**: Compiles `family` properties by analyzing the **Physical Database Variations**, *not* the schema descendants.
     *   **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.
@@ -275,3 +285,26 @@ JSPG abandons the standard `cargo pgrx test` model in favor of native OS testing
 3.  **Modular Test Dispatcher**: The `src/tests/types/` module deserializes the abstract JSON test payloads into `Suite`, `Case`, and `Expect` data structures.
     *   The `compile` action natively asserts the exact output shape of `jspg_stems`, allowing structural and relationship mapping logic to be tested purely through JSON without writing brute-force manual tests in Rust.
 4.  **Unit Context Execution**: When `cargo test` executes, the runner iterates the JSON payloads. Because the tests run natively inside the module via `#cfg(test)`, the Rust compiler globally erases `pgrx` C-linkage, instantiates the `MockExecutor`, and allows for pure structural evaluation of complex database logic completely in memory in parallel.
+
+### SQL Expectation Formatting & Auto-Variablization
+
+Because JSPG SQL compilation generates large, complex relational statements (often featuring dynamically generated UUIDs or timestamps), manually updating expected SQL strings in the test fixtures is error-prone and tedious. To streamline this, JSPG includes a built-in intelligent test fixture formatter.
+
+**When to use it:**
+Whenever you modify the internal SQL generation logic (in the Queryer or Merger) and need to update the expected SQL outputs across the entire test suite.
+
+**How to run it:**
+Run the test suite sequentially while passing the `UPDATE_EXPECT=1` environment variable:
+```bash
+UPDATE_EXPECT=1 cargo test --test-threads=1
+```
+*Note: The `--test-threads=1` flag is strictly required to prevent parallel tests from concurrently overwriting the same JSON fixture files and corrupting them.*
+
+**How it works (Intelligent Variablization):**
+The JSPG engine natively generates actual, random UUIDs in memory for records inserted during `merger` tests. To assert relational integrity without hardcoding ephemeral random strings, the formatter utilizes an intelligent variable extraction map:
+1. **Payload Extraction**: Before evaluating the SQL output, the test runner recursively scans the JSON of the `data` and `mocks` blocks for that specific test case. It maps any physical UUID it finds to its exact JSON path (e.g., `3333...` -> `mocks.0.id`).
+2. **SQL Canonicalization**: The test runner utilizes `sqlparser` to format the raw engine SQL into pristine, multi-line readable structures.
+3. **Variable Mapping**: It scans the formatted SQL using regex for UUIDs. If it encounters a UUID matching the payload extraction map, it replaces it with a template tag like `{{uuid:mocks.0.id}}` or `{{uuid:data.customer_id}}`.
+4. **Generated Fallbacks**: If it encounters a brand-new random UUID that wasn't provided in the inputs (e.g., a newly generated ID for an `INSERT`), it assigns it a sequential tracking variable like `{{uuid:generated_0}}`. Every subsequent appearance of that *exact* same random UUID in the SQL transaction will reuse the `{{uuid:generated_0}}` tag. Timestamps are naturally replaced with `{{timestamp}}`.
+
+This guarantees the `assert_pattern` execution engine can strictly validate that the exact same ID generated for a parent entity is correctly passed as a foreign key to its children across complex database transactions.

fixtures/filter.json

@@ -3,7 +3,24 @@
     "description": "Filter Synthesis Object-Oriented Composition",
     "database": {
       "puncs": [],
-      "enums": [],
+      "enums": [
+        {
+          "id": "enum1",
+          "name": "gender",
+          "module": "core",
+          "source": "gender",
+          "schemas": {
+            "gender": {
+              "type": "string",
+              "enum": [
+                "male",
+                "female",
+                "other"
+              ]
+            }
+          }
+        }
+      ],
       "relations": [
         {
           "id": "rel1",
@@ -46,6 +63,9 @@
                 "billing_address": {
                   "type": "address"
                 },
+                "gender": {
+                  "type": "gender"
+                },
                 "birth_date": {
                   "type": "string",
                   "format": "date-time"
@@ -118,6 +138,9 @@
                 }
               }
             },
+            "filter": {
+              "type": "object"
+            },
             "condition": {
               "type": "object",
               "properties": {
@@ -170,30 +193,75 @@
         "expect": {
           "success": true,
           "schemas": {
+            "gender": {},
+            "gender.condition": {
+              "type": "condition",
+              "compiledPropertyNames": [
+                "kind",
+                "$eq",
+                "$ne",
+                "$of",
+                "$nof"
+              ],
+              "properties": {
+                "$eq": {
+                  "type": [
+                    "gender",
+                    "null"
+                  ]
+                },
+                "$ne": {
+                  "type": [
+                    "gender",
+                    "null"
+                  ]
+                },
+                "$nof": {
+                  "type": [
+                    "array",
+                    "null"
+                  ],
+                  "items": {
+                    "type": "gender"
+                  }
+                },
+                "$of": {
+                  "type": [
+                    "array",
+                    "null"
+                  ],
+                  "items": {
+                    "type": "gender"
+                  }
+                }
+              }
+            },
             "person": {},
             "person.filter": {
               "compiledPropertyNames": [
-                "$and",
-                "$or",
-                "ad_hoc",
+                "first_name",
                 "age",
                 "billing_address",
+                "gender",
                 "birth_date",
-                "first_name",
-                "tags"
+                "tags",
+                "ad_hoc",
+                "$and",
+                "$or"
               ],
               "properties": {
                 "$and": {
                   "items": {
                     "compiledPropertyNames": [
-                      "$and",
-                      "$or",
-                      "ad_hoc",
+                      "first_name",
                       "age",
                       "billing_address",
+                      "gender",
                       "birth_date",
-                      "first_name",
-                      "tags"
+                      "tags",
+                      "ad_hoc",
+                      "$and",
+                      "$or"
                     ],
                     "type": "person.filter"
                   },
@@ -205,14 +273,15 @@
                 "$or": {
                   "items": {
                     "compiledPropertyNames": [
-                      "$and",
-                      "$or",
-                      "ad_hoc",
+                      "first_name",
                       "age",
                       "billing_address",
+                      "gender",
                       "birth_date",
-                      "first_name",
-                      "tags"
+                      "tags",
+                      "ad_hoc",
+                      "$and",
+                      "$or"
                     ],
                     "type": "person.filter"
                   },
@@ -234,7 +303,7 @@
                     }
                   },
                   "type": [
-                    "object",
+                    "filter",
                     "null"
                   ]
                 },
@@ -262,6 +331,12 @@
                     "null"
                   ]
                 },
+                "gender": {
+                  "type": [
+                    "gender.condition",
+                    "null"
+                  ]
+                },
                 "tags": {
                   "type": [
                     "string.condition",
@@ -269,15 +344,15 @@
                   ]
                 }
               },
-              "type": "object"
+              "type": "filter"
             },
             "address": {},
             "address.filter": {
-              "type": "object",
+              "type": "filter",
               "compiledPropertyNames": [
+                "city",
                 "$and",
-                "$or",
-                "city"
+                "$or"
               ],
               "properties": {
                 "$and": {
@@ -287,9 +362,9 @@
                   ],
                   "items": {
                     "compiledPropertyNames": [
+                      "city",
                       "$and",
-                      "$or",
-                      "city"
+                      "$or"
                     ],
                     "type": "address.filter"
                   }
@@ -301,9 +376,9 @@
                   ],
                   "items": {
                     "compiledPropertyNames": [
+                      "city",
                       "$and",
-                      "$or",
-                      "city"
+                      "$or"
                     ],
                     "type": "address.filter"
                   }
@@ -317,18 +392,19 @@
               }
             },
             "condition": {},
+            "filter": {},
             "string.condition": {},
             "integer.condition": {},
             "date.condition": {},
             "search": {},
             "search.filter": {
-              "type": "object",
+              "type": "filter",
               "compiledPropertyNames": [
-                "$and",
-                "$or",
-                "filter",
                 "kind",
-                "name"
+                "name",
+                "filter",
+                "$and",
+                "$or"
               ],
               "properties": {
                 "$and": {
@@ -338,11 +414,11 @@
                   ],
                   "items": {
                     "compiledPropertyNames": [
-                      "$and",
-                      "$or",
-                      "filter",
                       "kind",
-                      "name"
+                      "name",
+                      "filter",
+                      "$and",
+                      "$or"
                     ],
                     "type": "search.filter"
                   }
@@ -354,11 +430,11 @@
                   ],
                   "items": {
                     "compiledPropertyNames": [
-                      "$and",
-                      "$or",
-                      "filter",
                       "kind",
-                      "name"
+                      "name",
+                      "filter",
+                      "$and",
+                      "$or"
                     ],
                     "type": "search.filter"
                   }

fixtures/polymorphism.json

@@ -1,6 +1,6 @@
 [
   {
-    "description": "Vertical family Routing (Across Tables)",
+    "description": "Vertical family Routing (Scenario A)",
     "database": {
       "types": [
         {
@@ -153,7 +153,7 @@
     ]
   },
   {
-    "description": "Matrix family Routing (Vertical + Horizontal Intersections)",
+    "description": "Matrix family Routing (Scenario B)",
     "database": {
       "types": [
         {
@@ -284,7 +284,7 @@
     ]
   },
   {
-    "description": "Horizontal family Routing (Virtual Variations)",
+    "description": "Horizontal family Routing (Scenario C)",
     "database": {
       "types": [
         {
@@ -776,5 +776,123 @@
         }
       }
     ]
+  },
+  {
+    "description": "JSONB Field Bubble family Routing (Scenario D)",
+    "database": {
+      "types": [
+        {
+          "name": "dashboard",
+          "variations": [
+            "dashboard"
+          ],
+          "schemas": {
+            "dashboard": {
+              "type": "object",
+              "properties": {
+                "type": {
+                  "type": "string"
+                }
+              }
+            },
+            "panel": {
+              "type": "object",
+              "required": [
+                "id",
+                "kind"
+              ],
+              "properties": {
+                "id": {
+                  "type": "string"
+                },
+                "kind": {
+                  "type": "string"
+                }
+              }
+            },
+            "balance.panel": {
+              "type": "panel",
+              "properties": {
+                "amount": {
+                  "type": "integer"
+                }
+              }
+            },
+            "units.panel": {
+              "type": "panel",
+              "properties": {
+                "count": {
+                  "type": "integer"
+                }
+              }
+            }
+          }
+        },
+        {
+          "name": "family_panel",
+          "schemas": {
+            "family_panel": {
+              "family": "panel"
+            }
+          }
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "Successfully routes to nested balance panel",
+        "schema_id": "family_panel",
+        "data": {
+          "id": "123",
+          "kind": "balance",
+          "amount": 500
+        },
+        "action": "validate",
+        "expect": {
+          "success": true
+        }
+      },
+      {
+        "description": "Fails validation on routed schema due to invalid property type",
+        "schema_id": "family_panel",
+        "data": {
+          "id": "123",
+          "kind": "balance",
+          "amount": "not_an_int"
+        },
+        "action": "validate",
+        "expect": {
+          "success": false,
+          "errors": [
+            {
+              "code": "INVALID_TYPE",
+              "details": {
+                "path": "amount"
+              }
+            }
+          ]
+        }
+      },
+      {
+        "description": "Fails when discriminator does not match any bubble schema",
+        "schema_id": "family_panel",
+        "data": {
+          "id": "123",
+          "kind": "unknown_panel"
+        },
+        "action": "validate",
+        "expect": {
+          "success": false,
+          "errors": [
+            {
+              "code": "NO_FAMILY_MATCH",
+              "details": {
+                "path": ""
+              }
+            }
+          ]
+        }
+      }
+    ]
   }
 ]

src/database/compile/condition.rs

@@ -0,0 +1,87 @@
+use crate::database::object::{SchemaObject, SchemaTypeOrArray};
+use crate::database::schema::Schema;
+use crate::database::r#enum::Enum;
+use indexmap::IndexMap;
+use std::sync::Arc;
+
+impl Enum {
+  pub fn compile_condition(&self) -> Schema {
+    let mut props = IndexMap::new();
+    let enum_name = &self.name;
+
+    let mut eq_obj = SchemaObject::default();
+    eq_obj.type_ = Some(SchemaTypeOrArray::Multiple(vec![
+      enum_name.clone(),
+      "null".to_string(),
+    ]));
+    props.insert(
+      "$eq".to_string(),
+      Arc::new(Schema {
+        obj: eq_obj,
+        always_fail: false,
+      }),
+    );
+
+    let mut ne_obj = SchemaObject::default();
+    ne_obj.type_ = Some(SchemaTypeOrArray::Multiple(vec![
+      enum_name.clone(),
+      "null".to_string(),
+    ]));
+    props.insert(
+      "$ne".to_string(),
+      Arc::new(Schema {
+        obj: ne_obj,
+        always_fail: false,
+      }),
+    );
+
+    let mut of_obj = SchemaObject::default();
+    of_obj.type_ = Some(SchemaTypeOrArray::Multiple(vec![
+      "array".to_string(),
+      "null".to_string(),
+    ]));
+    of_obj.items = Some(Arc::new(Schema {
+      obj: SchemaObject {
+        type_: Some(SchemaTypeOrArray::Single(enum_name.clone())),
+        ..Default::default()
+      },
+      always_fail: false,
+    }));
+    props.insert(
+      "$of".to_string(),
+      Arc::new(Schema {
+        obj: of_obj,
+        always_fail: false,
+      }),
+    );
+
+    let mut nof_obj = SchemaObject::default();
+    nof_obj.type_ = Some(SchemaTypeOrArray::Multiple(vec![
+      "array".to_string(),
+      "null".to_string(),
+    ]));
+    nof_obj.items = Some(Arc::new(Schema {
+      obj: SchemaObject {
+        type_: Some(SchemaTypeOrArray::Single(enum_name.clone())),
+        ..Default::default()
+      },
+      always_fail: false,
+    }));
+    props.insert(
+      "$nof".to_string(),
+      Arc::new(Schema {
+        obj: nof_obj,
+        always_fail: false,
+      }),
+    );
+
+    let mut cond_obj = SchemaObject::default();
+    cond_obj.type_ = Some(SchemaTypeOrArray::Single("condition".to_string()));
+    cond_obj.properties = Some(props);
+
+    Schema {
+      obj: cond_obj,
+      always_fail: false,
+    }
+  }
+}

src/database/compile/edges.rs

@@ -1,4 +1,5 @@
 use crate::database::schema::Schema;
+use indexmap::IndexMap;
 
 impl Schema {
   /// Dynamically infers and compiles all structural database relationships between this Schema
@@ -10,10 +11,10 @@ impl Schema {
     db: &crate::database::Database,
     root_id: &str,
     path: &str,
-    props: &std::collections::BTreeMap<String, std::sync::Arc<Schema>>,
+    props: &IndexMap<String, std::sync::Arc<Schema>>,
     errors: &mut Vec<crate::drop::Error>,
-  ) -> std::collections::BTreeMap<String, crate::database::edge::Edge> {
-    let mut schema_edges = std::collections::BTreeMap::new();
+  ) -> IndexMap<String, crate::database::edge::Edge> {
+    let mut schema_edges = IndexMap::new();
 
     // Determine the physical Database Table Name this schema structurally represents
     // Plucks the polymorphic discriminator via dot-notation (e.g. extracting "person" from "full.person")

src/database/compile/filter.rs

@@ -1,7 +1,7 @@
 use crate::database::Database;
 use crate::database::object::{SchemaObject, SchemaTypeOrArray};
 use crate::database::schema::Schema;
-use std::collections::BTreeMap;
+use indexmap::IndexMap;
 use std::sync::Arc;
 
 impl Schema {
@@ -12,7 +12,7 @@ impl Schema {
     _errors: &mut Vec<crate::drop::Error>,
   ) -> Option<Schema> {
     if let Some(props) = self.obj.compiled_properties.get() {
-      let mut filter_props = BTreeMap::new();
+      let mut filter_props = IndexMap::new();
       for (key, child) in props {
         let mut structural_filter = None;
 
@@ -34,7 +34,7 @@ impl Schema {
 
         if let Some(mut inline_schema) = structural_filter {
           inline_schema.obj.type_ = Some(SchemaTypeOrArray::Multiple(vec![
-            "object".to_string(),
+            "filter".to_string(),
             "null".to_string(),
           ]));
 
@@ -42,7 +42,7 @@ impl Schema {
             key.clone(),
             Arc::new(inline_schema),
           );
-        } else if let Some(mut filter_type) = Self::resolve_filter_type(child) {
+        } else if let Some(mut filter_type) = Self::resolve_filter_type(child, _db) {
           filter_type.push("null".to_string());
 
           let mut child_obj = SchemaObject::default();
@@ -104,8 +104,8 @@ impl Schema {
         }
 
         let mut wrapper_obj = SchemaObject::default();
-        // Filters are just plain objects containing conditions, no inheritance required
-        wrapper_obj.type_ = Some(SchemaTypeOrArray::Single("object".to_string()));
+        // Filters now inherit from the base 'filter' type
+        wrapper_obj.type_ = Some(SchemaTypeOrArray::Single("filter".to_string()));
         wrapper_obj.properties = Some(filter_props);
 
         return Some(Schema {
@@ -117,16 +117,16 @@ impl Schema {
     None
   }
 
-  fn resolve_filter_type(schema: &Arc<Schema>) -> Option<Vec<String>> {
+  fn resolve_filter_type(schema: &Arc<Schema>, db: &Database) -> Option<Vec<String>> {
     if let Some(type_) = &schema.obj.type_ {
       match type_ {
         SchemaTypeOrArray::Single(t) => {
-          return Self::map_filter_string(t, schema);
+          return Self::map_filter_string(t, schema, db);
         }
         SchemaTypeOrArray::Multiple(types) => {
           for t in types {
             if t != "null" {
-              return Self::map_filter_string(t, schema);
+              return Self::map_filter_string(t, schema, db);
             }
           }
         }
@@ -135,7 +135,7 @@ impl Schema {
     None
   }
 
-  fn map_filter_string(t: &str, schema: &Arc<Schema>) -> Option<Vec<String>> {
+  fn map_filter_string(t: &str, schema: &Arc<Schema>, db: &Database) -> Option<Vec<String>> {
     match t {
       "string" => {
         if let Some(fmt) = &schema.obj.format {
@@ -151,14 +151,18 @@ impl Schema {
       "object" => None, // Inline structures are ignored in Composed References
       "array" => {
         if let Some(items) = &schema.obj.items {
-          return Self::resolve_filter_type(items);
+          return Self::resolve_filter_type(items, db);
         }
         None
       },
       "null" => None,
       custom => {
-        // Assume anything else is a Relational cross-boundary that already has its own .filter dynamically built
-        Some(vec![format!("{}.filter", custom)])
+        if db.enums.contains_key(custom) {
+          Some(vec![format!("{}.condition", custom)])
+        } else {
+          // Assume anything else is a Relational cross-boundary that already has its own .filter dynamically built
+          Some(vec![format!("{}.filter", custom)])
+        }
       }
     }
   }

src/database/compile/mod.rs

@@ -1,9 +1,11 @@
 pub mod collection;
+pub mod condition;
 pub mod edges;
 pub mod filter;
 pub mod polymorphism;
 
 use crate::database::schema::Schema;
+use indexmap::IndexMap;
 
 impl Schema {
   pub fn compile(
@@ -47,7 +49,7 @@ impl Schema {
       }
     }
 
-    let mut props = std::collections::BTreeMap::new();
+    let mut props = IndexMap::new();
 
     // 1. Resolve INHERITANCE dependencies first
     if let Some(crate::database::object::SchemaTypeOrArray::Single(t)) = &self.obj.type_ {
@@ -123,8 +125,7 @@ impl Schema {
 
     // 4. Set the OnceLock!
     let _ = self.obj.compiled_properties.set(props.clone());
-    let mut names: Vec<String> = props.keys().cloned().collect();
-    names.sort();
+    let names: Vec<String> = props.keys().cloned().collect();
     let _ = self.obj.compiled_property_names.set(names);
 
     // 5. Compute Edges natively

src/database/compile/polymorphism.rs

@@ -1,3 +1,4 @@
+use indexmap::IndexSet;
 use crate::database::schema::Schema;
 
 impl Schema {
@@ -8,8 +9,8 @@ impl Schema {
     path: &str,
     errors: &mut Vec<crate::drop::Error>,
   ) {
-    let mut options = std::collections::BTreeMap::new();
-    let mut strategy = String::new();
+    let mut options = indexmap::IndexMap::new();
+    let strategy: &str;
 
     if let Some(family) = &self.obj.family {
       // Formalize the <Variant>.<Base> topology
@@ -24,7 +25,7 @@ impl Schema {
       if let Some(type_def) = db.types.get(&family_base) {
         if type_def.variations.len() > 1 && type_def.variations.iter().any(|v| v != &family_base) {
           // Scenario A / B: Table Variations
-          strategy = "type".to_string();
+          strategy = "type";
           for var in &type_def.variations {
             let target_id = if family_prefix.is_empty() {
               var.to_string()
@@ -38,7 +39,7 @@ impl Schema {
           }
         } else {
           // Scenario C: Single Table Inheritance (Horizontal)
-          strategy = "kind".to_string();
+          strategy = "kind";
 
           let suffix = format!(".{}", family_base);
 
@@ -50,12 +51,25 @@ impl Schema {
             }
           }
         }
+      } else {
+        // Scenario D: Field-Backed JSONB Bubble STI (No explicit table representation)
+        strategy = "kind";
+        let suffix = format!(".{}", family_base);
+
+        // Scan the entire database schemas registry for matching suffixes
+        for (id, schema) in &db.schemas {
+          if id.ends_with(&suffix) || id == &family_base {
+            if let Some(kind_val) = schema.obj.get_discriminator_value("kind", id) {
+              options.insert(kind_val, (None, Some(id.to_string())));
+            }
+          }
+        }
       }
     } else if let Some(one_of) = &self.obj.one_of {
-      let mut type_vals = std::collections::HashSet::new();
-      let mut kind_vals = std::collections::HashSet::new();
+      let mut type_vals = IndexSet::new();
+      let mut kind_vals = IndexSet::new();
       let mut disjoint_base = true;
-      let mut structural_types = std::collections::HashSet::new();
+      let mut structural_types = IndexSet::new();
 
       for c in one_of {
         let mut child_id = String::new();
@@ -84,7 +98,7 @@ impl Schema {
       }
 
       if disjoint_base && structural_types.len() == one_of.len() {
-        strategy = "".to_string();
+        strategy = "";
         for (i, c) in one_of.iter().enumerate() {
           if let Some(crate::database::object::SchemaTypeOrArray::Single(t)) = &c.obj.type_ {
             if crate::database::object::is_primitive_type(t) {
@@ -96,11 +110,11 @@ impl Schema {
         }
       } else {
         strategy = if type_vals.len() > 1 && type_vals.len() == one_of.len() {
-          "type".to_string()
+          "type"
         } else if kind_vals.len() > 1 && kind_vals.len() == one_of.len() {
-          "kind".to_string()
+          "kind"
         } else {
-          "".to_string()
+          ""
         };
 
         if strategy.is_empty() {
@@ -148,7 +162,7 @@ impl Schema {
 
     if !options.is_empty() {
       if !strategy.is_empty() {
-        let _ = self.obj.compiled_discriminator.set(strategy);
+        let _ = self.obj.compiled_discriminator.set(strategy.to_string());
       }
       let _ = self.obj.compiled_options.set(options);
     }

src/database/enum.rs

@@ -1,4 +1,5 @@
 use crate::database::schema::Schema;
+use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 
@@ -10,5 +11,5 @@ pub struct Enum {
   pub source: String,
   pub values: Vec<String>,
   #[serde(default)]
-  pub schemas: std::collections::BTreeMap<String, Arc<Schema>>,
+  pub schemas: IndexMap<String, Arc<Schema>>,
 }

src/database/mod.rs

@@ -23,18 +23,18 @@ use punc::Punc;
 use relation::Relation;
 use schema::Schema;
 use serde_json::Value;
-use std::collections::HashMap;
+use indexmap::IndexMap;
 use std::sync::Arc;
 use r#type::Type;
 
 #[derive(serde::Serialize)]
 pub struct Database {
-  pub enums: HashMap<String, Enum>,
-  pub types: HashMap<String, Type>,
-  pub puncs: HashMap<String, Punc>,
-  pub relations: HashMap<String, Relation>,
+  pub enums: IndexMap<String, Enum>,
+  pub types: IndexMap<String, Type>,
+  pub puncs: IndexMap<String, Punc>,
+  pub relations: IndexMap<String, Relation>,
   #[serde(skip)]
-  pub schemas: HashMap<String, Arc<Schema>>,
+  pub schemas: IndexMap<String, Arc<Schema>>,
   #[serde(skip)]
   pub executor: Box<dyn DatabaseExecutor + Send + Sync>,
 }
@@ -42,11 +42,11 @@ pub struct Database {
 impl Database {
   pub fn new(val: &serde_json::Value) -> (Self, crate::drop::Drop) {
     let mut db = Self {
-      enums: HashMap::new(),
-      types: HashMap::new(),
-      relations: HashMap::new(),
-      puncs: HashMap::new(),
-      schemas: HashMap::new(),
+      enums: IndexMap::new(),
+      types: IndexMap::new(),
+      relations: IndexMap::new(),
+      puncs: IndexMap::new(),
+      schemas: IndexMap::new(),
       #[cfg(not(test))]
       executor: Box::new(SpiExecutor::new()),
       #[cfg(test)]
@@ -191,9 +191,10 @@ impl Database {
   }
 
   pub fn compile(&mut self, errors: &mut Vec<crate::drop::Error>) {
+    // Phase 1: Registration
     self.collect_schemas(errors);
 
-    // Formally evaluate properties with strict 3-pass Ordered Graph execution natively
+    // Phase 2: Formally evaluate properties with strict 3-pass Ordered Graph execution natively
     for (_, enum_def) in &self.enums {
       for (schema_id, schema_arc) in &enum_def.schemas {
         let root_id = schema_id.split('/').next().unwrap_or(schema_id);
@@ -219,7 +220,25 @@ impl Database {
       }
     }
 
-    // Phase 2: Synthesize Composed Filter References
+    // Phase 3: Synthesize Virtual Boundaries
+    let mut compile_ids = self.compile_filters(errors);
+    let mut condition_ids = self.compile_conditions();
+    compile_ids.append(&mut condition_ids);
+
+    // Phase 4: Compile Virtual Boundaries
+    // Now actively compile the newly injected schemas to lock all nested compose references natively
+    for (_, id) in compile_ids {
+      if let Some(schema_arc) = self.schemas.get(&id).cloned() {
+        let root_id = id.split('/').next().unwrap_or(&id);
+        schema_arc
+          .as_ref()
+          .compile(self, root_id, id.clone(), errors);
+      }
+    }
+  }
+
+  /// Synthesizes Composed Filter References for all table-backed boundaries.
+  fn compile_filters(&mut self, errors: &mut Vec<crate::drop::Error>) -> Vec<(String, String)> {
     let mut filter_schemas = Vec::new();
     for (type_name, type_def) in &self.types {
       for (id, schema_arc) in &type_def.schemas {
@@ -246,21 +265,30 @@ impl Database {
         t.schemas.insert(id, filter_arc);
       }
     }
+    filter_ids
+  }
 
-    // Now actively compile the newly injected filters to lock all nested compose references natively
-    for (type_name, id) in filter_ids {
-      if let Some(filter_arc) = self
-        .types
-        .get(&type_name)
-        .and_then(|t| t.schemas.get(&id))
-        .cloned()
-      {
-        let root_id = id.split('/').next().unwrap_or(&id);
-        filter_arc
-          .as_ref()
-          .compile(self, root_id, id.clone(), errors);
+  /// Synthesizes strong Enum Conditions mirroring the string.condition capabilities.
+  fn compile_conditions(&mut self) -> Vec<(String, String)> {
+    let mut enum_conditions = Vec::new();
+    for (enum_name, enum_def) in &self.enums {
+      let cond_schema = enum_def.compile_condition();
+      enum_conditions.push((
+        enum_name.clone(),
+        format!("{}.condition", enum_name),
+        Arc::new(cond_schema),
+      ));
+    }
+
+    let mut condition_ids = Vec::new();
+    for (enum_name, id, cond_arc) in enum_conditions {
+      condition_ids.push((enum_name.clone(), id.clone()));
+      self.schemas.insert(id.clone(), cond_arc.clone());
+      if let Some(e) = self.enums.get_mut(&enum_name) {
+        e.schemas.insert(id.clone(), cond_arc.clone());
       }
     }
+    condition_ids
   }
 
   fn collect_schemas(&mut self, errors: &mut Vec<crate::drop::Error>) {

src/database/object.rs

@@ -1,7 +1,7 @@
 use crate::database::schema::Schema;
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
-use std::collections::BTreeMap;
+use indexmap::IndexMap;
 use std::sync::Arc;
 use std::sync::OnceLock;
 
@@ -30,10 +30,10 @@ pub struct SchemaObject {
 
   // Object Keywords
   #[serde(skip_serializing_if = "Option::is_none")]
-  pub properties: Option<BTreeMap<String, Arc<Schema>>>,
+  pub properties: Option<IndexMap<String, Arc<Schema>>>,
   #[serde(rename = "patternProperties")]
   #[serde(skip_serializing_if = "Option::is_none")]
-  pub pattern_properties: Option<BTreeMap<String, Arc<Schema>>>,
+  pub pattern_properties: Option<IndexMap<String, Arc<Schema>>>,
   #[serde(rename = "additionalProperties")]
   #[serde(skip_serializing_if = "Option::is_none")]
   pub additional_properties: Option<Arc<Schema>>,
@@ -46,7 +46,7 @@ pub struct SchemaObject {
 
   // dependencies can be schema dependencies or property dependencies
   #[serde(skip_serializing_if = "Option::is_none")]
-  pub dependencies: Option<BTreeMap<String, Dependency>>,
+  pub dependencies: Option<IndexMap<String, Dependency>>,
 
   // Array Keywords
   #[serde(rename = "items")]
@@ -147,7 +147,7 @@ pub struct SchemaObject {
   #[serde(skip_serializing_if = "Option::is_none")]
   pub control: Option<String>,
   #[serde(skip_serializing_if = "Option::is_none")]
-  pub actions: Option<BTreeMap<String, Action>>,
+  pub actions: Option<IndexMap<String, Action>>,
   #[serde(skip_serializing_if = "Option::is_none")]
   pub computer: Option<String>,
   #[serde(default)]
@@ -164,7 +164,7 @@ pub struct SchemaObject {
 
   // Internal structural representation caching active AST Node maps. Unlike the Go framework counterpart, the JSPG implementation DOES natively include ALL ancestral inheritance boundary schemas because it compiles locally against the raw database graph.
   #[serde(skip)]
-  pub compiled_properties: OnceLock<BTreeMap<String, Arc<Schema>>>,
+  pub compiled_properties: OnceLock<IndexMap<String, Arc<Schema>>>,
 
   #[serde(rename = "compiledDiscriminator")]
   #[serde(skip_deserializing)]
@@ -176,13 +176,13 @@ pub struct SchemaObject {
   #[serde(skip_deserializing)]
   #[serde(skip_serializing_if = "crate::database::object::is_once_lock_map_empty")]
   #[serde(serialize_with = "crate::database::object::serialize_once_lock")]
-  pub compiled_options: OnceLock<BTreeMap<String, (Option<usize>, Option<String>)>>,
+  pub compiled_options: OnceLock<IndexMap<String, (Option<usize>, Option<String>)>>,
 
   #[serde(rename = "compiledEdges")]
   #[serde(skip_deserializing)]
   #[serde(skip_serializing_if = "crate::database::object::is_once_lock_map_empty")]
   #[serde(serialize_with = "crate::database::object::serialize_once_lock")]
-  pub compiled_edges: OnceLock<BTreeMap<String, crate::database::edge::Edge>>,
+  pub compiled_edges: OnceLock<IndexMap<String, crate::database::edge::Edge>>,
 
   #[serde(skip)]
   pub compiled_format: OnceLock<CompiledFormat>,
@@ -245,7 +245,7 @@ pub fn serialize_once_lock<T: serde::Serialize, S: serde::Serializer>(
   }
 }
 
-pub fn is_once_lock_map_empty<K, V>(lock: &OnceLock<std::collections::BTreeMap<K, V>>) -> bool {
+pub fn is_once_lock_map_empty<K, V>(lock: &OnceLock<indexmap::IndexMap<K, V>>) -> bool {
   lock.get().map_or(true, |m| m.is_empty())
 }
 

src/database/punc.rs

@@ -1,5 +1,6 @@
 use crate::database::page::Page;
 use crate::database::schema::Schema;
+use indexmap::IndexMap;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
 
@@ -18,5 +19,5 @@ pub struct Punc {
   pub save: Option<String>,
   pub page: Option<Page>,
   #[serde(default)]
-  pub schemas: std::collections::BTreeMap<String, Arc<Schema>>,
+  pub schemas: IndexMap<String, Arc<Schema>>,
 }

src/database/type.rs

@@ -1,4 +1,4 @@
-use std::collections::HashSet;
+use indexmap::{IndexMap, IndexSet};
 
 use crate::database::schema::Schema;
 use serde::{Deserialize, Serialize};
@@ -25,7 +25,7 @@ pub struct Type {
   #[serde(default)]
   pub hierarchy: Vec<String>,
   #[serde(default)]
-  pub variations: HashSet<String>,
+  pub variations: IndexSet<String>,
   #[serde(default)]
   pub relationship: bool,
   #[serde(default)]
@@ -39,5 +39,5 @@ pub struct Type {
   pub default_fields: Vec<String>,
   pub field_types: Option<Value>,
   #[serde(default)]
-  pub schemas: std::collections::BTreeMap<String, Arc<Schema>>,
+  pub schemas: IndexMap<String, Arc<Schema>>,
 }

src/lib.rs

@@ -7,6 +7,9 @@ pg_module_magic!();
 #[cfg(test)]
 pub struct JsonB(pub serde_json::Value);
 
+#[cfg(test)]
+pub struct Json(pub serde_json::Value);
+
 pub mod database;
 pub mod drop;
 pub mod jspg;
@@ -41,7 +44,7 @@ fn jspg_failure() -> JsonB {
 }
 
 #[cfg_attr(not(test), pg_extern(strict))]
-pub fn jspg_setup(database: JsonB) -> JsonB {
+pub fn jspg_setup(database: Json) -> Json {
   let (new_jspg, drop) = crate::jspg::Jspg::new(&database.0);
   let new_arc = Arc::new(new_jspg);
 
@@ -51,7 +54,7 @@ pub fn jspg_setup(database: JsonB) -> JsonB {
     *lock = Some(new_arc);
   }
 
-  JsonB(serde_json::to_value(drop).unwrap())
+  Json(serde_json::to_value(drop).unwrap())
 }
 
 #[cfg_attr(not(test), pg_extern)]
@@ -71,6 +74,22 @@ pub fn jspg_merge(schema_id: &str, data: JsonB) -> JsonB {
   }
 }
 
+#[cfg_attr(not(test), pg_extern)]
+pub fn jspg_merge_ordered(schema_id: &str, data: Json) -> Json {
+  let engine_opt = {
+    let lock = GLOBAL_JSPG.read().unwrap();
+    lock.clone()
+  };
+
+  match engine_opt {
+    Some(engine) => {
+      let drop = engine.merger.merge(schema_id, data.0);
+      Json(serde_json::to_value(drop).unwrap())
+    }
+    None => Json(jspg_failure().0),
+  }
+}
+
 #[cfg_attr(not(test), pg_extern)]
 pub fn jspg_query(schema_id: &str, filter: Option<JsonB>) -> JsonB {
   let engine_opt = {
@@ -109,7 +128,7 @@ pub fn jspg_validate(schema_id: &str, instance: JsonB) -> JsonB {
 }
 
 #[cfg_attr(not(test), pg_extern)]
-pub fn jspg_database() -> JsonB {
+pub fn jspg_database() -> Json {
   let engine_opt = {
     let lock = GLOBAL_JSPG.read().unwrap();
     lock.clone()
@@ -120,9 +139,9 @@ pub fn jspg_database() -> JsonB {
       let database_json = serde_json::to_value(&engine.database)
         .unwrap_or(serde_json::Value::Object(serde_json::Map::new()));
       let drop = crate::drop::Drop::success_with_val(database_json);
-      JsonB(serde_json::to_value(drop).unwrap())
+      Json(serde_json::to_value(drop).unwrap())
     }
-    None => jspg_failure(),
+    None => Json(jspg_failure().0),
   }
 }
 

src/merger/mod.rs

@@ -40,7 +40,7 @@ impl Merger {
       }
     };
 
-    let result = self.merge_internal(target_schema, data, &mut notifications_queue);
+    let result = self.merge_internal(target_schema, data, &mut notifications_queue, None, false);
 
     let val_resolved = match result {
       Ok(val) => val,
@@ -134,9 +134,11 @@ impl Merger {
     mut schema: Arc<crate::database::schema::Schema>,
     data: Value,
     notifications: &mut Vec<String>,
+    parent_org_id: Option<String>,
+    is_child: bool,
   ) -> Result<Value, String> {
     match data {
-      Value::Array(items) => self.merge_array(schema, items, notifications),
+      Value::Array(items) => self.merge_array(schema, items, notifications, parent_org_id, is_child),
       Value::Object(map) => {
         if let Some(options) = schema.obj.compiled_options.get() {
           if let Some(disc) = schema.obj.compiled_discriminator.get() {
@@ -144,9 +146,7 @@ impl Merger {
             if let Some(v) = val {
               if let Some((idx_opt, target_id_opt)) = options.get(v) {
                 if let Some(target_id) = target_id_opt {
-                  if let Some(target_schema) =
-                    self.db.schemas.get(target_id)
-                  {
+                  if let Some(target_schema) = self.db.schemas.get(target_id) {
                     schema = target_schema.clone();
                   } else {
                     return Err(format!(
@@ -185,7 +185,7 @@ impl Merger {
             }
           }
         }
-        self.merge_object(schema, map, notifications)
+        self.merge_object(schema, map, notifications, parent_org_id, is_child)
       }
       _ => Err("Invalid merge payload: root must be an Object or Array".to_string()),
     }
@@ -196,6 +196,8 @@ impl Merger {
     schema: Arc<crate::database::schema::Schema>,
     items: Vec<Value>,
     notifications: &mut Vec<String>,
+    parent_org_id: Option<String>,
+    is_child: bool,
   ) -> Result<Value, String> {
     let mut item_schema = schema.clone();
     if let Some(crate::database::object::SchemaTypeOrArray::Single(t)) = &schema.obj.type_ {
@@ -208,7 +210,7 @@ impl Merger {
 
     let mut resolved_items = Vec::new();
     for item in items {
-      let resolved = self.merge_internal(item_schema.clone(), item, notifications)?;
+      let resolved = self.merge_internal(item_schema.clone(), item, notifications, parent_org_id.clone(), is_child)?;
       resolved_items.push(resolved);
     }
     Ok(Value::Array(resolved_items))
@@ -219,6 +221,8 @@ impl Merger {
     schema: Arc<crate::database::schema::Schema>,
     obj: serde_json::Map<String, Value>,
     notifications: &mut Vec<String>,
+    parent_org_id: Option<String>,
+    is_child: bool,
   ) -> Result<Value, String> {
     let queue_start = notifications.len();
 
@@ -278,6 +282,20 @@ impl Merger {
       }
     }
 
+    let mut current_org_id = None;
+    if let Some(compiled_props) = schema.obj.compiled_properties.get() {
+      if let Some(org_schema) = compiled_props.get("organization_id") {
+        if let Some(c) = &org_schema.obj.const_ {
+          if let Some(c_str) = c.as_str() {
+            current_org_id = Some(c_str.to_string());
+          }
+        }
+      }
+    }
+    if current_org_id.is_none() {
+      current_org_id = parent_org_id.clone();
+    }
+
     let user_id = self.db.auth_user_id()?;
     let timestamp = self.db.timestamp()?;
 
@@ -292,6 +310,16 @@ impl Merger {
       entity_change_kind = kind;
       entity_fetched = fetched;
       entity_replaces = replaces;
+
+      if entity_change_kind.as_deref() == Some("create") {
+        if is_child {
+          if !entity_fields.contains_key("organization_id") {
+            if let Some(ref org_id) = current_org_id {
+              entity_fields.insert("organization_id".to_string(), Value::String(org_id.clone()));
+            }
+          }
+        }
+      }
     }
 
     let mut entity_response = serde_json::Map::new();
@@ -312,17 +340,14 @@ impl Merger {
           if let Some(relation) = self.db.relations.get(&edge.constraint) {
             let parent_is_source = edge.forward;
 
+            let org_id_to_pass = entity_fields.get("organization_id").and_then(|v| v.as_str()).map(|s| s.to_string());
             if parent_is_source {
-              if !relative.contains_key("organization_id") {
-                if let Some(org_id) = entity_fields.get("organization_id") {
-                  relative.insert("organization_id".to_string(), org_id.clone());
-                }
-              }
-
               let mut merged_relative = match self.merge_internal(
                 rel_schema.clone(),
                 Value::Object(relative),
                 notifications,
+                org_id_to_pass.clone(),
+                true,
               )? {
                 Value::Object(m) => m,
                 _ => continue,
@@ -338,12 +363,6 @@ impl Merger {
               );
               entity_response.insert(relation_name, Value::Object(merged_relative));
             } else {
-              if !relative.contains_key("organization_id") {
-                if let Some(org_id) = entity_fields.get("organization_id") {
-                  relative.insert("organization_id".to_string(), org_id.clone());
-                }
-              }
-
               Self::apply_entity_relation(
                 &mut relative,
                 &relation.source_columns,
@@ -355,6 +374,8 @@ impl Merger {
                 rel_schema.clone(),
                 Value::Object(relative),
                 notifications,
+                org_id_to_pass.clone(),
+                true,
               )? {
                 Value::Object(m) => m,
                 _ => continue,
@@ -374,6 +395,16 @@ impl Merger {
       entity_change_kind = kind;
       entity_fetched = fetched;
       entity_replaces = replaces;
+
+      if entity_change_kind.as_deref() == Some("create") {
+        if is_child {
+          if !entity_fields.contains_key("organization_id") {
+            if let Some(ref org_id) = current_org_id {
+              entity_fields.insert("organization_id".to_string(), Value::String(org_id.clone()));
+            }
+          }
+        }
+      }
     }
 
     self.merge_entity_fields(
@@ -401,15 +432,21 @@ impl Merger {
       if let Some(compiled_edges) = schema.obj.compiled_edges.get() {
         if let Some(edge) = compiled_edges.get(&relation_name) {
           if let Some(relation) = self.db.relations.get(&edge.constraint) {
+            let mut item_schema = rel_schema.clone();
+            if let Some(crate::database::object::SchemaTypeOrArray::Single(t)) =
+              &rel_schema.obj.type_
+            {
+              if t == "array" {
+                if let Some(items_def) = &rel_schema.obj.items {
+                  item_schema = items_def.clone();
+                }
+              }
+            }
+
+            let org_id_to_pass = entity_fields.get("organization_id").and_then(|v| v.as_str()).map(|s| s.to_string());
             let mut relative_responses = Vec::new();
             for relative_item_val in relative_arr {
               if let Value::Object(mut relative_item) = relative_item_val {
-                if !relative_item.contains_key("organization_id") {
-                  if let Some(org_id) = entity_fields.get("organization_id") {
-                    relative_item.insert("organization_id".to_string(), org_id.clone());
-                  }
-                }
-
                 Self::apply_entity_relation(
                   &mut relative_item,
                   &relation.source_columns,
@@ -417,21 +454,12 @@ impl Merger {
                   &entity_fields,
                 );
 
-                let mut item_schema = rel_schema.clone();
-                if let Some(crate::database::object::SchemaTypeOrArray::Single(t)) =
-                  &rel_schema.obj.type_
-                {
-                  if t == "array" {
-                    if let Some(items_def) = &rel_schema.obj.items {
-                      item_schema = items_def.clone();
-                    }
-                  }
-                }
-
                 let merged_relative = match self.merge_internal(
-                  item_schema,
+                  item_schema.clone(),
                   Value::Object(relative_item),
                   notifications,
+                  org_id_to_pass.clone(),
+                  true,
                 )? {
                   Value::Object(m) => m,
                   _ => continue,

src/queryer/compiler.rs

@@ -1,4 +1,5 @@
 use crate::database::Database;
+use indexmap::IndexMap;
 use std::sync::Arc;
 
 pub struct Compiler<'a> {
@@ -256,7 +257,7 @@ impl<'a> Compiler<'a> {
 
   fn compile_object(
     &mut self,
-    props: &std::collections::BTreeMap<String, std::sync::Arc<crate::database::schema::Schema>>,
+    props: &IndexMap<String, std::sync::Arc<crate::database::schema::Schema>>,
     node: Node<'a>,
   ) -> Result<(String, String), String> {
     let mut build_args = Vec::new();
@@ -377,10 +378,7 @@ impl<'a> Compiler<'a> {
       return Ok(("NULL".to_string(), "string".to_string()));
     }
 
-    case_statements.sort();
-
     let sql = format!("CASE {} ELSE NULL END", case_statements.join(" "));
-
     Ok((sql, "object".to_string()))
   }
 
@@ -417,7 +415,7 @@ impl<'a> Compiler<'a> {
   ) -> Result<Vec<String>, String> {
     let mut select_args = Vec::new();
     let grouped_fields = r#type.grouped_fields.as_ref().and_then(|v| v.as_object());
-    let default_props = std::collections::BTreeMap::new();
+    let default_props = IndexMap::new();
     let merged_props = node
       .schema
       .obj
@@ -461,10 +459,24 @@ impl<'a> Compiler<'a> {
         .cloned()
         .unwrap_or_else(|| format!("{}_t_err", node.parent_alias));
 
+      let mut lookup_key = prop_key.as_str();
+
+      if let Some(edges) = node.schema.obj.compiled_edges.get() {
+        if let Some(edge) = edges.get(prop_key) {
+          if let Some(relation) = self.db.relations.get(&edge.constraint) {
+            if edge.forward {
+              lookup_key = &relation.source_columns[0];
+            } else {
+              lookup_key = &relation.destination_columns[0];
+            }
+          }
+        }
+      }
+
       if let Some(gf) = grouped_fields {
         for (t_name, fields_val) in gf {
           if let Some(fields_arr) = fields_val.as_array() {
-            if fields_arr.iter().any(|v| v.as_str() == Some(prop_key)) {
+            if fields_arr.iter().any(|v| v.as_str() == Some(lookup_key)) {
               owner_alias = table_aliases
                 .get(t_name)
                 .cloned()

src/tests/fixtures.rs

@@ -1619,6 +1619,24 @@ fn test_polymorphism_5_2() {
     crate::tests::runner::run_test_case(&path, 5, 2).unwrap();
 }
 
+#[test]
+fn test_polymorphism_6_0() {
+    let path = format!("{}/fixtures/polymorphism.json", env!("CARGO_MANIFEST_DIR"));
+    crate::tests::runner::run_test_case(&path, 6, 0).unwrap();
+}
+
+#[test]
+fn test_polymorphism_6_1() {
+    let path = format!("{}/fixtures/polymorphism.json", env!("CARGO_MANIFEST_DIR"));
+    crate::tests::runner::run_test_case(&path, 6, 1).unwrap();
+}
+
+#[test]
+fn test_polymorphism_6_2() {
+    let path = format!("{}/fixtures/polymorphism.json", env!("CARGO_MANIFEST_DIR"));
+    crate::tests::runner::run_test_case(&path, 6, 2).unwrap();
+}
+
 #[test]
 fn test_not_0_0() {
     let path = format!("{}/fixtures/not.json", env!("CARGO_MANIFEST_DIR"));
@@ -8170,3 +8188,9 @@ fn test_merger_0_14() {
     let path = format!("{}/fixtures/merger.json", env!("CARGO_MANIFEST_DIR"));
     crate::tests::runner::run_test_case(&path, 0, 14).unwrap();
 }
+
+#[test]
+fn test_merger_0_15() {
+    let path = format!("{}/fixtures/merger.json", env!("CARGO_MANIFEST_DIR"));
+    crate::tests::runner::run_test_case(&path, 0, 15).unwrap();
+}

src/tests/formatter.rs

@@ -0,0 +1,393 @@
+use sqlparser::ast::{
+    BinaryOperator, Expr, Function, FunctionArg, Join, JoinConstraint, JoinOperator,
+    Query, Select, SelectItem, SetExpr, Statement, TableWithJoins, Value
+};
+use sqlparser::dialect::PostgreSqlDialect;
+use sqlparser::parser::Parser;
+
+pub struct SqlFormatter {
+    pub lines: Vec<String>,
+    pub indent: usize,
+}
+
+impl SqlFormatter {
+    pub fn new() -> Self {
+        Self {
+            lines: Vec::new(),
+            indent: 0,
+        }
+    }
+
+    pub fn format(sql: &str) -> Vec<String> {
+        let dialect = PostgreSqlDialect {};
+        let ast = match Parser::parse_sql(&dialect, sql) {
+            Ok(ast) => ast,
+            Err(e) => {
+                println!("DEBUG PARSE SQL ERROR: {:?}", e);
+                return vec![sql.to_string()];
+            }
+        };
+
+        if ast.is_empty() {
+            return vec![sql.to_string()];
+        }
+
+        let mut formatter = SqlFormatter::new();
+        formatter.format_statement(&ast[0]);
+        formatter.lines
+    }
+
+    fn push_str(&mut self, s: &str) {
+        if self.lines.is_empty() {
+            self.lines.push(format!("{}{}", " ".repeat(self.indent), s.replace("JSONB", "jsonb")));
+        } else {
+            let last = self.lines.last_mut().unwrap();
+            last.push_str(&s.replace("JSONB", "jsonb"));
+        }
+    }
+
+    fn push_line(&mut self, s: &str) {
+        self.lines.push(format!("{}{}", " ".repeat(self.indent), s.replace("JSONB", "jsonb")));
+    }
+
+    fn format_statement(&mut self, stmt: &Statement) {
+        match stmt {
+            Statement::Query(query) => {
+                self.push_line("(");
+                self.format_query(query);
+                self.push_str(")");
+            }
+            Statement::Update(_update) => {
+                let sql = stmt.to_string();
+                self.format_update_fallback(&sql);
+            }
+            _ => {
+                let sql = stmt.to_string();
+                if sql.starts_with("INSERT") {
+                    self.format_insert_fallback(&sql);
+                } else {
+                    self.push_line(&sql);
+                }
+            }
+        }
+    }
+
+    fn format_insert_fallback(&mut self, sql: &str) {
+        let s = sql.to_string();
+        if let Some(values_idx) = s.find(" VALUES (") {
+            let prefix = &s[..values_idx];
+            let suffix = &s[values_idx + 9..];
+            
+            if let Some(paren_idx) = prefix.find(" (") {
+                self.push_line(&format!("{} (", &prefix[..paren_idx]));
+                self.indent += 2;
+                let cols = &prefix[paren_idx + 2..prefix.len() - 1];
+                let cols_split: Vec<&str> = cols.split(", ").collect();
+                for (i, col) in cols_split.iter().enumerate() {
+                    let comma = if i < cols_split.len() - 1 { "," } else { "" };
+                    let c = col.replace("\"", "");
+                    self.push_line(&format!("\"{}\"{}", c, comma));
+                }
+                self.indent -= 2;
+                self.push_line(")");
+            } else {
+                self.push_line(prefix);
+            }
+            
+            self.push_line("VALUES (");
+            self.indent += 2;
+            
+            let vals = if suffix.ends_with(")") { &suffix[..suffix.len() - 1] } else { suffix };
+            let mut val_tokens = Vec::new();
+            let mut curr = String::new();
+            let mut in_str = false;
+            for c in vals.chars() {
+                if c == '\'' {
+                    in_str = !in_str;
+                    curr.push(c);
+                } else if c == ',' && !in_str {
+                    val_tokens.push(curr.trim().to_string());
+                    curr = String::new();
+                } else {
+                    curr.push(c);
+                }
+            }
+            if !curr.trim().is_empty() {
+                val_tokens.push(curr.trim().to_string());
+            }
+            
+            for (i, val) in val_tokens.iter().enumerate() {
+                let comma = if i < val_tokens.len() - 1 { "," } else { "" };
+                
+                if val.starts_with("'{") && val.ends_with("}'") {
+                    let inner = &val[1..val.len() - 1];
+                    // Unescape single quotes from SQL strings
+                    let unescaped = inner.replace("''", "'");
+                    if let Ok(json) = serde_json::from_str::<serde_json::Value>(&unescaped) {
+                        if let Ok(pretty) = serde_json::to_string_pretty(&json) {
+                            let lines: Vec<&str> = pretty.split('\n').collect();
+                            self.push_line("'{");
+                            self.indent += 2;
+                            for (j, line) in lines.iter().skip(1).enumerate() {
+                                if j == lines.len() - 2 {
+                                    self.indent -= 2;
+                                    // re-escape single quotes for SQL
+                                    self.push_line(&format!("{}'{}", line.replace("'", "''"), comma));
+                                } else {
+                                    self.push_line(&line.replace("'", "''"));
+                                }
+                            }
+                            continue;
+                        }
+                    }
+                }
+                
+                self.push_line(&format!("{}{}", val, comma));
+            }
+            self.indent -= 2;
+            self.push_line(")");
+        } else {
+            self.push_line(&s);
+        }
+    }
+
+    fn format_update_fallback(&mut self, sql: &str) {
+        let s = sql.to_string();
+        if let Some(set_idx) = s.find(" SET ") {
+            self.push_line(&format!("{} SET", &s[..set_idx]));
+            self.indent += 2;
+            
+            let after_set = &s[set_idx + 5..];
+            let where_idx = after_set.find(" WHERE ");
+            let assigns = if let Some(w) = where_idx { &after_set[..w] } else { after_set };
+            let assigns_split: Vec<&str> = assigns.split(", ").collect();
+            for (i, assign) in assigns_split.iter().enumerate() {
+                let comma = if i < assigns_split.len() - 1 { "," } else { "" };
+                self.push_line(&format!("{}{}", assign.replace("\"", ""), comma));
+            }
+            self.indent -= 2;
+            
+            if let Some(w) = where_idx {
+                self.push_line("WHERE");
+                self.indent += 2;
+                self.push_line(&after_set[w + 7..]);
+                self.indent -= 2;
+            }
+        } else {
+            self.push_line(&s);
+        }
+    }
+
+    fn format_query(&mut self, query: &Query) {
+        match &*query.body {
+            SetExpr::Select(select) => self.format_select(select),
+            SetExpr::Query(inner_query) => {
+                self.push_str("(");
+                self.format_query(inner_query);
+                self.push_str(")");
+            }
+            _ => self.push_str(&query.to_string()),
+        }
+    }
+
+    fn format_select(&mut self, select: &Select) {
+        self.push_str("SELECT ");
+        for (i, p) in select.projection.iter().enumerate() {
+            let comma = if i < select.projection.len() - 1 { ", " } else { "" };
+            self.format_select_item(p);
+            self.push_str(comma);
+        }
+        
+        if !select.from.is_empty() {
+            self.push_line("FROM ");
+            for (i, table) in select.from.iter().enumerate() {
+                let comma = if i < select.from.len() - 1 { ", " } else { "" };
+                self.format_table_with_joins(table);
+                self.push_str(comma);
+            }
+
+            if let Some(selection) = &select.selection {
+                self.push_line("WHERE");
+                self.indent += 2;
+                self.push_line(""); // new line for where clauses
+                self.format_expr(selection);
+                self.indent -= 2;
+            }
+        }
+    }
+
+    fn format_select_item(&mut self, item: &SelectItem) {
+        match item {
+            SelectItem::UnnamedExpr(expr) => self.format_expr(expr),
+            SelectItem::ExprWithAlias { expr, alias } => {
+                self.format_expr(expr);
+                self.push_str(&format!(" AS {}", alias));
+            }
+            _ => self.push_str(&item.to_string()),
+        }
+    }
+
+    fn format_table_with_joins(&mut self, table: &TableWithJoins) {
+        self.push_str(&table.relation.to_string());
+        for join in &table.joins {
+            self.push_line("");
+            self.format_join(join);
+        }
+    }
+
+    fn format_join(&mut self, join: &Join) {
+        let op = match &join.join_operator {
+            JoinOperator::Inner(_) => "JOIN",
+            JoinOperator::LeftOuter(_) => "LEFT JOIN",
+            _ => "JOIN",
+        };
+        self.push_str(&format!("{} {} ON ", op, join.relation));
+        
+        match &join.join_operator {
+            JoinOperator::Inner(JoinConstraint::On(expr)) => self.format_expr(expr),
+            JoinOperator::LeftOuter(JoinConstraint::On(expr)) => self.format_expr(expr),
+            JoinOperator::Join(JoinConstraint::On(expr)) => self.format_expr(expr),
+            _ => {
+                println!("FALLBACK JOIN OP: {:?}", join.join_operator);
+            }
+        }
+    }
+
+    fn format_expr(&mut self, expr: &Expr) {
+        match expr {
+            Expr::Function(func) => self.format_function(func),
+            Expr::BinaryOp { left, op, right } => {
+                if *op == BinaryOperator::And || *op == BinaryOperator::Or {
+                    self.format_expr(left);
+                    self.push_line(&format!("{} ", op));
+                    self.format_expr(right);
+                } else {
+                    self.format_expr(left);
+                    self.push_str(&format!(" {} ", op));
+                    self.format_expr(right);
+                }
+            }
+            Expr::Nested(inner) => {
+                self.push_str("(");
+                self.format_expr(inner);
+                self.push_str(")");
+            }
+            Expr::IsNull(inner) => {
+                self.format_expr(inner);
+                self.push_str(" IS NULL");
+            }
+            Expr::IsNotNull(inner) => {
+                self.format_expr(inner);
+                self.push_str(" IS NOT NULL");
+            }
+            Expr::Subquery(query) => {
+                self.push_str("(");
+                self.indent += 2;
+                self.push_line("");
+                self.format_query(query);
+                self.indent -= 2;
+                self.push_line(")");
+            }
+            Expr::Case { operand, conditions, else_result, .. } => {
+                self.push_str("CASE");
+                if let Some(op) = operand {
+                    self.push_str(" ");
+                    self.format_expr(op);
+                }
+                self.indent += 2;
+                for when in conditions {
+                    self.push_line("WHEN ");
+                    self.format_expr(&when.condition);
+                    self.push_str(" THEN ");
+                    self.format_expr(&when.result);
+                }
+                if let Some(els) = else_result {
+                    self.push_line("ELSE ");
+                    self.format_expr(els);
+                }
+                self.indent -= 2;
+                self.push_line("END");
+            }
+            Expr::UnaryOp { op, expr: inner } => {
+                self.push_str(&format!("{} ", op));
+                self.format_expr(inner);
+            }
+
+            Expr::Value(sqlparser::ast::ValueWithSpan { value: Value::SingleQuotedString(s), .. }) | Expr::Value(sqlparser::ast::ValueWithSpan { value: Value::EscapedStringLiteral(s), .. }) => {
+                if s.starts_with('{') && s.ends_with('}') {
+                    if let Ok(json) = serde_json::from_str::<serde_json::Value>(s) {
+                        if let Ok(pretty) = serde_json::to_string_pretty(&json) {
+                            let lines: Vec<&str> = pretty.split('\n').collect();
+                            self.push_str("'{");
+                            self.indent += 2;
+                            for (j, line) in lines.iter().skip(1).enumerate() {
+                                if j == lines.len() - 2 {
+                                    self.indent -= 2;
+                                    self.push_line(&format!("{}'", line.replace("'", "''")));
+                                } else {
+                                    self.push_line(&line.replace("'", "''"));
+                                }
+                            }
+                            return;
+                        }
+                    }
+                }
+                self.push_str(&expr.to_string());
+            }
+            _ => {
+                self.push_str(&expr.to_string());
+            }
+        }
+    }
+
+    fn format_function(&mut self, func: &Function) {
+        let name = func.name.to_string();
+        self.push_str(&format!("{}(", name));
+        
+        if let sqlparser::ast::FunctionArguments::List(list) = &func.args {
+            if name == "jsonb_build_object" {
+                self.indent += 2;
+                self.push_line("");
+                let mut i = 0;
+                while i < list.args.len() {
+                    let arg_key = &list.args[i];
+                    let arg_val = if i + 1 < list.args.len() { Some(&list.args[i+1]) } else { None };
+                    
+                    self.format_function_arg(arg_key);
+                    self.push_str(", ");
+                    if let Some(val) = arg_val {
+                        self.format_function_arg(val);
+                    }
+                    
+                    if i + 2 < list.args.len() {
+                        self.push_str(",");
+                        self.push_line("");
+                    }
+                    i += 2;
+                }
+                self.indent -= 2;
+                self.push_line(")");
+            } else {
+                for (i, arg) in list.args.iter().enumerate() {
+                    let comma = if i < list.args.len() - 1 { ", " } else { "" };
+                    self.format_function_arg(arg);
+                    self.push_str(comma);
+                }
+                self.push_str(")");
+            }
+        } else {
+            self.push_str(")");
+        }
+    }
+
+    fn format_function_arg(&mut self, arg: &FunctionArg) {
+        match arg {
+            FunctionArg::Unnamed(sqlparser::ast::FunctionArgExpr::Expr(expr)) => self.format_expr(expr),
+            _ => {
+                println!("FALLBACK ARG: {:?}", arg);
+                self.push_str(&arg.to_string());
+            }
+        }
+    }
+}
+

src/tests/mod.rs

@@ -1,4 +1,5 @@
 use crate::*;
+pub mod formatter;
 pub mod runner;
 pub mod types;
 use serde_json::json;
@@ -72,7 +73,7 @@ fn test_library_api() {
       ]
   });
 
-  let cache_drop = jspg_setup(JsonB(db_json));
+  let cache_drop = jspg_setup(Json(db_json));
   assert_eq!(
     cache_drop.0,
     json!({
@@ -127,7 +128,7 @@ fn test_library_api() {
                                     "forward": true
                                 }
                             },
-                            "compiledPropertyNames": ["name", "target", "type"],
+                            "compiledPropertyNames": ["type", "name", "target"],
                             "properties": {
                                 "name": { "type": "string" },
                                 "target": {
@@ -140,19 +141,19 @@ fn test_library_api() {
                             "type": "object"
                         },
                         "source_schema.filter": {
-                            "compiledPropertyNames": ["$and", "$or", "name", "target", "type"],
+                            "compiledPropertyNames": ["type", "name", "target", "$and", "$or"],
                             "properties": {
                                 "$and": {
                                     "type": ["array", "null"],
                                     "items": {
-                                        "compiledPropertyNames": ["$and", "$or", "name", "target", "type"],
+                                        "compiledPropertyNames": ["type", "name", "target", "$and", "$or"],
                                         "type": "source_schema.filter"
                                     }
                                 },
                                 "$or": {
                                     "type": ["array", "null"],
                                     "items": {
-                                        "compiledPropertyNames": ["$and", "$or", "name", "target", "type"],
+                                        "compiledPropertyNames": ["type", "name", "target", "$and", "$or"],
                                         "type": "source_schema.filter"
                                     }
                                 },
@@ -160,7 +161,7 @@ fn test_library_api() {
                                 "target": { "type": ["target_schema.filter", "null"] },
                                 "type": { "type": ["string.condition", "null"] }
                             },
-                            "type": "object"
+                            "type": "filter"
                         }
                     },
                     "sensitive": false,
@@ -193,25 +194,25 @@ fn test_library_api() {
                             "type": "object"
                         },
                         "target_schema.filter": {
-                            "compiledPropertyNames": ["$and", "$or", "value"],
+                            "compiledPropertyNames": ["value", "$and", "$or"],
                             "properties": {
                                 "$and": {
                                     "type": ["array", "null"],
                                     "items": {
-                                        "compiledPropertyNames": ["$and", "$or", "value"],
+                                        "compiledPropertyNames": ["value", "$and", "$or"],
                                         "type": "target_schema.filter"
                                     }
                                 },
                                 "$or": {
                                     "type": ["array", "null"],
                                     "items": {
-                                        "compiledPropertyNames": ["$and", "$or", "value"],
+                                        "compiledPropertyNames": ["value", "$and", "$or"],
                                         "type": "target_schema.filter"
                                     }
                                 },
                                 "value": { "type": ["number.condition", "null"] }
                             },
-                            "type": "object"
+                            "type": "filter"
                         }
                     },
                     "sensitive": false,
@@ -225,7 +226,10 @@ fn test_library_api() {
   );
 
   // 4. Validate Happy Path
-  let happy_drop = jspg_validate("source_schema", JsonB(json!({"type": "source_schema", "name": "Neo"})));
+  let happy_drop = jspg_validate(
+    "source_schema",
+    JsonB(json!({"type": "source_schema", "name": "Neo"})),
+  );
   assert_eq!(
     happy_drop.0,
     json!({
@@ -235,7 +239,10 @@ fn test_library_api() {
   );
 
   // 5. Validate Unhappy Path
-  let unhappy_drop = jspg_validate("source_schema", JsonB(json!({"type": "source_schema", "wrong": "data"})));
+  let unhappy_drop = jspg_validate(
+    "source_schema",
+    JsonB(json!({"type": "source_schema", "wrong": "data"})),
+  );
   assert_eq!(
     unhappy_drop.0,
     json!({

src/tests/runner.rs

@@ -127,7 +127,7 @@ pub fn run_test_case(path: &str, suite_idx: usize, case_idx: usize) -> Result<()
       }
     }
     "merge" => {
-      let result = test.run_merge(db_unwrapped.unwrap());
+      let result = test.run_merge(db_unwrapped.unwrap(), path, suite_idx, case_idx);
       if let Err(e) = result {
         println!("TEST MERGE ERROR FOR '{}': {}", test.description, e);
         failures.push(format!(
@@ -137,7 +137,7 @@ pub fn run_test_case(path: &str, suite_idx: usize, case_idx: usize) -> Result<()
       }
     }
     "query" => {
-      let result = test.run_query(db_unwrapped.unwrap());
+      let result = test.run_query(db_unwrapped.unwrap(), path, suite_idx, case_idx);
       if let Err(e) = result {
         println!("TEST QUERY ERROR FOR '{}': {}", test.description, e);
         failures.push(format!(
@@ -160,3 +160,83 @@ pub fn run_test_case(path: &str, suite_idx: usize, case_idx: usize) -> Result<()
 
   Ok(())
 }
+
+pub fn extract_uuids(val: &Value, path: &str, map: &mut HashMap<String, String>) {
+  let uuid_re = regex::Regex::new(r"^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$").unwrap();
+  
+  match val {
+      Value::Object(obj) => {
+          for (k, v) in obj {
+              let new_path = if path.is_empty() { k.clone() } else { format!("{}.{}", path, k) };
+              extract_uuids(v, &new_path, map);
+          }
+      }
+      Value::Array(arr) => {
+          for (i, v) in arr.iter().enumerate() {
+              let new_path = if path.is_empty() { i.to_string() } else { format!("{}.{}", path, i) };
+              extract_uuids(v, &new_path, map);
+          }
+      }
+      Value::String(s) => {
+          if s != "00000000-0000-0000-0000-000000000000" && uuid_re.is_match(s) {
+              map.insert(s.clone(), path.to_string());
+          }
+      }
+      _ => {}
+  }
+}
+
+pub fn canonicalize_with_map(s: &str, uuid_map: &HashMap<String, String>, gen_map: &mut HashMap<String, usize>) -> String {
+  let uuid_re = regex::Regex::new(r"[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}").unwrap();
+  let s1 = uuid_re.replace_all(s, |caps: &regex::Captures| {
+      let val = &caps[0];
+      if val == "00000000-0000-0000-0000-000000000000" {
+          val.to_string()
+      } else if let Some(path) = uuid_map.get(val) {
+          format!("{{{{uuid:{}}}}}", path)
+      } else {
+          let next_idx = gen_map.len();
+          let idx = *gen_map.entry(val.to_string()).or_insert(next_idx);
+          format!("{{{{uuid:generated_{}}}}}", idx)
+      }
+  });
+  
+  let ts_re = regex::Regex::new(r"\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}(?:\.\d{1,6})?(?:Z|\+\d{2}(?::\d{2})?)?").unwrap();
+  ts_re.replace_all(&s1, "{{timestamp}}").to_string()
+}
+
+pub fn update_sql_fixture(path: &str, suite_idx: usize, case_idx: usize, queries: &[String]) {
+  use crate::tests::formatter::SqlFormatter;
+  let content = fs::read_to_string(path).unwrap();
+  let mut file_data: Value = serde_json::from_str(&content).unwrap();
+
+  let mut uuid_map = HashMap::new();
+  if let Some(test_case) = file_data.get(suite_idx).and_then(|s| s.get("tests")).and_then(|t| t.get(case_idx)) {
+      if let Some(data) = test_case.get("data") {
+          extract_uuids(data, "data", &mut uuid_map);
+      }
+      if let Some(mocks) = test_case.get("mocks") {
+          extract_uuids(mocks, "mocks", &mut uuid_map);
+      }
+  }
+
+  let mut gen_map = HashMap::new();
+
+  let mut formatted_sql = Vec::new();
+  for q in queries {
+    let res = SqlFormatter::format(q);
+    let mapped_res: Vec<String> = res.into_iter().map(|l| canonicalize_with_map(&l, &uuid_map, &mut gen_map)).collect();
+    formatted_sql.push(mapped_res);
+  }
+
+  if let Some(expect) = file_data[suite_idx]["tests"][case_idx].get_mut("expect") {
+    if let Some(obj) = expect.as_object_mut() {
+        obj.remove("pattern");
+        obj.insert("sql".to_string(), serde_json::json!(formatted_sql));
+    }
+  }
+
+  // To preserve original formatting, we just use serde_json pretty output
+  let formatted_json = serde_json::to_string_pretty(&file_data).unwrap();
+  fs::write(path, formatted_json).unwrap();
+}

src/tests/types/case.rs

@@ -75,7 +75,7 @@ impl Case {
     Ok(())
   }
 
-  pub fn run_merge(&self, db: Arc<Database>) -> Result<(), String> {
+  pub fn run_merge(&self, db: Arc<Database>, path: &str, suite_idx: usize, case_idx: usize) -> Result<(), String> {
     if let Some(mocks) = &self.mocks {
       if let Some(arr) = mocks.as_array() {
         db.executor.set_mocks(arr.clone());
@@ -94,7 +94,10 @@ impl Case {
       } else if result.errors.is_empty() {
         // Only assert SQL if merge succeeded
         let queries = db.executor.get_queries();
-        expect.assert_pattern(&queries).and_then(|_| expect.assert_sql(&queries))
+        if std::env::var("UPDATE_EXPECT").is_ok() {
+          crate::tests::runner::update_sql_fixture(path, suite_idx, case_idx, &queries);
+        }
+        expect.assert_sql(&queries)
       } else {
         Ok(())
       }
@@ -106,7 +109,7 @@ impl Case {
     return_val
   }
 
-  pub fn run_query(&self, db: Arc<Database>) -> Result<(), String> {
+  pub fn run_query(&self, db: Arc<Database>, path: &str, suite_idx: usize, case_idx: usize) -> Result<(), String> {
     if let Some(mocks) = &self.mocks {
       if let Some(arr) = mocks.as_array() {
         db.executor.set_mocks(arr.clone());
@@ -123,7 +126,10 @@ impl Case {
         Err(format!("Query {}", e))
       } else if result.errors.is_empty() {
         let queries = db.executor.get_queries();
-        expect.assert_pattern(&queries).and_then(|_| expect.assert_sql(&queries))
+        if std::env::var("UPDATE_EXPECT").is_ok() {
+          crate::tests::runner::update_sql_fixture(path, suite_idx, case_idx, &queries);
+        }
+        expect.assert_sql(&queries)
       } else {
         Ok(())
       }

src/validator/rules/polymorphism.rs

@@ -1,6 +1,7 @@
 use crate::validator::context::ValidationContext;
 use crate::validator::error::ValidationError;
 use crate::validator::result::ValidationResult;
+use indexmap::IndexMap;
 
 impl<'a> ValidationContext<'a> {
   pub(crate) fn validate_family(
@@ -65,7 +66,7 @@ impl<'a> ValidationContext<'a> {
 
   pub(crate) fn execute_polymorph(
     &self,
-    options: &std::collections::BTreeMap<String, (Option<usize>, Option<String>)>,
+    options: &IndexMap<String, (Option<usize>, Option<String>)>,
     result: &mut ValidationResult,
   ) -> Result<bool, ValidationError> {
     // 1. O(1) Fast-Path Router & Extractor

version

@@ -1 +1 @@
-1.0.130
+1.0.144