version: 1.0.74

.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "rust-lang.rust-analyzer"
+    ]
+}

Cargo.lock

@@ -55,6 +55,15 @@ version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f0e0fee31ef5ed1ba1316088939cea399010ed7731dba877ed44aeb407a75ea"
 
+[[package]]
+name = "ar_archive_writer"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7eb93bbb63b9c227414f6eb3a0adfddca591a8ce1e9b60661bb08969b87e340b"
+dependencies = [
+ "object",
+]
+
 [[package]]
 name = "async-trait"
 version = "0.1.89"
@@ -874,6 +883,7 @@ dependencies = [
  "regex-syntax",
  "serde",
  "serde_json",
+ "sqlparser",
  "url",
  "uuid",
  "xxhash-rust",
@@ -1040,6 +1050,15 @@ dependencies = [
  "objc2-core-foundation",
 ]
 
+[[package]]
+name = "object"
+version = "0.37.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -1377,6 +1396,16 @@ dependencies = [
  "unarray",
 ]
 
+[[package]]
+name = "psm"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3852766467df634d74f0b2d7819bf8dc483a0eb2e3b0f50f756f9cfe8b0d18d8"
+dependencies = [
+ "ar_archive_writer",
+ "cc",
+]
+
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -1442,6 +1471,26 @@ dependencies = [
  "rand_core",
 ]
 
+[[package]]
+name = "recursive"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0786a43debb760f491b1bc0269fe5e84155353c67482b9e60d0cfb596054b43e"
+dependencies = [
+ "recursive-proc-macro-impl",
+ "stacker",
+]
+
+[[package]]
+name = "recursive-proc-macro-impl"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76009fbe0614077fc1a2ce255e3a1881a2e3a3527097d5dc6d8212c585e7e38b"
+dependencies = [
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "redox_syscall"
 version = "0.5.18"
@@ -1669,12 +1718,35 @@ dependencies = [
  "windows-sys 0.60.2",
 ]
 
+[[package]]
+name = "sqlparser"
+version = "0.61.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbf5ea8d4d7c808e1af1cbabebca9a2abe603bcefc22294c5b95018d53200cb7"
+dependencies = [
+ "log",
+ "recursive",
+]
+
 [[package]]
 name = "stable_deref_trait"
 version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
+[[package]]
+name = "stacker"
+version = "0.1.23"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d74a23609d509411d10e2176dc2a4346e3b4aea2e7b1869f19fdedbc71c013"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "libc",
+ "psm",
+ "windows-sys 0.59.0",
+]
+
 [[package]]
 name = "stringprep"
 version = "0.1.5"
@@ -2323,6 +2395,15 @@ dependencies = [
  "windows-link",
 ]
 
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.60.2"

Cargo.toml

@@ -23,6 +23,7 @@ indexmap = { version = "2.13.0", features = ["serde"] }
 moka = { version = "0.12.14", features = ["sync"] }
 xxhash-rust = { version = "0.8.15", features = ["xxh64"] }
 dashmap = "6.1.0"
+sqlparser = "0.61.0"
 
 [dev-dependencies]
 pgrx-tests = "0.16.1"

GEMINI.md

@@ -43,7 +43,7 @@ JSPG implements specific extensions to the Draft 2020-12 standard to support the
 #### A. Polymorphism & Referencing (`$ref`, `$family`, and Native Types)
 *   **Native Type Discrimination (`variations`)**: Schemas defined inside a Postgres `type` are Entities. The validator securely and implicitly manages their `"type"` property. If an entity inherits from `user`, incoming JSON can safely define `{"type": "person"}` without errors, thanks to `compiled_variations` inheritance.
 *   **Structural Inheritance & Viral Infection (`$ref`)**: `$ref` is used exclusively for structural inheritance, *never* for union creation. A Punc request schema that `$ref`s an Entity virally inherits all physical database polymorphism rules for that target.
-*   **Shape Polymorphism (`$family`)**: Auto-expands polymorphic API lists based on an abstract Descendants Graph. If `{"$family": "widget"}` is used, JSPG evaluates the JSON against every schema that `$ref`s widget.
+*   **Shape Polymorphism (`$family`)**: Auto-expands polymorphic API lists based on an abstract **Descendants Graph**. If `{"$family": "widget"}` is used, the Validator dynamically identifies *every* schema in the registry that `$ref`s `widget` (e.g., `stock.widget`, `task.widget`) and evaluates the JSON against all of them.
 *   **Strict Matches & Depth Heuristic**: Polymorphic structures MUST match exactly **one** schema permutation. If multiple inherited struct permutations pass, JSPG applies the **Depth Heuristic Tie-Breaker**, selecting the candidate deepest in the inheritance tree. 
 
 #### B. Dot-Notation Schema Resolution & Database Mapping
@@ -80,6 +80,8 @@ The Merger provides an automated, high-performance graph synchronization engine
 *   **Hierarchical Table Inheritance**: The Punc system uses distributed table inheritance (e.g. `person` inherits `user` inherits `organization` inherits `entity`). The Merger splits the incoming JSON payload and performs atomic row updates across *all* relevant tables in the lineage map.
 *   **The Archive Paradigm**: Data is never deleted in the Punc system. The Merger securely enforces referential integrity by toggling the `archived` Boolean flag on the base `entity` table rather than issuing SQL `DELETE` commands.
 *   **Change Tracking & Reactivity**: The Merger diffs the incoming JSON against the existing database row (utilizing static, `DashMap`-cached `lk_` SELECT string templates). Every detected change is recorded into the `agreego.change` audit table, tracking the user mapping. It then natively uses `pg_notify` to broadcast a completely flat row-level diff out to the Go WebSocket server for O(1) routing.
+*   **Flat Structural Beats (Unidirectional Flow)**: The Merger purposefully DOES NOT trace or hydrate outbound Foreign Keys or nested parent structures during writes. It emits completely flat, mathematically perfect structural deltas via `pg_notify` representing only the exact Postgres rows that changed. This guarantees the write-path remains O(1) lightning fast. It is the strict responsibility of the upstream Punc Framework (the Go `Speaker`) to intercept these flat beats, evaluate them against active Websocket Schema Topologies, and dynamically issue targeted `jspg_query` reads to hydrate the exact contextual subgraphs required by listening clients.
+*   **Pre-Order Notification Traversal**: To support proper topological hydration on the upstream Go Framework, the Merger decouples the `pg_notify` execution from the physical database write execution. The engine collects structural changes and explicitly fires `pg_notify` SQL statements in strict **Pre-Order** (Parent -> Relations -> Children). This guarantees that WebSocket clients receive the parent entity `Beat` prior to any nested child entities, ensuring stable unidirectional data flows without hydration race conditions.
 *   **Many-to-Many Graph Edge Management**: Operates seamlessly with the global `agreego.relationship` table, allowing the system to represent and merge arbitrary reified M:M relationships directionally between any two entities.
 *   **Sparse Updates**: Empty JSON strings `""` are directly bound as explicit SQL `NULL` directives to clear data, whilst omitted (missing) properties skip UPDATE execution entirely, ensuring partial UI submissions do not wipe out sibling fields.
 *   **Unified Return Structure**: To eliminate UI hydration race conditions and multi-user duplication, `jspg_merge` explicitly strips the response graph and returns only the root `{ "id": "uuid" }` (or an array of IDs for list insertions). External APIs can then explicitly call read APIs to fetch the resulting graph, while the UI relies 100% implicitly on the flat `pg_notify` pipeline for reactive state synchronization.
@@ -101,22 +103,28 @@ The Queryer transforms Postgres into a pre-compiled Semantic Query Engine via th
     *   **Array Inclusion**: `{"$in": [values]}`, `{"$nin": [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`).
-### 4. The Stem Engine
+*   **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 `JOIN`s for each variation.
+    *   **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.
+
+### The Stem Engine
 
 Rather than over-fetching heavy Entity payloads and trimming them, Punc Framework Websockets depend on isolated subgraphs defined as **Stems**.
-A `Stem` is **not a JSON Pointer** or a physical path string (like `/properties/contacts/items/phone_number`). It is simply a declaration of an **Entity Type boundary** that exists somewhere within the compiled JSON Schema graph. 
+A `Stem` is a declaration of an **Entity Type boundary** that exists somewhere within the compiled JSON Schema graph, expressed using **`gjson` multipath syntax** (e.g., `contacts.#.phone_numbers.#`).
 
-Because `pg_notify` (Beats) fire rigidly from physical Postgres tables (e.g. `{"type": "phone_number"}`), the Go Framework only ever needs to know: "Does the schema `with_contacts.person` contain the `phone_number` Entity anywhere inside its tree?"
+Because `pg_notify` (Beats) fire rigidly from physical Postgres tables (e.g. `{"type": "phone_number"}`), the Go Framework only ever needs to know: "Does the schema `with_contacts.person` contain the `phone_number` Entity anywhere inside its tree, and if so, what is the gjson path to iterate its payload?"
 
-*   **Initialization:** During startup (`jspg_stems()`), the database crawls all Schemas and maps out every physical Entity Type it references. It builds a flat dictionary of `Schema ID -> [Entity Types]` (e.g. `with_contacts.person -> ["person", "contact", "phone_number", "email_address"]`).
+*   **Initialization:** During startup (`jspg_stems()`), the database crawls all Schemas and maps out every physical Entity Type it references. It builds a highly optimized `HashMap<String, HashMap<String, Arc<Stem>>>` providing strictly `O(1)` memory lookups mapping `Schema ID -> { Stem Path -> Entity Type }`.
-*   **Identifier Prioritization**: When determining if a nested object boundary is an Entity, JSPG natively prioritizes defined `$id` tags over `$ref` inheritance pointers to prevent polymorphic boundaries from devolving into their generic base classes.
+*   **GJSON Pathing:** Unlike standard JSON Pointers, stems utilize `.#` array iterator syntax. The Go web server consumes this native path (e.g. `lines.#`) across the raw Postgres JSON byte payload, extracting all active UUIDs in one massive sub-millisecond sweep without unmarshaling Go ASTs.
-*   **Cyclical Deduplication**: Because Punc relationships often reference back on themselves via deeply nested classes, the Stem Engine applies intelligent path deduplication. If the active `current_path` already ends with the target entity string, it traverses the inheritance properties without appending the entity to the stem path again, eliminating infinite powerset loops.
+*   **Polymorphic Condition Selectors:** When trailing paths would otherwise collide because of abstract polymorphic type definitions (e.g., a `target` property bounded by a `oneOf` taking either `phone_number` or `email_address`), JSPG natively appends evaluated `gjson` type conditions into the path (e.g. `contacts.#.target#(type=="phone_number")`). This guarantees `O(1)` key uniqueness in the HashMap while retaining extreme array extraction speeds natively without runtime AST evaluation.
-*   **Relationship Path Squashing:** When calculating nested string paths structurally to discover these boundaries, JSPG intentionally **omits** properties natively named `target` or `source` if they belong to a native database `relationship` table override. This ensures paths like `phone_numbers/contact/target` correctly register their beat resolution pattern as `phone_numbers/contact/phone_number`.
+*   **Identifier Prioritization:** When determining if a nested object boundary is an Entity, JSPG natively prioritizes defined `$id` tags over `$ref` inheritance pointers to prevent polymorphic boundaries from devolving into their generic base classes.
+*   **Cyclical Deduplication:** Because Punc relationships often reference back on themselves via deeply nested classes, the Stem Engine applies intelligent path deduplication. If the active `current_path` already ends with the target entity string, it traverses the inheritance properties without appending the entity to the stem path again, eliminating infinite powerset loops.
+*   **Relationship Path Squashing:** When calculating string paths structurally, JSPG intentionally **omits** properties natively named `target` or `source` if they belong to a native database `relationship` table override.
 *   **The Go Router**: The Golang Punc framework uses this exact mapping to register WebSocket Beat frequencies exclusively on the Entity types discovered.
 *   **The Queryer Execution**: When the Go framework asks JSPG to hydrate a partial `phone_number` stem for the `with_contacts.person` schema, instead of jumping through string paths, the SQL Compiler simply reaches into the Schema's AST using the `phone_number` Type string, pulls out exactly that entity's mapping rules, and returns a fully correlated `SELECT` block! This natively handles nested array properties injected via `oneOf` or array references efficiently bypassing runtime powerset expansion.
 *   **Performance:** These Stem execution structures are fully statically compiled via SPI and map perfectly to `O(1)` real-time routing logic on the application tier.
 
-
 ## 5. Testing & Execution Architecture
 
 JSPG implements a strict separation of concerns to bypass the need to boot a full PostgreSQL cluster for unit and integration testing. Because `pgrx::spi::Spi` directly links to PostgreSQL C-headers, building the library with `cargo test` on macOS natively normally results in fatal `dyld` crashes.

fixtures/merger.json

@@ -1213,21 +1213,6 @@
                             "    '00000000-0000-0000-0000-000000000000'",
                             ")"
                         ],
-                        [
-                            "SELECT pg_notify('entity', '{",
-                            "    \"complete\":{",
-                            "        \"created_at\":\"{{timestamp}}\",",
-                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"date_of_birth\":\"2000-01-01\",",
-                            "        \"first_name\":\"Bob\",",
-                            "        \"id\":\"{{uuid:customer_id}}\",",
-                            "        \"last_name\":\"Smith\",",
-                            "        \"modified_at\":\"{{timestamp}}\",",
-                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"type\":\"person\"",
-                            "    }",
-                            "}')"
-                        ],
                         [
                             "INSERT INTO agreego.\"entity\" (",
                             "    \"created_at\",",
@@ -1295,6 +1280,21 @@
                             "        \"type\":\"order\"",
                             "    }",
                             "}')"
+                        ],
+                        [
+                            "SELECT pg_notify('entity', '{",
+                            "    \"complete\":{",
+                            "        \"created_at\":\"{{timestamp}}\",",
+                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"date_of_birth\":\"2000-01-01\",",
+                            "        \"first_name\":\"Bob\",",
+                            "        \"id\":\"{{uuid:customer_id}}\",",
+                            "        \"last_name\":\"Smith\",",
+                            "        \"modified_at\":\"{{timestamp}}\",",
+                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"type\":\"person\"",
+                            "    }",
+                            "}')"
                         ]
                     ]
                 }
@@ -1409,21 +1409,6 @@
                             "    '00000000-0000-0000-0000-000000000000'",
                             ")"
                         ],
-                        [
-                            "SELECT pg_notify('entity', '{",
-                            "    \"complete\":{",
-                            "        \"created_at\":\"{{timestamp}}\",",
-                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"id\":\"{{uuid:line_id}}\",",
-                            "        \"modified_at\":\"{{timestamp}}\",",
-                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"order_id\":\"abc\",",
-                            "        \"price\":99.0,",
-                            "        \"product\":\"Widget\",",
-                            "        \"type\":\"order_line\"",
-                            "    }",
-                            "}')"
-                        ],
                         [
                             "INSERT INTO agreego.change (",
                             "    changes,",
@@ -1457,6 +1442,21 @@
                             "        \"type\":\"order\"",
                             "    }",
                             "}')"
+                        ],
+                        [
+                            "SELECT pg_notify('entity', '{",
+                            "    \"complete\":{",
+                            "        \"created_at\":\"{{timestamp}}\",",
+                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"id\":\"{{uuid:line_id}}\",",
+                            "        \"modified_at\":\"{{timestamp}}\",",
+                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"order_id\":\"abc\",",
+                            "        \"price\":99.0,",
+                            "        \"product\":\"Widget\",",
+                            "        \"type\":\"order_line\"",
+                            "    }",
+                            "}')"
                         ]
                     ]
                 }
@@ -1587,19 +1587,6 @@
                             "    '00000000-0000-0000-0000-000000000000'",
                             ")"
                         ],
-                        [
-                            "SELECT pg_notify('entity', '{",
-                            "    \"complete\":{",
-                            "        \"created_at\":\"{{timestamp}}\",",
-                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"id\":\"{{uuid:phone1_id}}\",",
-                            "        \"modified_at\":\"{{timestamp}}\",",
-                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"number\":\"555-0001\",",
-                            "        \"type\":\"phone_number\"",
-                            "    }",
-                            "}')"
-                        ],
                         [
                             "INSERT INTO agreego.\"entity\" (",
                             "    \"created_at\",",
@@ -1661,23 +1648,6 @@
                             "    '00000000-0000-0000-0000-000000000000'",
                             ")"
                         ],
-                        [
-                            "SELECT pg_notify('entity', '{",
-                            "    \"complete\":{",
-                            "        \"created_at\":\"{{timestamp}}\",",
-                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"id\":\"{{uuid:contact1_id}}\",",
-                            "        \"is_primary\":true,",
-                            "        \"modified_at\":\"{{timestamp}}\",",
-                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"source_id\":\"{{uuid:person_id}}\",",
-                            "        \"source_type\":\"person\",",
-                            "        \"target_id\":\"{{uuid:phone1_id}}\",",
-                            "        \"target_type\":\"phone_number\",",
-                            "        \"type\":\"contact\"",
-                            "    }",
-                            "}')"
-                        ],
                         [
                             "INSERT INTO agreego.\"entity\" (",
                             "    \"created_at\",",
@@ -1722,19 +1692,6 @@
                             "    '00000000-0000-0000-0000-000000000000'",
                             ")"
                         ],
-                        [
-                            "SELECT pg_notify('entity', '{",
-                            "    \"complete\":{",
-                            "        \"created_at\":\"{{timestamp}}\",",
-                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"id\":\"{{uuid:phone2_id}}\",",
-                            "        \"modified_at\":\"{{timestamp}}\",",
-                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"number\":\"555-0002\",",
-                            "        \"type\":\"phone_number\"",
-                            "    }",
-                            "}')"
-                        ],
                         [
                             "INSERT INTO agreego.\"entity\" (",
                             "    \"created_at\",",
@@ -1796,23 +1753,6 @@
                             "    '00000000-0000-0000-0000-000000000000'",
                             ")"
                         ],
-                        [
-                            "SELECT pg_notify('entity', '{",
-                            "    \"complete\":{",
-                            "        \"created_at\":\"{{timestamp}}\",",
-                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"id\":\"{{uuid:contact2_id}}\",",
-                            "        \"is_primary\":false,",
-                            "        \"modified_at\":\"{{timestamp}}\",",
-                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"source_id\":\"{{uuid:person_id}}\",",
-                            "        \"source_type\":\"person\",",
-                            "        \"target_id\":\"{{uuid:phone2_id}}\",",
-                            "        \"target_type\":\"phone_number\",",
-                            "        \"type\":\"contact\"",
-                            "    }",
-                            "}')"
-                        ],
                         [
                             "INSERT INTO agreego.\"entity\" (",
                             "    \"created_at\",",
@@ -1857,19 +1797,6 @@
                             "    '00000000-0000-0000-0000-000000000000'",
                             ")"
                         ],
-                        [
-                            "SELECT pg_notify('entity', '{",
-                            "    \"complete\":{",
-                            "        \"address\":\"test@example.com\",",
-                            "        \"created_at\":\"{{timestamp}}\",",
-                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"id\":\"{{uuid:email1_id}}\",",
-                            "        \"modified_at\":\"{{timestamp}}\",",
-                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"type\":\"email_address\"",
-                            "    }",
-                            "}')"
-                        ],
                         [
                             "INSERT INTO agreego.\"entity\" (",
                             "    \"created_at\",",
@@ -1931,23 +1858,6 @@
                             "    '00000000-0000-0000-0000-000000000000'",
                             ")"
                         ],
-                        [
-                            "SELECT pg_notify('entity', '{",
-                            "    \"complete\":{",
-                            "        \"created_at\":\"{{timestamp}}\",",
-                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"id\":\"{{uuid:contact3_id}}\",",
-                            "        \"is_primary\":false,",
-                            "        \"modified_at\":\"{{timestamp}}\",",
-                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
-                            "        \"source_id\":\"{{uuid:person_id}}\",",
-                            "        \"source_type\":\"person\",",
-                            "        \"target_id\":\"{{uuid:email1_id}}\",",
-                            "        \"target_type\":\"email_address\",",
-                            "        \"type\":\"contact\"",
-                            "    }",
-                            "}')"
-                        ],
                         [
                             "INSERT INTO agreego.change (",
                             "    changes,",
@@ -1982,6 +1892,96 @@
                             "        \"type\":\"person\"",
                             "    }",
                             "}')"
+                        ],
+                        [
+                            "SELECT pg_notify('entity', '{",
+                            "    \"complete\":{",
+                            "        \"created_at\":\"{{timestamp}}\",",
+                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"id\":\"{{uuid:contact1_id}}\",",
+                            "        \"is_primary\":true,",
+                            "        \"modified_at\":\"{{timestamp}}\",",
+                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"source_id\":\"{{uuid:person_id}}\",",
+                            "        \"source_type\":\"person\",",
+                            "        \"target_id\":\"{{uuid:phone1_id}}\",",
+                            "        \"target_type\":\"phone_number\",",
+                            "        \"type\":\"contact\"",
+                            "    }",
+                            "}')"
+                        ],
+                        [
+                            "SELECT pg_notify('entity', '{",
+                            "    \"complete\":{",
+                            "        \"created_at\":\"{{timestamp}}\",",
+                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"id\":\"{{uuid:phone1_id}}\",",
+                            "        \"modified_at\":\"{{timestamp}}\",",
+                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"number\":\"555-0001\",",
+                            "        \"type\":\"phone_number\"",
+                            "    }",
+                            "}')"
+                        ],
+                        [
+                            "SELECT pg_notify('entity', '{",
+                            "    \"complete\":{",
+                            "        \"created_at\":\"{{timestamp}}\",",
+                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"id\":\"{{uuid:contact2_id}}\",",
+                            "        \"is_primary\":false,",
+                            "        \"modified_at\":\"{{timestamp}}\",",
+                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"source_id\":\"{{uuid:person_id}}\",",
+                            "        \"source_type\":\"person\",",
+                            "        \"target_id\":\"{{uuid:phone2_id}}\",",
+                            "        \"target_type\":\"phone_number\",",
+                            "        \"type\":\"contact\"",
+                            "    }",
+                            "}')"
+                        ],
+                        [
+                            "SELECT pg_notify('entity', '{",
+                            "    \"complete\":{",
+                            "        \"created_at\":\"{{timestamp}}\",",
+                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"id\":\"{{uuid:phone2_id}}\",",
+                            "        \"modified_at\":\"{{timestamp}}\",",
+                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"number\":\"555-0002\",",
+                            "        \"type\":\"phone_number\"",
+                            "    }",
+                            "}')"
+                        ],
+                        [
+                            "SELECT pg_notify('entity', '{",
+                            "    \"complete\":{",
+                            "        \"created_at\":\"{{timestamp}}\",",
+                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"id\":\"{{uuid:contact3_id}}\",",
+                            "        \"is_primary\":false,",
+                            "        \"modified_at\":\"{{timestamp}}\",",
+                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"source_id\":\"{{uuid:person_id}}\",",
+                            "        \"source_type\":\"person\",",
+                            "        \"target_id\":\"{{uuid:email1_id}}\",",
+                            "        \"target_type\":\"email_address\",",
+                            "        \"type\":\"contact\"",
+                            "    }",
+                            "}')"
+                        ],
+                        [
+                            "SELECT pg_notify('entity', '{",
+                            "    \"complete\":{",
+                            "        \"address\":\"test@example.com\",",
+                            "        \"created_at\":\"{{timestamp}}\",",
+                            "        \"created_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"id\":\"{{uuid:email1_id}}\",",
+                            "        \"modified_at\":\"{{timestamp}}\",",
+                            "        \"modified_by\":\"00000000-0000-0000-0000-000000000000\",",
+                            "        \"type\":\"email_address\"",
+                            "    }",
+                            "}')"
                         ]
                     ]
                 }

fixtures/stems.json

@@ -10,9 +10,13 @@
           "type": "relation",
           "constraint": "fk_contact_entity",
           "source_type": "contact",
-          "source_columns": ["entity_id"],
+          "source_columns": [
+            "entity_id"
+          ],
           "destination_type": "person",
-          "destination_columns": ["id"],
+          "destination_columns": [
+            "id"
+          ],
           "prefix": null
         },
         {
@@ -20,88 +24,132 @@
           "type": "relation",
           "constraint": "fk_relationship_target",
           "source_type": "relationship",
-          "source_columns": ["target_id", "target_type"],
+          "source_columns": [
+            "target_id",
+            "target_type"
+          ],
           "destination_type": "entity",
-          "destination_columns": ["id", "type"],
+          "destination_columns": [
+            "id",
+            "type"
+          ],
           "prefix": "target"
         }
       ],
       "types": [
         {
           "name": "entity",
-          "hierarchy": ["entity"],
+          "hierarchy": [
-          "schemas": [{
+            "entity"
+          ],
+          "schemas": [
+            {
               "$id": "entity",
               "type": "object",
               "properties": {}
-          }]
+            }
+          ]
         },
         {
           "name": "person",
-          "hierarchy": ["person", "entity"],
+          "hierarchy": [
-          "schemas": [{
+            "person",
+            "entity"
+          ],
+          "schemas": [
+            {
               "$id": "person",
               "$ref": "entity",
               "properties": {}
-          }]
+            }
+          ]
         },
         {
           "name": "email_address",
-          "hierarchy": ["email_address", "entity"],
+          "hierarchy": [
-          "schemas": [{
+            "email_address",
+            "entity"
+          ],
+          "schemas": [
+            {
               "$id": "email_address",
               "$ref": "entity",
               "properties": {}
-          }]
+            }
+          ]
         },
         {
           "name": "phone_number",
-          "hierarchy": ["phone_number", "entity"],
+          "hierarchy": [
-          "schemas": [{
+            "phone_number",
+            "entity"
+          ],
+          "schemas": [
+            {
               "$id": "phone_number",
               "$ref": "entity",
               "properties": {}
-          }]
+            }
+          ]
         },
         {
           "name": "relationship",
           "relationship": true,
-          "hierarchy": ["relationship", "entity"],
+          "hierarchy": [
-          "schemas": [{
+            "relationship",
+            "entity"
+          ],
+          "schemas": [
+            {
               "$id": "relationship",
               "$ref": "entity",
               "properties": {}
-          }]
+            }
+          ]
         },
         {
           "name": "contact",
           "relationship": true,
-          "hierarchy": ["contact", "relationship", "entity"],
+          "hierarchy": [
-          "schemas": [{
+            "contact",
+            "relationship",
+            "entity"
+          ],
+          "schemas": [
+            {
               "$id": "contact",
               "$ref": "relationship",
               "properties": {
                 "target": {
                   "oneOf": [
-                  { "$ref": "phone_number" },
+                    {
-                  { "$ref": "email_address" }
+                      "$ref": "phone_number"
+                    },
+                    {
+                      "$ref": "email_address"
+                    }
                   ]
                 }
               }
-          }]
+            }
+          ]
         },
         {
           "name": "save_person",
-          "schemas": [{
+          "schemas": [
+            {
               "$id": "save_person.response",
               "$ref": "person",
               "properties": {
                 "contacts": {
                   "type": "array",
-                "items": { "$ref": "contact" }
+                  "items": {
+                    "$ref": "contact"
                   }
                 }
-          }]
+              }
+            }
+          ]
         }
       ]
     },
@@ -112,59 +160,148 @@
         "expect": {
           "success": true,
           "stems": {
-            "save_person.response": {
-              "": {
-                "type": "person"
-              },
-              "contacts/contact": {
-                "type": "contact",
-                "relation": "contacts_id"
-              },
-              "contacts/contact/email_address": {
-                "type": "email_address",
-                "relation": "target_id"
-              },
-              "contacts/contact/phone_number": {
-                "type": "phone_number",
-                "relation": "target_id"
-              }
-            },
             "contact": {
               "": {
+                "schema": {
+                  "$id": "contact",
+                  "$ref": "relationship",
+                  "properties": {
+                    "target": {
+                      "oneOf": [
+                        {
+                          "$ref": "phone_number"
+                        },
+                        {
+                          "$ref": "email_address"
+                        }
+                      ]
+                    }
+                  }
+                },
                 "type": "contact"
               },
-              "email_address": {
+              "target#(type==\"email_address\")": {
-                "type": "email_address",
+                "relation": "target_id",
-                "relation": "target_id"
+                "schema": {
+                  "$id": "email_address",
+                  "$ref": "entity",
+                  "properties": {}
                 },
-              "phone_number": {
+                "type": "email_address"
-                "type": "phone_number",
+              },
-                "relation": "target_id"
+              "target#(type==\"phone_number\")": {
+                "relation": "target_id",
+                "schema": {
+                  "$id": "phone_number",
+                  "$ref": "entity",
+                  "properties": {}
+                },
+                "type": "phone_number"
+              }
+            },
+            "email_address": {
+              "": {
+                "schema": {
+                  "$id": "email_address",
+                  "$ref": "entity",
+                  "properties": {}
+                },
+                "type": "email_address"
+              }
+            },
+            "entity": {
+              "": {
+                "schema": {
+                  "$id": "entity",
+                  "properties": {},
+                  "type": "object"
+                },
+                "type": "entity"
               }
             },
             "person": {
               "": {
-                "type": "person"
+                "schema": {
-              }
+                  "$id": "person",
+                  "$ref": "entity",
+                  "properties": {}
                 },
-            "email_address": {
+                "type": "person"
-              "": {
-                "type": "email_address"
               }
             },
             "phone_number": {
               "": {
+                "schema": {
+                  "$id": "phone_number",
+                  "$ref": "entity",
+                  "properties": {}
+                },
                 "type": "phone_number"
               }
             },
             "relationship": {
               "": {
+                "schema": {
+                  "$id": "relationship",
+                  "$ref": "entity",
+                  "properties": {}
+                },
                 "type": "relationship"
               }
             },
-            "entity": {
+            "save_person.response": {
               "": {
-                "type": "entity"
+                "schema": {
+                  "$id": "save_person.response",
+                  "$ref": "person",
+                  "properties": {
+                    "contacts": {
+                      "items": {
+                        "$ref": "contact"
+                      },
+                      "type": "array"
+                    }
+                  }
+                },
+                "type": "person"
+              },
+              "contacts.#": {
+                "relation": "contacts_id",
+                "schema": {
+                  "$id": "contact",
+                  "$ref": "relationship",
+                  "properties": {
+                    "target": {
+                      "oneOf": [
+                        {
+                          "$ref": "phone_number"
+                        },
+                        {
+                          "$ref": "email_address"
+                        }
+                      ]
+                    }
+                  }
+                },
+                "type": "contact"
+              },
+              "contacts.#.target#(type==\"email_address\")": {
+                "relation": "target_id",
+                "schema": {
+                  "$id": "email_address",
+                  "$ref": "entity",
+                  "properties": {}
+                },
+                "type": "email_address"
+              },
+              "contacts.#.target#(type==\"phone_number\")": {
+                "relation": "target_id",
+                "schema": {
+                  "$id": "phone_number",
+                  "$ref": "entity",
+                  "properties": {}
+                },
+                "type": "phone_number"
               }
             }
           }

src/database/executors/pgrx.rs

@@ -24,7 +24,9 @@ impl DatabaseExecutor for SpiExecutor {
       }
     }
 
+    pgrx::PgTryBuilder::new(|| {
       Spi::connect(|client| {
+        pgrx::notice!("JSPG_SQL: {}", sql);
         match client.select(sql, Some(args_with_oid.len() as i64), &args_with_oid) {
           Ok(tup_table) => {
             let mut results = Vec::new();
@@ -38,6 +40,12 @@ impl DatabaseExecutor for SpiExecutor {
           Err(e) => Err(format!("SPI Query Fetch Failure: {}", e)),
         }
       })
+    })
+    .catch_others(|cause| {
+      pgrx::warning!("JSPG Caught Native Postgres Error: {:?}", cause);
+      Err(format!("{:?}", cause))
+    })
+    .execute()
   }
 
   fn execute(&self, sql: &str, args: Option<&[Value]>) -> Result<(), String> {
@@ -52,12 +60,20 @@ impl DatabaseExecutor for SpiExecutor {
       }
     }
 
+    pgrx::PgTryBuilder::new(|| {
       Spi::connect_mut(|client| {
+        pgrx::notice!("JSPG_SQL: {}", sql);
         match client.update(sql, Some(args_with_oid.len() as i64), &args_with_oid) {
           Ok(_) => Ok(()),
           Err(e) => Err(format!("SPI Execution Failure: {}", e)),
         }
       })
+    })
+    .catch_others(|cause| {
+      pgrx::warning!("JSPG Caught Native Postgres Error: {:?}", cause);
+      Err(format!("{:?}", cause))
+    })
+    .execute()
   }
 
   fn auth_user_id(&self) -> Result<String, String> {

src/database/mod.rs

@@ -32,7 +32,7 @@ pub struct Database {
   pub enums: HashMap<String, Enum>,
   pub types: HashMap<String, Type>,
   pub puncs: HashMap<String, Punc>,
-  pub relations: HashMap<String, Relation>,
+  pub relations: Vec<Relation>,
   pub schemas: HashMap<String, Schema>,
   // Map of Schema ID -> { Entity Type -> Target Subschema Arc }
   pub stems: HashMap<String, HashMap<String, Arc<Stem>>>,
@@ -46,7 +46,7 @@ impl Database {
     let mut db = Self {
       enums: HashMap::new(),
       types: HashMap::new(),
-      relations: HashMap::new(),
+      relations: Vec::new(),
       puncs: HashMap::new(),
       schemas: HashMap::new(),
       stems: HashMap::new(),
@@ -78,7 +78,11 @@ impl Database {
       for item in arr {
         match serde_json::from_value::<Relation>(item.clone()) {
           Ok(def) => {
-            db.relations.insert(def.constraint.clone(), def);
+            if db.types.contains_key(&def.source_type)
+              && db.types.contains_key(&def.destination_type)
+            {
+              db.relations.push(def);
+            }
           }
           Err(e) => println!("DATABASE RELATION PARSE FAILED: {:?}", e),
         }
@@ -137,7 +141,6 @@ impl Database {
     self.executor.timestamp()
   }
 
-  /// Organizes the graph of the database, compiling regex, format functions, and caching relationships.
   pub fn compile(&mut self) -> Result<(), crate::drop::Drop> {
     self.collect_schemas();
     self.collect_depths();
@@ -226,6 +229,79 @@ impl Database {
     self.descendants = descendants;
   }
 
+  pub fn get_relation(
+    &self,
+    parent_type: &str,
+    child_type: &str,
+    prop_name: &str,
+    relative_keys: Option<&Vec<String>>,
+  ) -> Option<(&Relation, bool)> {
+    if parent_type == "entity" && child_type == "entity" {
+      return None; // Ignore entity <-> entity generic fallbacks, they aren't useful edges
+    }
+
+    let p_def = self.types.get(parent_type)?;
+    let c_def = self.types.get(child_type)?;
+
+    let mut matching_rels = Vec::new();
+    let mut directions = Vec::new();
+
+    for rel in &self.relations {
+      let is_forward = p_def.hierarchy.contains(&rel.source_type)
+        && c_def.hierarchy.contains(&rel.destination_type);
+      let is_reverse = p_def.hierarchy.contains(&rel.destination_type)
+        && c_def.hierarchy.contains(&rel.source_type);
+
+      if is_forward {
+        matching_rels.push(rel);
+        directions.push(true);
+      } else if is_reverse {
+        matching_rels.push(rel);
+        directions.push(false);
+      }
+    }
+
+    if matching_rels.is_empty() {
+      return None;
+    }
+
+    if matching_rels.len() == 1 {
+      return Some((matching_rels[0], directions[0]));
+    }
+
+    let mut chosen_idx = 0;
+    let mut resolved = false;
+
+    // Reduce ambiguity with prefix
+    for (i, rel) in matching_rels.iter().enumerate() {
+      if let Some(prefix) = &rel.prefix {
+        if prefix == prop_name {
+          chosen_idx = i;
+          resolved = true;
+          break;
+        }
+      }
+    }
+
+    // Reduce ambiguity by checking if relative payload OMITS the prefix (M:M heuristic)
+    if !resolved && relative_keys.is_some() {
+      let keys = relative_keys.unwrap();
+      let mut missing_prefix_ids = Vec::new();
+      for (i, rel) in matching_rels.iter().enumerate() {
+        if let Some(prefix) = &rel.prefix {
+          if !keys.contains(prefix) {
+            missing_prefix_ids.push(i);
+          }
+        }
+      }
+      if missing_prefix_ids.len() == 1 {
+        chosen_idx = missing_prefix_ids[0];
+      }
+    }
+
+    Some((matching_rels[chosen_idx], directions[chosen_idx]))
+  }
+
   fn collect_descendants_recursively(
     target: &str,
     direct_refs: &HashMap<String, Vec<String>>,
@@ -265,12 +341,12 @@ impl Database {
           String::from(""),
           None,
           None,
-          true,
+          false,
           &mut inner_map,
+          Vec::new(),
           &mut errors,
         );
         if !inner_map.is_empty() {
-          println!("SCHEMA: {} STEMS: {:?}", schema_id, inner_map.keys());
           db_stems.insert(schema_id, inner_map);
         }
       }
@@ -288,11 +364,12 @@ impl Database {
     db: &Database,
     root_schema_id: &str,
     schema: &Schema,
-    mut current_path: String,
+    current_path: String,
     parent_type: Option<String>,
     property_name: Option<String>,
-    is_root: bool,
+    is_polymorphic: bool,
     inner_map: &mut HashMap<String, Arc<Stem>>,
+    seen_entities: Vec<String>,
     errors: &mut Vec<crate::drop::Error>,
   ) {
     let mut is_entity = false;
@@ -323,67 +400,45 @@ impl Database {
       }
     }
 
+    if is_entity {
+      if seen_entities.contains(&entity_type) {
+        return; // Break cyclical schemas!
+      }
+    }
+
     let mut relation_col = None;
     if is_entity {
       if let (Some(pt), Some(prop)) = (&parent_type, &property_name) {
         let expected_col = format!("{}_id", prop);
         let mut found = false;
-        for rel in db.relations.values() {
+
-          if (rel.source_type == *pt && rel.destination_type == entity_type)
+        if let Some((rel, _)) = db.get_relation(pt, &entity_type, prop, None) {
-            || (rel.source_type == entity_type && rel.destination_type == *pt)
-          {
           if rel.source_columns.contains(&expected_col) {
             relation_col = Some(expected_col.clone());
             found = true;
-              break;
-            }
           }
         }
+
         if !found {
           relation_col = Some(expected_col);
         }
       }
 
+      let mut final_path = current_path.clone();
+      if is_polymorphic && !final_path.is_empty() && !final_path.ends_with(&entity_type) {
+        if final_path.ends_with(".#") {
+          final_path = format!("{}(type==\"{}\")", final_path, entity_type);
+        } else {
+          final_path = format!("{}#(type==\"{}\")", final_path, entity_type);
+        }
+      }
+
       let stem = Stem {
         r#type: entity_type.clone(),
         relation: relation_col,
         schema: Arc::new(schema.clone()),
       };
-
+      inner_map.insert(final_path, Arc::new(stem));
-      let mut branch_path = if is_root {
-        String::new()
-      } else if current_path.is_empty() {
-        entity_type.clone()
-      } else {
-        format!("{}/{}", current_path, entity_type)
-      };
-
-      // DEDUPLICATION: If we just recursed into the EXACT same entity type definition,
-      // do not append again and do not re-register the stem.
-      let already_registered =
-        if current_path == entity_type || current_path.ends_with(&format!("/{}", entity_type)) {
-          branch_path = current_path.clone();
-          true
-        } else {
-          false
-        };
-
-      if !already_registered {
-        if inner_map.contains_key(&branch_path) {
-          errors.push(crate::drop::Error {
-            code: "STEM_COLLISION".to_string(),
-            message: format!("The stem path `{}` resolves to multiple Entity boundaries. This usually occurs during un-wrapped $family or oneOf polymorphic schemas where multiple Entities are directly assigned to the same property. To fix this, encapsulate the polymorphic branch.", branch_path),
-            details: crate::drop::ErrorDetails {
-              path: root_schema_id.to_string(),
-            },
-          });
-        }
-
-        inner_map.insert(branch_path.clone(), Arc::new(stem));
-      }
-
-      // Update current_path for structural children
-      current_path = branch_path;
     }
 
     let next_parent = if is_entity {
@@ -392,34 +447,22 @@ impl Database {
       parent_type.clone()
     };
 
+    let pass_seen = if is_entity {
+      let mut ns = seen_entities.clone();
+      ns.push(entity_type.clone());
+      ns
+    } else {
+      seen_entities.clone()
+    };
+
     // Properties branch
     if let Some(props) = &schema.obj.properties {
       for (k, v) in props {
-        // Bypass target and source properties if we are in a relationship
-        if let Some(parent_str) = &next_parent {
-          if let Some(pt) = db.types.get(parent_str) {
-            if pt.relationship && (k == "target" || k == "source") {
-              Self::discover_stems(
-                db,
-                root_schema_id,
-                v,
-                current_path.clone(),
-                next_parent.clone(),
-                Some(k.clone()),
-                false,
-                inner_map,
-                errors,
-              );
-              continue;
-            }
-          }
-        }
-
         // Standard Property Pathing
         let next_path = if current_path.is_empty() {
           k.clone()
         } else {
-          format!("{}/{}", current_path, k)
+          format!("{}.{}", current_path, k)
         };
 
         Self::discover_stems(
@@ -431,6 +474,7 @@ impl Database {
           Some(k.clone()),
           false,
           inner_map,
+          pass_seen.clone(),
           errors,
         );
       }
@@ -438,15 +482,22 @@ impl Database {
 
     // Array Item branch
     if let Some(items) = &schema.obj.items {
+      let next_path = if current_path.is_empty() {
+        String::from("#")
+      } else {
+        format!("{}.#", current_path)
+      };
+
       Self::discover_stems(
         db,
         root_schema_id,
         items,
-        current_path.clone(),
+        next_path,
         next_parent.clone(),
         property_name.clone(),
-        false, // Arrays themselves aren't polymorphic branches, their items might be
+        false,
         inner_map,
+        pass_seen.clone(),
         errors,
       );
     }
@@ -463,8 +514,9 @@ impl Database {
             current_path.clone(),
             next_parent.clone(),
             property_name.clone(),
-            false,
+            is_polymorphic,
             inner_map,
+            seen_entities.clone(),
             errors,
           );
         }
@@ -481,8 +533,9 @@ impl Database {
           current_path.clone(),
           next_parent.clone(),
           property_name.clone(),
-          false,
+          true,
           inner_map,
+          pass_seen.clone(),
           errors,
         );
       }
@@ -496,8 +549,9 @@ impl Database {
           current_path.clone(),
           next_parent.clone(),
           property_name.clone(),
-          false,
+          is_polymorphic,
           inner_map,
+          pass_seen.clone(),
           errors,
         );
       }

src/database/schema.rs

@@ -5,7 +5,6 @@ use std::sync::Arc;
 
 // Schema mirrors the Go Punc Generator's schema struct for consistency.
 // It is an order-preserving representation of a JSON Schema.
-
 pub fn deserialize_some<'de, D>(deserializer: D) -> Result<Option<Value>, D::Error>
 where
   D: serde::Deserializer<'de>,
@@ -13,117 +12,159 @@ where
   let v = Value::deserialize(deserializer)?;
   Ok(Some(v))
 }
+
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct SchemaObject {
   // Core Schema Keywords
   #[serde(rename = "$id")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub id: Option<String>,
   #[serde(rename = "$ref")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub r#ref: Option<String>,
-  /*
+  #[serde(skip_serializing_if = "Option::is_none")]
-     Note: The `Ref` field in the Go struct is a pointer populated by the linker.
-     In Rust, we might handle this differently (e.g., separate lookup or Rc/Arc),
-     so we omit the direct recursive `Ref` field for now and rely on `ref_string`.
-  */
   pub description: Option<String>,
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub title: Option<String>,
   #[serde(default)] // Allow missing type
   #[serde(rename = "type")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub type_: Option<SchemaTypeOrArray>, // Handles string or array of strings
 
   // Object Keywords
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub properties: Option<BTreeMap<String, Arc<Schema>>>,
   #[serde(rename = "patternProperties")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub pattern_properties: Option<BTreeMap<String, Arc<Schema>>>,
   #[serde(rename = "additionalProperties")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub additional_properties: Option<Arc<Schema>>,
   #[serde(rename = "$family")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub family: Option<String>,
 
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub required: Option<Vec<String>>,
 
   // dependencies can be schema dependencies or property dependencies
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub dependencies: Option<BTreeMap<String, Dependency>>,
 
   // Array Keywords
   #[serde(rename = "items")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub items: Option<Arc<Schema>>,
   #[serde(rename = "prefixItems")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub prefix_items: Option<Vec<Arc<Schema>>>,
 
   // String Validation
   #[serde(rename = "minLength")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub min_length: Option<f64>,
   #[serde(rename = "maxLength")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub max_length: Option<f64>,
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub pattern: Option<String>,
 
   // Array Validation
   #[serde(rename = "minItems")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub min_items: Option<f64>,
   #[serde(rename = "maxItems")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub max_items: Option<f64>,
   #[serde(rename = "uniqueItems")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub unique_items: Option<bool>,
   #[serde(rename = "contains")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub contains: Option<Arc<Schema>>,
   #[serde(rename = "minContains")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub min_contains: Option<f64>,
   #[serde(rename = "maxContains")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub max_contains: Option<f64>,
 
   // Object Validation
   #[serde(rename = "minProperties")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub min_properties: Option<f64>,
   #[serde(rename = "maxProperties")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub max_properties: Option<f64>,
   #[serde(rename = "propertyNames")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub property_names: Option<Arc<Schema>>,
 
   // Numeric Validation
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub format: Option<String>,
   #[serde(rename = "enum")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub enum_: Option<Vec<Value>>, // `enum` is a reserved keyword in Rust
   #[serde(
     default,
     rename = "const",
     deserialize_with = "crate::database::schema::deserialize_some"
   )]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub const_: Option<Value>,
 
   // Numeric Validation
   #[serde(rename = "multipleOf")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub multiple_of: Option<f64>,
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub minimum: Option<f64>,
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub maximum: Option<f64>,
   #[serde(rename = "exclusiveMinimum")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub exclusive_minimum: Option<f64>,
   #[serde(rename = "exclusiveMaximum")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub exclusive_maximum: Option<f64>,
 
   // Combining Keywords
   #[serde(rename = "allOf")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub all_of: Option<Vec<Arc<Schema>>>,
   #[serde(rename = "oneOf")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub one_of: Option<Vec<Arc<Schema>>>,
   #[serde(rename = "not")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub not: Option<Arc<Schema>>,
   #[serde(rename = "if")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub if_: Option<Arc<Schema>>,
   #[serde(rename = "then")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub then_: Option<Arc<Schema>>,
   #[serde(rename = "else")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub else_: Option<Arc<Schema>>,
 
   // Custom Vocabularies
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub form: Option<Vec<String>>,
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub display: Option<Vec<String>>,
   #[serde(rename = "enumNames")]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub enum_names: Option<Vec<String>>,
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub control: Option<String>,
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub actions: Option<BTreeMap<String, Action>>,
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub computer: Option<String>,
   #[serde(default)]
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub extensible: Option<bool>,
 
   #[serde(skip)]
@@ -331,7 +372,9 @@ pub enum SchemaTypeOrArray {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Action {
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub navigate: Option<String>,
+  #[serde(skip_serializing_if = "Option::is_none")]
   pub punc: Option<String>,
 }
 #[derive(Debug, Clone, Serialize, Deserialize)]

src/database/stem.rs

@@ -8,10 +8,5 @@ pub struct Stem {
   #[serde(skip_serializing_if = "Option::is_none")]
   pub relation: Option<String>,
 
-  // The actual database schema node mapping for
-  // O(1) jump table execution for queryer.
-  //
-  // Automatically skipped from `jspg_stems()` JSON payload output.
-  #[serde(skip)]
   pub schema: Arc<Schema>,
 }

src/drop.rs

@@ -67,6 +67,10 @@ pub struct Error {
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct ErrorDetails {
   pub path: String,
-  // Extensions can be added here (package, cause, etc)
+  #[serde(skip_serializing_if = "Option::is_none")]
-  // For now, validator only provides path
+  pub cause: Option<String>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub context: Option<Vec<String>>,
+  #[serde(skip_serializing_if = "Option::is_none")]
+  pub schema: Option<String>,
 }

src/lib.rs

@@ -31,6 +31,9 @@ fn jspg_failure() -> JsonB {
     message: "JSPG extension has not been initialized via jspg_setup".to_string(),
     details: crate::drop::ErrorDetails {
       path: "".to_string(),
+      cause: None,
+      context: None,
+      schema: None,
     },
   };
   let drop = crate::drop::Drop::with_errors(vec![error]);
@@ -111,9 +114,7 @@ pub fn jspg_validate(schema_id: &str, instance: JsonB) -> JsonB {
 }
 
 #[cfg_attr(not(test), pg_extern)]
-pub fn jspg_stems() -> JsonB {
+pub fn jspg_schemas() -> JsonB {
-  use serde_json::{Map, Value};
-
   let engine_opt = {
     let lock = GLOBAL_JSPG.read().unwrap();
     lock.clone()
@@ -121,9 +122,30 @@ pub fn jspg_stems() -> JsonB {
 
   match engine_opt {
     Some(engine) => {
-      JsonB(serde_json::to_value(&engine.database.stems).unwrap_or(Value::Object(Map::new())))
+      let schemas_json = serde_json::to_value(&engine.database.schemas)
+        .unwrap_or(serde_json::Value::Object(serde_json::Map::new()));
+      let drop = crate::drop::Drop::success_with_val(schemas_json);
+      JsonB(serde_json::to_value(drop).unwrap())
     }
-    None => JsonB(Value::Object(Map::new())),
+    None => jspg_failure(),
+  }
+}
+
+#[cfg_attr(not(test), pg_extern)]
+pub fn jspg_stems() -> JsonB {
+  let engine_opt = {
+    let lock = GLOBAL_JSPG.read().unwrap();
+    lock.clone()
+  };
+
+  match engine_opt {
+    Some(engine) => {
+      let stems_json = serde_json::to_value(&engine.database.stems)
+        .unwrap_or(serde_json::Value::Object(serde_json::Map::new()));
+      let drop = crate::drop::Drop::success_with_val(stems_json);
+      JsonB(serde_json::to_value(drop).unwrap())
+    }
+    None => jspg_failure(),
   }
 }
 

src/merger/mod.rs

@@ -21,9 +21,43 @@ impl Merger {
   }
 
   pub fn merge(&self, data: Value) -> crate::drop::Drop {
-    match self.merge_internal(data) {
+    let mut notifications_queue = Vec::new();
-      Ok(val) => {
+
-        let stripped_val = match val {
+    let result = self.merge_internal(data, &mut notifications_queue);
+
+    let val_resolved = match result {
+      Ok(val) => val,
+      Err(msg) => {
+        return crate::drop::Drop::with_errors(vec![crate::drop::Error {
+          code: "MERGE_FAILED".to_string(),
+          message: msg,
+          details: crate::drop::ErrorDetails {
+            path: "".to_string(),
+            cause: None,
+            context: None,
+            schema: None,
+          },
+        }]);
+      }
+    };
+
+    // Execute the globally collected, pre-ordered notifications last!
+    for notify_sql in notifications_queue {
+      if let Err(e) = self.db.execute(&notify_sql, None) {
+        return crate::drop::Drop::with_errors(vec![crate::drop::Error {
+          code: "MERGE_FAILED".to_string(),
+          message: format!("Executor Error in pre-ordered notify: {:?}", e),
+          details: crate::drop::ErrorDetails {
+            path: "".to_string(),
+            cause: None,
+            context: None,
+            schema: None,
+          },
+        }]);
+      }
+    }
+
+    let stripped_val = match val_resolved {
       Value::Object(mut map) => {
         let mut out = serde_json::Map::new();
         if let Some(id) = map.remove("id") {
@@ -50,34 +84,39 @@ impl Merger {
     };
     crate::drop::Drop::success_with_val(stripped_val)
   }
-      Err(msg) => crate::drop::Drop::with_errors(vec![crate::drop::Error {
-        code: "MERGE_FAILED".to_string(),
-        message: msg,
-        details: crate::drop::ErrorDetails {
-          path: "".to_string(),
-        },
-      }]),
-    }
-  }
 
-  pub(crate) fn merge_internal(&self, data: Value) -> Result<Value, String> {
+  pub(crate) fn merge_internal(
+    &self,
+    data: Value,
+    notifications: &mut Vec<String>,
+  ) -> Result<Value, String> {
     match data {
-      Value::Array(items) => self.merge_array(items),
+      Value::Array(items) => self.merge_array(items, notifications),
-      Value::Object(map) => self.merge_object(map),
+      Value::Object(map) => self.merge_object(map, notifications),
       _ => Err("Invalid merge payload: root must be an Object or Array".to_string()),
     }
   }
 
-  fn merge_array(&self, items: Vec<Value>) -> Result<Value, String> {
+  fn merge_array(
+    &self,
+    items: Vec<Value>,
+    notifications: &mut Vec<String>,
+  ) -> Result<Value, String> {
     let mut resolved_items = Vec::new();
     for item in items {
-      let resolved = self.merge_internal(item)?;
+      let resolved = self.merge_internal(item, notifications)?;
       resolved_items.push(resolved);
     }
     Ok(Value::Array(resolved_items))
   }
 
-  fn merge_object(&self, obj: serde_json::Map<String, Value>) -> Result<Value, String> {
+  fn merge_object(
+    &self,
+    obj: serde_json::Map<String, Value>,
+    notifications: &mut Vec<String>,
+  ) -> Result<Value, String> {
+    let queue_start = notifications.len();
+
     let type_name = match obj.get("type").and_then(|v| v.as_str()) {
       Some(t) => t.to_string(),
       None => return Err("Missing required 'type' field on object".to_string()),
@@ -134,10 +173,23 @@ impl Merger {
         _ => continue,
       };
 
-      let relative_relation = self.get_entity_relation(type_def, &relative, &relation_name)?;
+      // Attempt to extract relative object type name
+      let relative_type_name = match relative.get("type").and_then(|v| v.as_str()) {
+        Some(t) => t,
+        None => continue,
+      };
 
-      if let Some(relation) = relative_relation {
+      let relative_keys: Vec<String> = relative.keys().cloned().collect();
-        let parent_is_source = type_def.hierarchy.contains(&relation.source_type);
+
+      // Call central Database O(1) graph logic
+      let relative_relation = self.db.get_relation(
+        &type_def.name,
+        relative_type_name,
+        &relation_name,
+        Some(&relative_keys),
+      );
+
+      if let Some((relation, parent_is_source)) = relative_relation {
 
         if parent_is_source {
           // Parent holds FK to Child. Child MUST be generated FIRST.
@@ -147,7 +199,7 @@ impl Merger {
             }
           }
 
-          let merged_relative = match self.merge_internal(Value::Object(relative))? {
+          let merged_relative = match self.merge_internal(Value::Object(relative), notifications)? {
             Value::Object(m) => m,
             _ => continue,
           };
@@ -174,7 +226,7 @@ impl Merger {
             &entity_fields,
           );
 
-          let merged_relative = match self.merge_internal(Value::Object(relative))? {
+          let merged_relative = match self.merge_internal(Value::Object(relative), notifications)? {
             Value::Object(m) => m,
             _ => continue,
           };
@@ -223,9 +275,23 @@ impl Merger {
         _ => continue,
       };
 
-      let relative_relation = self.get_entity_relation(type_def, first_relative, &relation_name)?;
+      // Attempt to extract relative object type name
+      let relative_type_name = match first_relative.get("type").and_then(|v| v.as_str()) {
+        Some(t) => t,
+        None => continue,
+      };
 
-      if let Some(relation) = relative_relation {
+      let relative_keys: Vec<String> = first_relative.keys().cloned().collect();
+
+      // Call central Database O(1) graph logic
+      let relative_relation = self.db.get_relation(
+        &type_def.name,
+        relative_type_name,
+        &relation_name,
+        Some(&relative_keys),
+      );
+
+      if let Some((relation, _)) = relative_relation {
         let mut relative_responses = Vec::new();
         for relative_item_val in relative_arr {
           if let Value::Object(mut relative_item) = relative_item_val {
@@ -242,7 +308,8 @@ impl Merger {
               &entity_fields,
             );
 
-            let merged_relative = match self.merge_internal(Value::Object(relative_item))? {
+            let merged_relative =
+              match self.merge_internal(Value::Object(relative_item), notifications)? {
                 Value::Object(m) => m,
                 _ => continue,
               };
@@ -255,7 +322,7 @@ impl Merger {
     }
 
     // 7. Perform change tracking
-    self.merge_entity_change(
+    let notify_sql = self.merge_entity_change(
       &entity_fields,
       entity_fetched.as_ref(),
       entity_change_kind.as_deref(),
@@ -263,6 +330,10 @@ impl Merger {
       &timestamp,
     )?;
 
+    if let Some(sql) = notify_sql {
+      notifications.insert(queue_start, sql);
+    }
+
     // Produce the full tree response
     let mut final_response = serde_json::Map::new();
     if let Some(fetched) = entity_fetched {
@@ -614,10 +685,10 @@ impl Merger {
     entity_change_kind: Option<&str>,
     user_id: &str,
     timestamp: &str,
-  ) -> Result<(), String> {
+  ) -> Result<Option<String>, String> {
     let change_kind = match entity_change_kind {
       Some(k) => k,
-      None => return Ok(()),
+      None => return Ok(None),
     };
 
     let id_str = entity_fields.get("id").unwrap();
@@ -697,12 +768,8 @@ impl Merger {
       .db
       .execute(&change_sql, None)
       .map_err(|e| format!("Executor Error in change: {:?}", e))?;
-    self
-      .db
-      .execute(&notify_sql, None)
-      .map_err(|e| format!("Executor Error in notify: {:?}", e))?;
 
-    Ok(())
+    Ok(Some(notify_sql))
   }
 
   fn compare_entities(
@@ -736,101 +803,7 @@ impl Merger {
     changes
   }
 
-  fn reduce_entity_relations(
+  // Helper Functions
-    &self,
-    mut matching_relations: Vec<crate::database::relation::Relation>,
-    relative: &serde_json::Map<String, Value>,
-    relation_name: &str,
-  ) -> Result<Option<crate::database::relation::Relation>, String> {
-    if matching_relations.is_empty() {
-      return Ok(None);
-    }
-    if matching_relations.len() == 1 {
-      return Ok(Some(matching_relations.pop().unwrap()));
-    }
-
-    let exact_match: Vec<_> = matching_relations
-      .iter()
-      .filter(|r| r.prefix.as_deref() == Some(relation_name))
-      .cloned()
-      .collect();
-    if exact_match.len() == 1 {
-      return Ok(Some(exact_match.into_iter().next().unwrap()));
-    }
-
-    matching_relations.retain(|r| {
-      if let Some(prefix) = &r.prefix {
-        !relative.contains_key(prefix)
-      } else {
-        true
-      }
-    });
-
-    if matching_relations.len() == 1 {
-      Ok(Some(matching_relations.pop().unwrap()))
-    } else {
-      let constraints: Vec<_> = matching_relations
-        .iter()
-        .map(|r| r.constraint.clone())
-        .collect();
-      Err(format!(
-        "AMBIGUOUS_TYPE_RELATIONS: Could not reduce ambiguous type relations: {}",
-        constraints.join(", ")
-      ))
-    }
-  }
-
-  fn get_entity_relation(
-    &self,
-    entity_type: &crate::database::r#type::Type,
-    relative: &serde_json::Map<String, Value>,
-    relation_name: &str,
-  ) -> Result<Option<crate::database::relation::Relation>, String> {
-    let relative_type_name = match relative.get("type").and_then(|v| v.as_str()) {
-      Some(t) => t,
-      None => return Ok(None),
-    };
-
-    let relative_type = match self.db.types.get(relative_type_name) {
-      Some(t) => t,
-      None => return Ok(None),
-    };
-
-    let mut relative_relations: Vec<crate::database::relation::Relation> = Vec::new();
-
-    for r in self.db.relations.values() {
-      if r.source_type != "entity" && r.destination_type != "entity" {
-        let condition1 = relative_type.hierarchy.contains(&r.source_type)
-          && entity_type.hierarchy.contains(&r.destination_type);
-        let condition2 = entity_type.hierarchy.contains(&r.source_type)
-          && relative_type.hierarchy.contains(&r.destination_type);
-
-        if condition1 || condition2 {
-          relative_relations.push(r.clone());
-        }
-      }
-    }
-
-    let mut relative_relation =
-      self.reduce_entity_relations(relative_relations, relative, relation_name)?;
-
-    if relative_relation.is_none() {
-      let mut poly_relations: Vec<crate::database::relation::Relation> = Vec::new();
-      for r in self.db.relations.values() {
-        if r.destination_type == "entity" {
-          let condition1 = relative_type.hierarchy.contains(&r.source_type);
-          let condition2 = entity_type.hierarchy.contains(&r.source_type);
-
-          if condition1 || condition2 {
-            poly_relations.push(r.clone());
-          }
-        }
-      }
-      relative_relation = self.reduce_entity_relations(poly_relations, relative, relation_name)?;
-    }
-
-    Ok(relative_relation)
-  }
 
   fn apply_entity_relation(
     source_entity: &mut serde_json::Map<String, Value>,

src/queryer/compiler.rs

@@ -1,15 +1,24 @@
 use crate::database::Database;
 use std::sync::Arc;
-
+pub struct Compiler<'a> {
-pub struct SqlCompiler {
+  pub db: &'a Database,
-  pub db: Arc<Database>,
+  pub filter_keys: &'a [String],
+  pub is_stem_query: bool,
+  pub alias_counter: usize,
 }
 
-impl SqlCompiler {
+#[derive(Clone, Debug)]
-  pub fn new(db: Arc<Database>) -> Self {
+pub struct Node<'a> {
-    Self { db }
+  pub schema: std::sync::Arc<crate::database::schema::Schema>,
-  }
+  pub parent_alias: String,
+  pub parent_type_aliases: Option<std::sync::Arc<std::collections::HashMap<String, String>>>,
+  pub parent_type: Option<&'a crate::database::r#type::Type>,
+  pub property_name: Option<String>,
+  pub depth: usize,
+  pub stem_path: String,
+}
 
+impl<'a> Compiler<'a> {
   /// Compiles a JSON schema into a nested PostgreSQL query returning JSONB
   pub fn compile(
     &self,
@@ -23,11 +32,10 @@ impl SqlCompiler {
       .get(schema_id)
       .ok_or_else(|| format!("Schema not found: {}", schema_id))?;
 
-    let resolved_arc;
     let target_schema = if let Some(path) = stem_path.filter(|p| !p.is_empty() && *p != "/") {
       if let Some(stems_map) = self.db.stems.get(schema_id) {
         if let Some(stem) = stems_map.get(path) {
-          resolved_arc = stem.schema.clone();
+          stem.schema.clone()
         } else {
           return Err(format!(
             "Stem entity type '{}' not found in schema '{}'",
@@ -40,58 +48,67 @@ impl SqlCompiler {
           path, schema_id
         ));
       }
-      resolved_arc.as_ref()
     } else {
-      schema
+      std::sync::Arc::new(schema.clone())
     };
 
-    // We expect the top level to typically be an Object or Array
     let is_stem_query = stem_path.is_some();
-    let (sql, _) = self.walk_schema(target_schema, "t1", None, filter_keys, is_stem_query, 0)?;
+
+    let mut compiler = Compiler {
+      db: &self.db,
+      filter_keys,
+      is_stem_query,
+      alias_counter: 0,
+    };
+
+    let node = Node {
+      schema: target_schema,
+      parent_alias: "t1".to_string(),
+      parent_type_aliases: None,
+      parent_type: None,
+      property_name: None,
+      depth: 0,
+      stem_path: String::new(),
+    };
+
+    let (sql, _) = compiler.compile_node(node)?;
     Ok(sql)
   }
 
   /// Recursively walks the schema AST emitting native PostgreSQL jsonb mapping
   /// Returns a tuple of (SQL_String, Field_Type)
-  fn walk_schema(
+  fn compile_node(&mut self, node: Node<'a>) -> Result<(String, String), String> {
-    &self,
-    schema: &crate::database::schema::Schema,
-    parent_alias: &str,
-    prop_name_context: Option<&str>,
-    filter_keys: &[String],
-    is_stem_query: bool,
-    depth: usize,
-  ) -> Result<(String, String), String> {
     // Determine the base schema type (could be an array, object, or literal)
-    match &schema.obj.type_ {
+    match &node.schema.obj.type_ {
       Some(crate::database::schema::SchemaTypeOrArray::Single(t)) if t == "array" => {
-        // Handle Arrays:
+        self.compile_array(node)
-        if let Some(items) = &schema.obj.items {
+      }
+      _ => self.compile_reference(node),
+    }
+  }
+
+  fn compile_array(&mut self, node: Node<'a>) -> Result<(String, String), String> {
+    if let Some(items) = &node.schema.obj.items {
+      let next_path = if node.stem_path.is_empty() {
+        String::from("#")
+      } else {
+        format!("{}.#", node.stem_path)
+      };
+
       if let Some(ref_id) = &items.obj.r#ref {
         if let Some(type_def) = self.db.types.get(ref_id) {
-              if is_stem_query && depth > 0 {
+          let mut entity_noke = node.clone();
-                return Ok(("".to_string(), "abort".to_string()));
+          entity_noke.stem_path = next_path;
-              }
+          entity_noke.schema = std::sync::Arc::clone(items);
-              return self.compile_entity_node(
+          return self.compile_entity(type_def, entity_noke, true);
-                items,
-                type_def,
-                parent_alias,
-                prop_name_context,
-                true,
-                filter_keys,
-                is_stem_query,
-                depth,
-              );
         }
       }
-          let (item_sql, _) = self.walk_schema(
+
-            items,
+      let mut next_node = node.clone();
-            parent_alias,
+      next_node.depth += 1;
-            prop_name_context,
+      next_node.stem_path = next_path;
-            filter_keys,
+      next_node.schema = std::sync::Arc::clone(items);
-            is_stem_query,
+      let (item_sql, _) = self.compile_node(next_node)?;
-            depth + 1,
-          )?;
       return Ok((
         format!("(SELECT jsonb_agg({}) FROM TODO)", item_sql),
         "array".to_string(),
@@ -103,120 +120,104 @@ impl SqlCompiler {
       "array".to_string(),
     ))
   }
-      _ => {
+
+  fn compile_reference(&mut self, node: Node<'a>) -> Result<(String, String), String> {
     // Determine if this schema represents a Database Entity
     let mut resolved_type = None;
 
-        // Target is generally a specific schema (e.g. 'base.person'), but it tells us what physical
+    if let Some(family_target) = node.schema.obj.family.as_ref() {
-        // database table hierarchy it maps to via the `schema.id` prefix/suffix convention.
+      resolved_type = self.db.types.get(family_target);
-        if let Some(lookup_key) = schema.obj.id.as_ref().or(schema.obj.r#ref.as_ref()) {
+    } else if let Some(lookup_key) = node
+      .schema
+      .obj
+      .id
+      .as_ref()
+      .or(node.schema.obj.r#ref.as_ref())
+    {
       let base_type_name = lookup_key.split('.').next_back().unwrap_or("").to_string();
       resolved_type = self.db.types.get(&base_type_name);
     }
 
     if let Some(type_def) = resolved_type {
-          if is_stem_query && depth > 0 {
+      return self.compile_entity(type_def, node.clone(), false);
-            return Ok(("".to_string(), "abort".to_string()));
-          }
-          return self.compile_entity_node(
-            schema,
-            type_def,
-            parent_alias,
-            prop_name_context,
-            false,
-            filter_keys,
-            is_stem_query,
-            depth,
-          );
     }
 
     // Handle Direct Refs
-        if let Some(ref_id) = &schema.obj.r#ref {
+    if let Some(ref_id) = &node.schema.obj.r#ref {
       // If it's just an ad-hoc struct ref, we should resolve it
       if let Some(target_schema) = self.db.schemas.get(ref_id) {
-            return self.walk_schema(
+        let mut ref_node = node.clone();
-              target_schema,
+        ref_node.schema = std::sync::Arc::new(target_schema.clone());
-              parent_alias,
+        return self.compile_node(ref_node);
-              prop_name_context,
-              filter_keys,
-              is_stem_query,
-              depth,
-            );
       }
       return Err(format!("Unresolved $ref: {}", ref_id));
     }
+    // Handle $family Polymorphism fallbacks for relations
+    if let Some(family_target) = &node.schema.obj.family {
+      let base_type_name = family_target
+        .split('.')
+        .next_back()
+        .unwrap_or(family_target)
+        .to_string();
+
+      if let Some(type_def) = self.db.types.get(&base_type_name) {
+        if type_def.variations.len() == 1 {
+          let mut bypass_schema = crate::database::schema::Schema::default();
+          bypass_schema.obj.r#ref = Some(family_target.clone());
+          let mut bypass_node = node.clone();
+          bypass_node.schema = std::sync::Arc::new(bypass_schema);
+          return self.compile_node(bypass_node);
+        }
+
+        let mut sorted_variations: Vec<String> = type_def.variations.iter().cloned().collect();
+        sorted_variations.sort();
+
+        let mut family_schemas = Vec::new();
+        for variation in &sorted_variations {
+          let mut ref_schema = crate::database::schema::Schema::default();
+          ref_schema.obj.r#ref = Some(variation.clone());
+          family_schemas.push(std::sync::Arc::new(ref_schema));
+        }
+
+        return self.compile_one_of(&family_schemas, node);
+      }
+    }
+
+    // Handle oneOf Polymorphism fallbacks for relations
+    if let Some(one_of) = &node.schema.obj.one_of {
+      return self.compile_one_of(one_of, node.clone());
+    }
 
     // Just an inline object definition?
-        if let Some(props) = &schema.obj.properties {
+    if let Some(props) = &node.schema.obj.properties {
-          return self.compile_inline_object(
+      return self.compile_object(props, node.clone());
-            props,
-            parent_alias,
-            filter_keys,
-            is_stem_query,
-            depth,
-          );
     }
 
     // Literal fallback
     Ok((
       format!(
         "{}.{}",
-            parent_alias,
+        node.parent_alias,
-            prop_name_context.unwrap_or("unknown_prop")
+        node.property_name.as_deref().unwrap_or("unknown_prop")
       ),
       "string".to_string(),
     ))
   }
-    }
-  }
 
-  fn get_merged_properties(
+  fn compile_entity(
-    &self,
+    &mut self,
-    schema: &crate::database::schema::Schema,
+    r#type: &'a crate::database::r#type::Type,
-  ) -> std::collections::BTreeMap<String, Arc<crate::database::schema::Schema>> {
+    node: Node<'a>,
-    let mut props = std::collections::BTreeMap::new();
-
-    if let Some(ref_id) = &schema.obj.r#ref {
-      if let Some(parent_schema) = self.db.schemas.get(ref_id) {
-        props.extend(self.get_merged_properties(parent_schema));
-      }
-    }
-
-    if let Some(local_props) = &schema.obj.properties {
-      for (k, v) in local_props {
-        props.insert(k.clone(), v.clone());
-      }
-    }
-
-    props
-  }
-
-  fn compile_entity_node(
-    &self,
-    schema: &crate::database::schema::Schema,
-    type_def: &crate::database::r#type::Type,
-    parent_alias: &str,
-    prop_name: Option<&str>,
     is_array: bool,
-    filter_keys: &[String],
-    is_stem_query: bool,
-    depth: usize,
   ) -> Result<(String, String), String> {
-    let local_ctx = format!("{}_{}", parent_alias, prop_name.unwrap_or("obj"));
+    let (table_aliases, from_clauses) = self.compile_from_clause(r#type);
-
-    // 1. Build FROM clauses and table aliases
-    let (table_aliases, from_clauses) = self.build_hierarchy_from_clauses(type_def, &local_ctx);
 
     // 2. Map properties and build jsonb_build_object args
-    let select_args = self.map_properties_to_aliases(
+    let mut select_args = self.compile_select_clause(r#type, &table_aliases, node.clone())?;
-      schema,
+
-      type_def,
+    // 2.5 Inject polymorphism directly into the query object
-      &table_aliases,
+    let mut poly_args = self.compile_polymorphism_select(r#type, &table_aliases, node.clone())?;
-      parent_alias,
+    select_args.append(&mut poly_args);
-      filter_keys,
-      is_stem_query,
-      depth,
-    )?;
 
     let jsonb_obj_sql = if select_args.is_empty() {
       "jsonb_build_object()".to_string()
@@ -225,14 +226,7 @@ impl SqlCompiler {
     };
 
     // 3. Build WHERE clauses
-    let where_clauses = self.build_filter_where_clauses(
+    let where_clauses = self.compile_where_clause(r#type, &table_aliases, node)?;
-      schema,
-      type_def,
-      &table_aliases,
-      parent_alias,
-      prop_name,
-      filter_keys,
-    )?;
 
     let selection = if is_array {
       format!("COALESCE(jsonb_agg({}), '[]'::jsonb)", jsonb_obj_sql)
@@ -257,22 +251,161 @@ impl SqlCompiler {
     ))
   }
 
-  fn build_hierarchy_from_clauses(
+  fn compile_polymorphism_select(
-    &self,
+    &mut self,
-    type_def: &crate::database::r#type::Type,
+    r#type: &'a crate::database::r#type::Type,
-    local_ctx: &str,
+    table_aliases: &std::collections::HashMap<String, String>,
+    node: Node<'a>,
+  ) -> Result<Vec<String>, String> {
+    let mut select_args = Vec::new();
+
+    if let Some(family_target) = node.schema.obj.family.as_ref() {
+      let base_type_name = family_target
+        .split('.')
+        .next_back()
+        .unwrap_or(family_target)
+        .to_string();
+
+      if let Some(fam_type_def) = self.db.types.get(&base_type_name) {
+        if fam_type_def.variations.len() == 1 {
+          let mut bypass_schema = crate::database::schema::Schema::default();
+          bypass_schema.obj.r#ref = Some(family_target.clone());
+
+          let mut bypass_node = node.clone();
+          bypass_node.schema = std::sync::Arc::new(bypass_schema);
+
+          let mut bypassed_args =
+            self.compile_select_clause(r#type, table_aliases, bypass_node)?;
+          select_args.append(&mut bypassed_args);
+        } else {
+          let mut family_schemas = Vec::new();
+          let mut sorted_fam_variations: Vec<String> =
+            fam_type_def.variations.iter().cloned().collect();
+          sorted_fam_variations.sort();
+
+          for variation in &sorted_fam_variations {
+            let mut ref_schema = crate::database::schema::Schema::default();
+            ref_schema.obj.r#ref = Some(variation.clone());
+            family_schemas.push(std::sync::Arc::new(ref_schema));
+          }
+
+          let base_alias = table_aliases
+            .get(&r#type.name)
+            .cloned()
+            .unwrap_or_else(|| node.parent_alias.to_string());
+          select_args.push(format!("'id', {}.id", base_alias));
+          let mut case_node = node.clone();
+          case_node.parent_alias = base_alias.clone();
+          let arc_aliases = std::sync::Arc::new(table_aliases.clone());
+          case_node.parent_type_aliases = Some(arc_aliases);
+
+          let (case_sql, _) = self.compile_one_of(&family_schemas, case_node)?;
+          select_args.push(format!("'type', {}", case_sql));
+        }
+      }
+    } else if let Some(one_of) = &node.schema.obj.one_of {
+      let base_alias = table_aliases
+        .get(&r#type.name)
+        .cloned()
+        .unwrap_or_else(|| node.parent_alias.to_string());
+      select_args.push(format!("'id', {}.id", base_alias));
+      let mut case_node = node.clone();
+      case_node.parent_alias = base_alias.clone();
+      let arc_aliases = std::sync::Arc::new(table_aliases.clone());
+      case_node.parent_type_aliases = Some(arc_aliases);
+
+      let (case_sql, _) = self.compile_one_of(one_of, case_node)?;
+      select_args.push(format!("'type', {}", case_sql));
+    }
+
+    Ok(select_args)
+  }
+
+  fn compile_object(
+    &mut self,
+    props: &std::collections::BTreeMap<String, std::sync::Arc<crate::database::schema::Schema>>,
+    node: Node<'a>,
+  ) -> Result<(String, String), String> {
+    let mut build_args = Vec::new();
+    for (k, v) in props {
+      let next_path = if node.stem_path.is_empty() {
+        k.clone()
+      } else {
+        format!("{}.{}", node.stem_path, k)
+      };
+
+      let mut child_node = node.clone();
+      child_node.property_name = Some(k.clone());
+      child_node.depth += 1;
+      child_node.stem_path = next_path;
+      child_node.schema = std::sync::Arc::clone(v);
+
+      let (child_sql, val_type) = self.compile_node(child_node)?;
+      if val_type == "abort" {
+        continue;
+      }
+      build_args.push(format!("'{}', {}", k, child_sql));
+    }
+    let combined = format!("jsonb_build_object({})", build_args.join(", "));
+    Ok((combined, "object".to_string()))
+  }
+
+  fn compile_one_of(
+    &mut self,
+    schemas: &[Arc<crate::database::schema::Schema>],
+    node: Node<'a>,
+  ) -> Result<(String, String), String> {
+    let mut case_statements = Vec::new();
+    let type_col = if let Some(prop) = &node.property_name {
+      format!("{}_type", prop)
+    } else {
+      "type".to_string()
+    };
+
+    for option_schema in schemas {
+      if let Some(ref_id) = &option_schema.obj.r#ref {
+        // Find the physical type this ref maps to
+        let base_type_name = ref_id.split('.').next_back().unwrap_or("").to_string();
+
+        // Generate the nested SQL for this specific target type
+        let mut child_node = node.clone();
+        child_node.schema = std::sync::Arc::clone(option_schema);
+        let (val_sql, _) = self.compile_node(child_node)?;
+
+        case_statements.push(format!(
+          "WHEN {}.{} = '{}' THEN ({})",
+          node.parent_alias, type_col, base_type_name, val_sql
+        ));
+      }
+    }
+
+    if case_statements.is_empty() {
+      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()))
+  }
+
+  fn compile_from_clause(
+    &mut self,
+    r#type: &crate::database::r#type::Type,
   ) -> (std::collections::HashMap<String, String>, Vec<String>) {
     let mut table_aliases = std::collections::HashMap::new();
     let mut from_clauses = Vec::new();
 
-    for (i, table_name) in type_def.hierarchy.iter().enumerate() {
+    for (i, table_name) in r#type.hierarchy.iter().enumerate() {
-      let alias = format!("{}_t{}", local_ctx, i + 1);
+      self.alias_counter += 1;
+      let alias = format!("{}_{}", table_name, self.alias_counter);
       table_aliases.insert(table_name.clone(), alias.clone());
 
       if i == 0 {
         from_clauses.push(format!("agreego.{} {}", table_name, alias));
       } else {
-        let prev_alias = format!("{}_t{}", local_ctx, i);
+        let prev_alias = format!("{}_{}", r#type.hierarchy[i - 1], self.alias_counter - 1);
         from_clauses.push(format!(
           "JOIN agreego.{} {} ON {}.id = {}.id",
           table_name, alias, alias, prev_alias
@@ -282,25 +415,48 @@ impl SqlCompiler {
     (table_aliases, from_clauses)
   }
 
-  fn map_properties_to_aliases(
+  fn compile_select_clause(
-    &self,
+    &mut self,
-    schema: &crate::database::schema::Schema,
+    r#type: &'a crate::database::r#type::Type,
-    type_def: &crate::database::r#type::Type,
     table_aliases: &std::collections::HashMap<String, String>,
-    parent_alias: &str,
+    node: Node<'a>,
-    filter_keys: &[String],
-    is_stem_query: bool,
-    depth: usize,
   ) -> Result<Vec<String>, String> {
     let mut select_args = Vec::new();
-    let grouped_fields = type_def.grouped_fields.as_ref().and_then(|v| v.as_object());
+    let grouped_fields = r#type.grouped_fields.as_ref().and_then(|v| v.as_object());
-    let merged_props = self.get_merged_properties(schema);
+    let merged_props = self.get_merged_properties(node.schema.as_ref());
+    let mut sorted_keys: Vec<&String> = merged_props.keys().collect();
+    sorted_keys.sort();
+
+    for prop_key in sorted_keys {
+      let prop_schema = &merged_props[prop_key];
+
+      let is_object_or_array = match &prop_schema.obj.type_ {
+        Some(crate::database::schema::SchemaTypeOrArray::Single(s)) => {
+          s == "object" || s == "array"
+        }
+        Some(crate::database::schema::SchemaTypeOrArray::Multiple(v)) => {
+          v.contains(&"object".to_string()) || v.contains(&"array".to_string())
+        }
+        _ => false,
+      };
+
+      let is_primitive = prop_schema.obj.r#ref.is_none() 
+        && !is_object_or_array 
+        && prop_schema.obj.family.is_none() 
+        && prop_schema.obj.one_of.is_none();
+
+      if is_primitive {
+        if let Some(ft) = r#type.field_types.as_ref().and_then(|v| v.as_object()) {
+          if !ft.contains_key(prop_key) {
+            continue; // Skip frontend virtual properties missing from physical table fields
+          }
+        }
+      }
 
-    for (prop_key, prop_schema) in &merged_props {
       let mut owner_alias = table_aliases
         .get("entity")
         .cloned()
-        .unwrap_or_else(|| format!("{}_t_err", parent_alias));
+        .unwrap_or_else(|| format!("{}_t_err", node.parent_alias));
 
       if let Some(gf) = grouped_fields {
         for (t_name, fields_val) in gf {
@@ -309,21 +465,30 @@ impl SqlCompiler {
               owner_alias = table_aliases
                 .get(t_name)
                 .cloned()
-                .unwrap_or_else(|| parent_alias.to_string());
+                .unwrap_or_else(|| node.parent_alias.to_string());
               break;
             }
           }
         }
       }
 
-      let (val_sql, val_type) = self.walk_schema(
+      let mut child_node = node.clone();
-        prop_schema,
+      child_node.parent_alias = owner_alias.clone();
-        &owner_alias,
+      let arc_aliases = std::sync::Arc::new(table_aliases.clone());
-        Some(prop_key),
+      child_node.parent_type_aliases = Some(arc_aliases);
-        filter_keys,
+      child_node.parent_type = Some(r#type);
-        is_stem_query,
+      child_node.property_name = Some(prop_key.clone());
-        depth + 1,
+      child_node.depth += 1;
-      )?;
+      let next_path = if node.stem_path.is_empty() {
+        prop_key.clone()
+      } else {
+        format!("{}.{}", node.stem_path, prop_key)
+      };
+
+      child_node.stem_path = next_path;
+      child_node.schema = std::sync::Arc::clone(prop_schema);
+
+      let (val_sql, val_type) = self.compile_node(child_node)?;
 
       if val_type != "abort" {
         select_args.push(format!("'{}', {}", prop_key, val_sql));
@@ -332,59 +497,65 @@ impl SqlCompiler {
     Ok(select_args)
   }
 
-  fn build_filter_where_clauses(
+  fn compile_where_clause(
     &self,
-    schema: &crate::database::schema::Schema,
+    r#type: &'a crate::database::r#type::Type,
-    type_def: &crate::database::r#type::Type,
+    type_aliases: &std::collections::HashMap<String, String>,
-    table_aliases: &std::collections::HashMap<String, String>,
+    node: Node<'a>,
-    parent_alias: &str,
-    prop_name: Option<&str>,
-    filter_keys: &[String],
   ) -> Result<Vec<String>, String> {
-    let base_alias = table_aliases
+    let base_alias = type_aliases
-      .get(&type_def.name)
+      .get(&r#type.name)
       .cloned()
       .unwrap_or_else(|| "err".to_string());
 
+    let entity_alias = type_aliases
+      .get("entity")
+      .cloned()
+      .unwrap_or_else(|| base_alias.clone());
+
     let mut where_clauses = Vec::new();
-    where_clauses.push(format!("NOT {}.archived", base_alias));
+    where_clauses.push(format!("NOT {}.archived", entity_alias));
 
-    if parent_alias == "t1" {
+    self.compile_filter_conditions(r#type, type_aliases, &node, &base_alias, &mut where_clauses);
-      for (i, filter_key) in filter_keys.iter().enumerate() {
+    self.compile_relation_conditions(r#type, type_aliases, &node, &base_alias, &mut where_clauses)?;
-        let mut parts = filter_key.split(':');
-        let field_name = parts.next().unwrap_or(filter_key);
-        let op = parts.next().unwrap_or("$eq");
 
-        let mut filter_alias = base_alias.clone();
+    Ok(where_clauses)
+  }
 
-        if let Some(gf) = type_def.grouped_fields.as_ref().and_then(|v| v.as_object()) {
+  fn resolve_filter_alias(
+    r#type: &crate::database::r#type::Type,
+    type_aliases: &std::collections::HashMap<String, String>,
+    base_alias: &str,
+    field_name: &str,
+  ) -> String {
+    if let Some(gf) = r#type.grouped_fields.as_ref().and_then(|v| v.as_object()) {
       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(field_name)) {
-                filter_alias = table_aliases
+            return type_aliases.get(t_name).cloned().unwrap_or_else(|| base_alias.to_string());
-                  .get(t_name)
-                  .cloned()
-                  .unwrap_or_else(|| base_alias.clone());
-                break;
           }
         }
       }
     }
+    base_alias.to_string()
+  }
 
+  fn determine_sql_cast_and_op(
+    r#type: &crate::database::r#type::Type,
+    node: &Node,
+    field_name: &str,
+  ) -> (&'static str, bool) {
     let mut is_ilike = false;
     let mut cast = "";
 
-        if let Some(field_types) = type_def.field_types.as_ref().and_then(|v| v.as_object()) {
+    if let Some(field_types) = r#type.field_types.as_ref().and_then(|v| v.as_object()) {
       if let Some(pg_type_val) = field_types.get(field_name) {
         if let Some(pg_type) = pg_type_val.as_str() {
           if pg_type == "uuid" {
             cast = "::uuid";
           } else if pg_type == "boolean" || pg_type == "bool" {
             cast = "::boolean";
-              } else if pg_type.contains("timestamp")
+          } else if pg_type.contains("timestamp") || pg_type == "timestamptz" || pg_type == "date" {
-                || pg_type == "timestamptz"
-                || pg_type == "date"
-              {
             cast = "::timestamptz";
           } else if pg_type == "numeric"
             || pg_type.contains("int")
@@ -394,7 +565,7 @@ impl SqlCompiler {
             cast = "::numeric";
           } else if pg_type == "text" || pg_type.contains("char") {
             let mut is_enum = false;
-                if let Some(props) = &schema.obj.properties {
+            if let Some(props) = &node.schema.obj.properties {
               if let Some(ps) = props.get(field_name) {
                 is_enum = ps.obj.enum_.is_some();
               }
@@ -406,6 +577,42 @@ impl SqlCompiler {
         }
       }
     }
+    (cast, is_ilike)
+  }
+
+  fn compile_filter_conditions(
+    &self,
+    r#type: &crate::database::r#type::Type,
+    type_aliases: &std::collections::HashMap<String, String>,
+    node: &Node,
+    base_alias: &str,
+    where_clauses: &mut Vec<String>,
+  ) {
+    for (i, filter_key) in self.filter_keys.iter().enumerate() {
+      let mut parts = filter_key.split(':');
+      let full_field_path = parts.next().unwrap_or(filter_key);
+      let op = parts.next().unwrap_or("$eq");
+
+      let field_name = if node.stem_path.is_empty() {
+        if full_field_path.contains('.') || full_field_path.contains('#') {
+          continue;
+        }
+        full_field_path
+      } else {
+        let prefix = format!("{}.", node.stem_path);
+        if full_field_path.starts_with(&prefix) {
+          let remainder = &full_field_path[prefix.len()..];
+          if remainder.contains('.') || remainder.contains('#') {
+            continue;
+          }
+          remainder
+        } else {
+          continue;
+        }
+      };
+
+      let filter_alias = Self::resolve_filter_alias(r#type, type_aliases, base_alias, field_name);
+      let (cast, is_ilike) = Self::determine_sql_cast_and_op(r#type, node, field_name);
 
       let param_index = i + 1;
       let p_val = format!("${}#>>'{{}}'", param_index);
@@ -422,31 +629,13 @@ impl SqlCompiler {
         ));
       } else {
         let sql_op = match op {
-            "$eq" => {
+          "$eq" => if is_ilike { "ILIKE" } else { "=" },
-              if is_ilike {
+          "$ne" => if is_ilike { "NOT ILIKE" } else { "!=" },
-                "ILIKE"
-              } else {
-                "="
-              }
-            }
-            "$ne" => {
-              if is_ilike {
-                "NOT ILIKE"
-              } else {
-                "!="
-              }
-            }
           "$gt" => ">",
           "$gte" => ">=",
           "$lt" => "<",
           "$lte" => "<=",
-            _ => {
+          _ => if is_ilike { "ILIKE" } else { "=" },
-              if is_ilike {
-                "ILIKE"
-              } else {
-                "="
-              }
-            }
         };
 
         let param_sql = if is_ilike && (op == "$eq" || op == "$ne") {
@@ -463,37 +652,91 @@ impl SqlCompiler {
     }
   }
 
-    if let Some(_prop) = prop_name {
+  fn compile_relation_conditions(
-      where_clauses.push(format!("{}.parent_id = {}.id", base_alias, parent_alias));
-    }
-
-    Ok(where_clauses)
-  }
-
-  fn compile_inline_object(
     &self,
-    props: &std::collections::BTreeMap<String, std::sync::Arc<crate::database::schema::Schema>>,
+    r#type: &crate::database::r#type::Type,
-    parent_alias: &str,
+    type_aliases: &std::collections::HashMap<String, String>,
-    filter_keys: &[String],
+    node: &Node,
-    is_stem_query: bool,
+    base_alias: &str,
-    depth: usize,
+    where_clauses: &mut Vec<String>,
-  ) -> Result<(String, String), String> {
+  ) -> Result<(), String> {
-    let mut build_args = Vec::new();
+    if let Some(prop_ref) = &node.property_name {
-    for (k, v) in props {
+      let prop = prop_ref.as_str();
-      let (child_sql, val_type) = self.walk_schema(
+      let mut parent_relation_alias = node.parent_alias.clone();
-        v,
+      let mut child_relation_alias = base_alias.to_string();
-        parent_alias,
+
-        Some(k),
+      if let Some(parent_type) = node.parent_type {
-        filter_keys,
+        let merged_props = self.get_merged_properties(node.schema.as_ref());
-        is_stem_query,
+        let relative_keys: Vec<String> = merged_props.keys().cloned().collect();
-        depth + 1,
+
-      )?;
+        let (relation, is_parent_source) = self
-      if val_type == "abort" {
+          .db
-        continue;
+          .get_relation(&parent_type.name, &r#type.name, prop, Some(&relative_keys))
+          .ok_or_else(|| {
+            format!(
+              "Could not dynamically resolve database relation mapping for {} -> {} on property {}",
+              parent_type.name, r#type.name, prop
+            )
+          })?;
+
+        let source_col = &relation.source_columns[0];
+        let dest_col = &relation.destination_columns[0];
+
+        if let Some(pta) = &node.parent_type_aliases {
+          let p_search_type = if is_parent_source {
+            &relation.source_type
+          } else {
+            &relation.destination_type
+          };
+          if let Some(a) = pta.get(p_search_type) {
+            parent_relation_alias = a.clone();
           }
-      build_args.push(format!("'{}', {}", k, child_sql));
         }
-    let combined = format!("jsonb_build_object({})", build_args.join(", "));
+
-    Ok((combined, "object".to_string()))
+        let c_search_type = if is_parent_source {
+          &relation.destination_type
+        } else {
+          &relation.source_type
+        };
+        if let Some(a) = type_aliases.get(c_search_type) {
+          child_relation_alias = a.clone();
+        }
+
+        let sql_string = if is_parent_source {
+          format!(
+            "{}.{} = {}.{}",
+            parent_relation_alias, source_col, child_relation_alias, dest_col
+          )
+        } else {
+          format!(
+            "{}.{} = {}.{}",
+            child_relation_alias, source_col, parent_relation_alias, dest_col
+          )
+        };
+        where_clauses.push(sql_string);
+      }
+    }
+    Ok(())
+  }
+
+  fn get_merged_properties(
+    &self,
+    schema: &crate::database::schema::Schema,
+  ) -> std::collections::BTreeMap<String, Arc<crate::database::schema::Schema>> {
+    let mut props = std::collections::BTreeMap::new();
+
+    if let Some(ref_id) = &schema.obj.r#ref {
+      if let Some(parent_schema) = self.db.schemas.get(ref_id) {
+        props.extend(self.get_merged_properties(parent_schema));
+      }
+    }
+
+    if let Some(local_props) = &schema.obj.properties {
+      for (k, v) in local_props {
+        props.insert(k.clone(), v.clone());
+      }
+    }
+
+    props
   }
 }

src/queryer/mod.rs

@@ -32,9 +32,12 @@ impl Queryer {
       Err(msg) => {
         return crate::drop::Drop::with_errors(vec![crate::drop::Error {
           code: "FILTER_PARSE_FAILED".to_string(),
-          message: msg,
+          message: msg.clone(),
           details: crate::drop::ErrorDetails {
-            path: schema_id.to_string(),
+            path: "".to_string(), // filters apply to the root query
+            cause: Some(msg),
+            context: filters.map(|f| vec![f.to_string()]),
+            schema: Some(schema_id.to_string()),
           },
         }]);
       }
@@ -94,7 +97,13 @@ impl Queryer {
       return Ok(cached_sql.value().clone());
     }
 
-    let compiler = compiler::SqlCompiler::new(self.db.clone());
+    let compiler = compiler::Compiler {
+      db: &self.db,
+      filter_keys: filter_keys,
+      is_stem_query: stem_opt.is_some(),
+      alias_counter: 0,
+    };
+
     match compiler.compile(schema_id, stem_opt, filter_keys) {
       Ok(compiled_sql) => {
         self
@@ -104,9 +113,12 @@ impl Queryer {
       }
       Err(e) => Err(crate::drop::Drop::with_errors(vec![crate::drop::Error {
         code: "QUERY_COMPILATION_FAILED".to_string(),
-        message: e,
+        message: e.clone(),
         details: crate::drop::ErrorDetails {
-          path: schema_id.to_string(),
+          path: "".to_string(),
+          cause: Some(e),
+          context: None,
+          schema: Some(schema_id.to_string()),
         },
       }])),
     }
@@ -130,14 +142,20 @@ impl Queryer {
         code: "QUERY_FAILED".to_string(),
         message: format!("Expected array from generic query, got: {:?}", other),
         details: crate::drop::ErrorDetails {
-          path: schema_id.to_string(),
+          path: "".to_string(),
+          cause: Some(format!("Expected array, got {}", other)),
+          context: Some(vec![sql.to_string()]),
+          schema: Some(schema_id.to_string()),
         },
       }]),
       Err(e) => crate::drop::Drop::with_errors(vec![crate::drop::Error {
         code: "QUERY_FAILED".to_string(),
         message: format!("SPI error in queryer: {}", e),
         details: crate::drop::ErrorDetails {
-          path: schema_id.to_string(),
+          path: "".to_string(),
+          cause: Some(format!("SPI error in queryer: {}", e)),
+          context: Some(vec![sql.to_string()]),
+          schema: Some(schema_id.to_string()),
         },
       }]),
     }

src/tests/fixtures.rs

@@ -1469,6 +1469,12 @@ fn test_queryer_0_9() {
     crate::tests::runner::run_test_case(&path, 0, 9).unwrap();
 }
 
+#[test]
+fn test_queryer_0_10() {
+    let path = format!("{}/fixtures/queryer.json", env!("CARGO_MANIFEST_DIR"));
+    crate::tests::runner::run_test_case(&path, 0, 10).unwrap();
+}
+
 #[test]
 fn test_not_0_0() {
     let path = format!("{}/fixtures/not.json", env!("CARGO_MANIFEST_DIR"));

src/tests/mod.rs

@@ -49,6 +49,25 @@ fn test_library_api() {
     })
   );
 
+  // 3. Validate jspg_schemas
+  let schemas_drop = jspg_schemas();
+  assert_eq!(
+    schemas_drop.0,
+    json!({
+        "type": "drop",
+        "response": {
+            "test_schema": {
+                "$id": "test_schema",
+                "type": "object",
+                "properties": {
+                    "name": { "type": "string" }
+                },
+                "required": ["name"]
+            }
+        }
+    })
+  );
+
   // 4. Validate Happy Path
   let happy_drop = jspg_validate("test_schema", JsonB(json!({"name": "Neo"})));
   assert_eq!(

src/tests/runner.rs

@@ -1,19 +1,10 @@
+use crate::tests::types::Suite;
 use serde::Deserialize;
+use serde_json::Value;
 use std::collections::HashMap;
 use std::fs;
 use std::sync::{Arc, OnceLock, RwLock};
 
-#[derive(Debug, Deserialize)]
-pub struct TestSuite {
-  #[allow(dead_code)]
-  pub description: String,
-  pub database: serde_json::Value,
-  pub tests: Vec<TestCase>,
-}
-
-use crate::tests::types::TestCase;
-use serde_json::Value;
-
 pub fn deserialize_some<'de, D>(deserializer: D) -> Result<Option<Value>, D::Error>
 where
   D: serde::Deserializer<'de>,
@@ -23,7 +14,7 @@ where
 }
 
 // Type alias for easier reading
-type CompiledSuite = Arc<Vec<(TestSuite, Arc<crate::database::Database>)>>;
+type CompiledSuite = Arc<Vec<(Suite, Arc<crate::database::Database>)>>;
 
 // Global cache mapping filename -> Vector of (Parsed JSON suite, Compiled Database)
 static CACHE: OnceLock<RwLock<HashMap<String, CompiledSuite>>> = OnceLock::new();
@@ -46,7 +37,7 @@ fn get_cached_file(path: &str) -> CompiledSuite {
       } else {
         let content =
           fs::read_to_string(path).unwrap_or_else(|_| panic!("Failed to read file: {}", path));
-        let suites: Vec<TestSuite> = serde_json::from_str(&content)
+        let suites: Vec<Suite> = serde_json::from_str(&content)
           .unwrap_or_else(|e| panic!("Failed to parse JSON in {}: {}", path, e));
 
         let mut compiled_suites = Vec::new();

src/tests/types/case.rs

@@ -1,11 +1,11 @@
-use super::expect::ExpectBlock;
+use super::expect::Expect;
 use crate::database::Database;
 use serde::Deserialize;
 use serde_json::Value;
 use std::sync::Arc;
 
 #[derive(Debug, Deserialize)]
-pub struct TestCase {
+pub struct Case {
   pub description: String,
 
   #[serde(default = "default_action")]
@@ -30,14 +30,14 @@ pub struct TestCase {
   #[serde(default)]
   pub mocks: Option<serde_json::Value>,
 
-  pub expect: Option<ExpectBlock>,
+  pub expect: Option<Expect>,
 }
 
 fn default_action() -> String {
   "validate".to_string()
 }
 
-impl TestCase {
+impl Case {
   pub fn run_compile(&self, db: Arc<Database>) -> Result<(), String> {
     let expected_success = self.expect.as_ref().map(|e| e.success).unwrap_or(false);
 
@@ -138,6 +138,7 @@ impl TestCase {
       ))
     } else if let Some(expect) = &self.expect {
       let queries = db.executor.get_queries();
+      expect.assert_pattern(&queries)?;
       expect.assert_sql(&queries)
     } else {
       Ok(())
@@ -176,6 +177,7 @@ impl TestCase {
       ))
     } else if let Some(expect) = &self.expect {
       let queries = db.executor.get_queries();
+      expect.assert_pattern(&queries)?;
       expect.assert_sql(&queries)
     } else {
       Ok(())

src/tests/types/expect/mod.rs

@@ -0,0 +1,22 @@
+pub mod pattern;
+pub mod sql;
+
+use serde::Deserialize;
+use std::collections::HashMap;
+
+#[derive(Debug, Deserialize)]
+#[serde(untagged)]
+pub enum SqlExpectation {
+  Single(String),
+  Multi(Vec<String>),
+}
+
+#[derive(Debug, Deserialize)]
+pub struct Expect {
+  pub success: bool,
+  pub result: Option<serde_json::Value>,
+  pub errors: Option<Vec<serde_json::Value>>,
+  pub stems: Option<HashMap<String, HashMap<String, serde_json::Value>>>,
+  #[serde(default)]
+  pub sql: Option<Vec<SqlExpectation>>,
+}

src/tests/types/expect/pattern.rs

@@ -1,30 +1,13 @@
+use super::Expect;
 use regex::Regex;
-use serde::Deserialize;
 use std::collections::HashMap;
 
-#[derive(Debug, Deserialize)]
+impl Expect {
-#[serde(untagged)]
-pub enum SqlExpectation {
-  Single(String),
-  Multi(Vec<String>),
-}
-
-#[derive(Debug, Deserialize)]
-pub struct ExpectBlock {
-  pub success: bool,
-  pub result: Option<serde_json::Value>,
-  pub errors: Option<Vec<serde_json::Value>>,
-  pub stems: Option<HashMap<String, HashMap<String, serde_json::Value>>>,
-  #[serde(default)]
-  pub sql: Option<Vec<SqlExpectation>>,
-}
-
-impl ExpectBlock {
   /// 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_sql(&self, actual: &[String]) -> Result<(), String> {
+  pub fn assert_pattern(&self, actual: &[String]) -> Result<(), String> {
     let patterns = match &self.sql {
       Some(s) => s,
       None => return Ok(()),
@@ -76,8 +59,8 @@ impl ExpectBlock {
       let aline = clean_str(aline_raw);
 
       let pattern_str_raw = match pattern_expect {
-        SqlExpectation::Single(s) => s.clone(),
+        super::SqlExpectation::Single(s) => s.clone(),
-        SqlExpectation::Multi(m) => m.join(" "),
+        super::SqlExpectation::Multi(m) => m.join(" "),
       };
 
       let pattern_str = clean_str(&pattern_str_raw);

src/tests/types/expect/sql.rs

@@ -0,0 +1,206 @@
+use super::Expect;
+use sqlparser::ast::{Expr, Query, SelectItem, Statement, TableFactor};
+use sqlparser::dialect::PostgreSqlDialect;
+use sqlparser::parser::Parser;
+use std::collections::HashSet;
+
+impl Expect {
+  pub fn assert_sql(&self, actual: &[String]) -> Result<(), String> {
+    for query in actual {
+      if let Err(e) = Self::validate_semantic_sql(query) {
+        return Err(e);
+      }
+    }
+    Ok(())
+  }
+
+  pub fn validate_semantic_sql(sql: &str) -> Result<(), String> {
+    let dialect = PostgreSqlDialect {};
+    let statements = match Parser::parse_sql(&dialect, sql) {
+      Ok(s) => s,
+      Err(e) => return Err(format!("SQL Syntax Error: {}\nSQL: {}", e, sql)),
+    };
+
+    for statement in statements {
+      Self::validate_statement(&statement, sql)?;
+    }
+
+    Ok(())
+  }
+
+  fn validate_statement(stmt: &Statement, original_sql: &str) -> Result<(), String> {
+    match stmt {
+      Statement::Query(query) => Self::validate_query(query, &HashSet::new(), original_sql)?,
+      Statement::Insert(insert) => {
+        if let Some(query) = &insert.source {
+          Self::validate_query(query, &HashSet::new(), original_sql)?
+        }
+      }
+      Statement::Update(update) => {
+        if let Some(expr) = &update.selection {
+          Self::validate_expr(expr, &HashSet::new(), original_sql)?;
+        }
+      }
+      Statement::Delete(delete) => {
+        if let Some(expr) = &delete.selection {
+          Self::validate_expr(expr, &HashSet::new(), original_sql)?;
+        }
+      }
+      _ => {}
+    }
+    Ok(())
+  }
+
+  fn validate_query(
+    query: &Query,
+    available_aliases: &HashSet<String>,
+    original_sql: &str,
+  ) -> Result<(), String> {
+    if let sqlparser::ast::SetExpr::Select(select) = &*query.body {
+      Self::validate_select(&select, available_aliases, original_sql)?;
+    }
+    Ok(())
+  }
+
+  fn validate_select(
+    select: &sqlparser::ast::Select,
+    parent_aliases: &HashSet<String>,
+    original_sql: &str,
+  ) -> Result<(), String> {
+    let mut available_aliases = parent_aliases.clone();
+
+    // 1. Collect all declared table aliases in the FROM clause and JOINs
+    for table_with_joins in &select.from {
+      Self::collect_aliases_from_table_factor(&table_with_joins.relation, &mut available_aliases);
+      for join in &table_with_joins.joins {
+        Self::collect_aliases_from_table_factor(&join.relation, &mut available_aliases);
+      }
+    }
+
+    // 2. Validate all SELECT projection fields
+    for projection in &select.projection {
+      if let SelectItem::UnnamedExpr(expr) | SelectItem::ExprWithAlias { expr, .. } = projection {
+        Self::validate_expr(expr, &available_aliases, original_sql)?;
+      }
+    }
+
+    // 3. Validate ON conditions in joins
+    for table_with_joins in &select.from {
+      for join in &table_with_joins.joins {
+        if let sqlparser::ast::JoinOperator::Inner(sqlparser::ast::JoinConstraint::On(expr))
+        | sqlparser::ast::JoinOperator::LeftOuter(sqlparser::ast::JoinConstraint::On(expr))
+        | sqlparser::ast::JoinOperator::RightOuter(sqlparser::ast::JoinConstraint::On(expr))
+        | sqlparser::ast::JoinOperator::FullOuter(sqlparser::ast::JoinConstraint::On(expr))
+        | sqlparser::ast::JoinOperator::Join(sqlparser::ast::JoinConstraint::On(expr)) =
+          &join.join_operator
+        {
+          Self::validate_expr(expr, &available_aliases, original_sql)?;
+        }
+      }
+    }
+
+    // 4. Validate WHERE conditions
+    if let Some(selection) = &select.selection {
+      Self::validate_expr(selection, &available_aliases, original_sql)?;
+    }
+
+    Ok(())
+  }
+
+  fn collect_aliases_from_table_factor(tf: &TableFactor, aliases: &mut HashSet<String>) {
+    match tf {
+      TableFactor::Table { name, alias, .. } => {
+        if let Some(table_alias) = alias {
+          aliases.insert(table_alias.name.value.clone());
+        } else if let Some(last) = name.0.last() {
+          match last {
+            sqlparser::ast::ObjectNamePart::Identifier(i) => {
+              aliases.insert(i.value.clone());
+            }
+            _ => {}
+          }
+        }
+      }
+      TableFactor::Derived {
+        subquery,
+        alias: Some(table_alias),
+        ..
+      } => {
+        aliases.insert(table_alias.name.value.clone());
+        // A derived table is technically a nested scope which is opaque outside, but for pure semantic checks
+        // its internal contents should be validated purely within its own scope (not leaking external aliases in, usually)
+        // but Postgres allows lateral correlation. We will validate its interior with an empty scope.
+        let _ = Self::validate_query(subquery, &HashSet::new(), "");
+      }
+      _ => {}
+    }
+  }
+
+  fn validate_expr(
+    expr: &Expr,
+    available_aliases: &HashSet<String>,
+    sql: &str,
+  ) -> Result<(), String> {
+    match expr {
+      Expr::CompoundIdentifier(idents) => {
+        if idents.len() == 2 {
+          let alias = &idents[0].value;
+          if !available_aliases.is_empty() && !available_aliases.contains(alias) {
+            return Err(format!(
+              "Semantic Error: Orchestrated query referenced table alias '{}' but it was not declared in the query's FROM/JOIN clauses.\nAvailable aliases: {:?}\nSQL: {}",
+              alias, available_aliases, sql
+            ));
+          }
+        } else if idents.len() > 2 {
+          let alias = &idents[1].value; // In form schema.table.column, 'table' is idents[1]
+          if !available_aliases.is_empty() && !available_aliases.contains(alias) {
+            return Err(format!(
+              "Semantic Error: Orchestrated query referenced table '{}' but it was not mapped.\nAvailable aliases: {:?}\nSQL: {}",
+              alias, available_aliases, sql
+            ));
+          }
+        }
+      }
+      Expr::Subquery(subquery) => Self::validate_query(subquery, available_aliases, sql)?,
+      Expr::Exists { subquery, .. } => Self::validate_query(subquery, available_aliases, sql)?,
+      Expr::InSubquery {
+        expr: e, subquery, ..
+      } => {
+        Self::validate_expr(e, available_aliases, sql)?;
+        Self::validate_query(subquery, available_aliases, sql)?;
+      }
+      Expr::BinaryOp { left, right, .. } => {
+        Self::validate_expr(left, available_aliases, sql)?;
+        Self::validate_expr(right, available_aliases, sql)?;
+      }
+      Expr::IsFalse(e)
+      | Expr::IsNotFalse(e)
+      | Expr::IsTrue(e)
+      | Expr::IsNotTrue(e)
+      | Expr::IsNull(e)
+      | Expr::IsNotNull(e)
+      | Expr::InList { expr: e, .. }
+      | Expr::Nested(e)
+      | Expr::UnaryOp { expr: e, .. }
+      | Expr::Cast { expr: e, .. }
+      | Expr::Like { expr: e, .. }
+      | Expr::ILike { expr: e, .. }
+      | Expr::AnyOp { left: e, .. }
+      | Expr::AllOp { left: e, .. } => {
+        Self::validate_expr(e, available_aliases, sql)?;
+      }
+      Expr::Function(func) => {
+        if let sqlparser::ast::FunctionArguments::List(args) = &func.args {
+          if let Some(sqlparser::ast::FunctionArg::Unnamed(
+            sqlparser::ast::FunctionArgExpr::Expr(e),
+          )) = args.args.get(0)
+          {
+            Self::validate_expr(e, available_aliases, sql)?;
+          }
+        }
+      }
+      _ => {}
+    }
+    Ok(())
+  }
+}

src/tests/types/mod.rs

@@ -2,6 +2,6 @@ pub mod case;
 pub mod expect;
 pub mod suite;
 
-pub use case::TestCase;
+pub use case::Case;
-pub use expect::ExpectBlock;
+pub use expect::Expect;
-pub use suite::TestSuite;
+pub use suite::Suite;

src/tests/types/suite.rs

@@ -1,10 +1,10 @@
-use super::case::TestCase;
+use super::case::Case;
 use serde::Deserialize;
 
 #[derive(Debug, Deserialize)]
-pub struct TestSuite {
+pub struct Suite {
   #[allow(dead_code)]
   pub description: String,
   pub database: serde_json::Value,
-  pub tests: Vec<TestCase>,
+  pub tests: Vec<Case>,
 }

src/validator/mod.rs

@@ -67,7 +67,12 @@ impl Validator {
               .map(|e| crate::drop::Error {
                 code: e.code,
                 message: e.message,
-                details: crate::drop::ErrorDetails { path: e.path },
+                details: crate::drop::ErrorDetails {
+                  path: e.path,
+                  cause: None,
+                  context: None,
+                  schema: None,
+                },
               })
               .collect();
             crate::drop::Drop::with_errors(errors)
@@ -76,7 +81,12 @@ impl Validator {
         Err(e) => crate::drop::Drop::with_errors(vec![crate::drop::Error {
           code: e.code,
           message: e.message,
-          details: crate::drop::ErrorDetails { path: e.path },
+          details: crate::drop::ErrorDetails {
+            path: e.path,
+            cause: None,
+            context: None,
+            schema: None,
+          },
         }]),
       }
     } else {
@@ -84,7 +94,10 @@ impl Validator {
         code: "SCHEMA_NOT_FOUND".to_string(),
         message: format!("Schema {} not found", schema_id),
         details: crate::drop::ErrorDetails {
-          path: "".to_string(),
+          path: "/".to_string(),
+          cause: None,
+          context: None,
+          schema: None,
         },
       }])
     }

version

@@ -1 +1 @@
-1.0.59
+1.0.74