version: 1.0.193

fixed volatile issues with merge
version: 1.0.192
2026-08-03 19:09:54 -04:00 · 2026-08-03 19:09:46 -04:00 · 2026-08-03 18:59:16 -04:00 · 2026-08-03 18:57:08 -04:00 · 2026-08-03 16:40:36 -04:00 · 2026-08-03 16:40:26 -04:00
14 changed files with 523 additions and 205 deletions
--- a/fixtures/database.json
+++ b/fixtures/database.json
@ -1027,16 +1027,31 @@
          "name": "user",
          "module": "test",
          "source": "test",
-          "hierarchy": ["user"],
-          "variations": ["user"],
-          "fields": ["id", "email"],
-          "lookup_fields": ["email"],
+          "hierarchy": [
+            "user"
+          ],
+          "variations": [
+            "user"
+          ],
+          "fields": [
+            "id",
+            "email"
+          ],
+          "lookup_fields": [
+            "email"
+          ],
          "schemas": {
            "user": {
              "type": "object",
              "properties": {
-                "id": { "type": "string", "format": "uuid" },
-                "email": { "type": "string", "format": "email" }
+                "id": {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                "email": {
+                  "type": "string",
+                  "format": "email"
+                }
              }
            }
          }
@ -1072,7 +1087,9 @@
      "indexes": [
        {
          "table": "user",
-          "columns": ["email"]
+          "columns": [
+            "email"
+          ]
        }
      ],
      "types": [
@ -1082,16 +1099,31 @@
          "name": "user",
          "module": "test",
          "source": "test",
-          "hierarchy": ["user"],
-          "variations": ["user"],
-          "fields": ["id", "email"],
-          "lookup_fields": ["email"],
+          "hierarchy": [
+            "user"
+          ],
+          "variations": [
+            "user"
+          ],
+          "fields": [
+            "id",
+            "email"
+          ],
+          "lookup_fields": [
+            "email"
+          ],
          "schemas": {
            "user": {
              "type": "object",
              "properties": {
-                "id": { "type": "string", "format": "uuid" },
-                "email": { "type": "string", "format": "email" }
+                "id": {
+                  "type": "string",
+                  "format": "uuid"
+                },
+                "email": {
+                  "type": "string",
+                  "format": "email"
+                }
              }
            }
          }
--- a/fixtures/merger.json
+++ b/fixtures/merger.json
@ -120,11 +120,18 @@
      "indexes": [
        {
          "table": "person",
-          "columns": ["first_name", "last_name", "date_of_birth", "pronouns"]
+          "columns": [
+            "first_name",
+            "last_name",
+            "date_of_birth",
+            "pronouns"
+          ]
        },
        {
          "table": "user",
-          "columns": ["name"]
+          "columns": [
+            "name"
+          ]
        }
      ],
      "types": [
@ -1206,7 +1213,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"organization\" (",
@ -1216,7 +1224,8 @@
              "VALUES (",
              "  '{{uuid:generated_0}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"organization\".*)"
            ],
            [
              "INSERT INTO agreego.\"user\" (",
@ -1226,7 +1235,8 @@
              "VALUES (",
              "  '{{uuid:generated_0}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"user\".*)"
            ],
            [
              "INSERT INTO agreego.\"person\" (",
@ -1240,7 +1250,8 @@
              "  '{{uuid:generated_0}}',",
              "  'IncompleteLast',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"person\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -1316,7 +1327,7 @@
          "success": true,
          "sql": [
            [
-              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
+              "(SELECT COALESCE(to_jsonb(t1.*), '{}') || COALESCE(to_jsonb(t2.*), '{}') || COALESCE(to_jsonb(t3.*), '{}') || COALESCE(to_jsonb(t4.*), '{}')",
              "FROM agreego.\"entity\" t1",
              "LEFT JOIN agreego.\"organization\" t2 ON t2.id = t1.id",
              "LEFT JOIN agreego.\"user\" t3 ON t3.id = t1.id",
@ -1343,7 +1354,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"organization\" (",
@ -1353,7 +1365,8 @@
              "VALUES (",
              "  '{{uuid:generated_0}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"organization\".*)"
            ],
            [
              "INSERT INTO agreego.\"user\" (",
@ -1363,7 +1376,8 @@
              "VALUES (",
              "  '{{uuid:generated_0}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"user\".*)"
            ],
            [
              "INSERT INTO agreego.\"person\" (",
@ -1383,7 +1397,8 @@
              "  'LookupLast',",
              "  'they/them',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"person\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -1469,14 +1484,14 @@
          "success": true,
          "sql": [
            [
-              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
+              "(SELECT COALESCE(to_jsonb(t1.*), '{}') || COALESCE(to_jsonb(t2.*), '{}') || COALESCE(to_jsonb(t3.*), '{}') || COALESCE(to_jsonb(t4.*), '{}')",
              "FROM agreego.\"entity\" t1",
              "LEFT JOIN agreego.\"organization\" t2 ON t2.id = t1.id",
              "LEFT JOIN agreego.\"user\" t3 ON t3.id = t1.id",
              "LEFT JOIN agreego.\"person\" t4 ON t4.id = t1.id",
              "WHERE",
              "  t1.id = '{{uuid:data.id}}'",
-              "UNION SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
+              "UNION SELECT COALESCE(to_jsonb(t1.*), '{}') || COALESCE(to_jsonb(t2.*), '{}') || COALESCE(to_jsonb(t3.*), '{}') || COALESCE(to_jsonb(t4.*), '{}')",
              "FROM agreego.\"entity\" t1",
              "LEFT JOIN agreego.\"organization\" t2 ON t2.id = t1.id",
              "LEFT JOIN agreego.\"user\" t3 ON t3.id = t1.id",
@ -1503,7 +1518,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"organization\" (",
@ -1513,7 +1529,8 @@
              "VALUES (",
              "  '{{uuid:data.id}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"organization\".*)"
            ],
            [
              "INSERT INTO agreego.\"user\" (",
@ -1523,7 +1540,8 @@
              "VALUES (",
              "  '{{uuid:data.id}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"user\".*)"
            ],
            [
              "INSERT INTO agreego.\"person\" (",
@ -1543,7 +1561,8 @@
              "  'LookupLast',",
              "  'they/them',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"person\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -1631,14 +1650,14 @@
          "success": true,
          "sql": [
            [
-              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
+              "(SELECT COALESCE(to_jsonb(t1.*), '{}') || COALESCE(to_jsonb(t2.*), '{}') || COALESCE(to_jsonb(t3.*), '{}') || COALESCE(to_jsonb(t4.*), '{}')",
              "FROM agreego.\"entity\" t1",
              "LEFT JOIN agreego.\"organization\" t2 ON t2.id = t1.id",
              "LEFT JOIN agreego.\"user\" t3 ON t3.id = t1.id",
              "LEFT JOIN agreego.\"person\" t4 ON t4.id = t1.id",
              "WHERE",
              "  t1.id = '{{uuid:data.id}}'",
-              "UNION SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
+              "UNION SELECT COALESCE(to_jsonb(t1.*), '{}') || COALESCE(to_jsonb(t2.*), '{}') || COALESCE(to_jsonb(t3.*), '{}') || COALESCE(to_jsonb(t4.*), '{}')",
              "FROM agreego.\"entity\" t1",
              "LEFT JOIN agreego.\"organization\" t2 ON t2.id = t1.id",
              "LEFT JOIN agreego.\"user\" t3 ON t3.id = t1.id",
@ -1648,7 +1667,7 @@
              "  AND \"last_name\" = 'LookupLast'",
              "  AND \"date_of_birth\" = '{{timestamp}}'",
              "  AND \"pronouns\" = 'they/them')",
-              "UNION SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
+              "UNION SELECT COALESCE(to_jsonb(t1.*), '{}') || COALESCE(to_jsonb(t2.*), '{}') || COALESCE(to_jsonb(t3.*), '{}') || COALESCE(to_jsonb(t4.*), '{}')",
              "FROM agreego.\"entity\" t1",
              "LEFT JOIN agreego.\"organization\" t2 ON t2.id = t1.id",
              "LEFT JOIN agreego.\"user\" t3 ON t3.id = t1.id",
@ -1672,7 +1691,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"organization\" (",
@ -1684,7 +1704,8 @@
              "  '{{uuid:data.id}}',",
              "  'LookupName',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"organization\".*)"
            ],
            [
              "INSERT INTO agreego.\"user\" (",
@ -1694,7 +1715,8 @@
              "VALUES (",
              "  '{{uuid:data.id}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"user\".*)"
            ],
            [
              "INSERT INTO agreego.\"person\" (",
@ -1714,7 +1736,8 @@
              "  'LookupLast',",
              "  'they/them',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"person\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -1802,14 +1825,14 @@
          "success": true,
          "sql": [
            [
-              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
+              "(SELECT COALESCE(to_jsonb(t1.*), '{}') || COALESCE(to_jsonb(t2.*), '{}') || COALESCE(to_jsonb(t3.*), '{}') || COALESCE(to_jsonb(t4.*), '{}')",
              "FROM agreego.\"entity\" t1",
              "LEFT JOIN agreego.\"organization\" t2 ON t2.id = t1.id",
              "LEFT JOIN agreego.\"user\" t3 ON t3.id = t1.id",
              "LEFT JOIN agreego.\"person\" t4 ON t4.id = t1.id",
              "WHERE",
              "  t1.id = '{{uuid:data.id}}'",
-              "UNION SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
+              "UNION SELECT COALESCE(to_jsonb(t1.*), '{}') || COALESCE(to_jsonb(t2.*), '{}') || COALESCE(to_jsonb(t3.*), '{}') || COALESCE(to_jsonb(t4.*), '{}')",
              "FROM agreego.\"entity\" t1",
              "LEFT JOIN agreego.\"organization\" t2 ON t2.id = t1.id",
              "LEFT JOIN agreego.\"user\" t3 ON t3.id = t1.id",
@ -1836,7 +1859,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"organization\" (",
@ -1846,7 +1870,8 @@
              "VALUES (",
              "  '{{uuid:data.id}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"organization\".*)"
            ],
            [
              "INSERT INTO agreego.\"user\" (",
@ -1856,7 +1881,8 @@
              "VALUES (",
              "  '{{uuid:data.id}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"user\".*)"
            ],
            [
              "INSERT INTO agreego.\"person\" (",
@ -1874,7 +1900,8 @@
              "  'LookupLast',",
              "  'they/them',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"person\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -1951,7 +1978,7 @@
          "success": true,
          "sql": [
            [
-              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
+              "(SELECT COALESCE(to_jsonb(t1.*), '{}') || COALESCE(to_jsonb(t2.*), '{}') || COALESCE(to_jsonb(t3.*), '{}') || COALESCE(to_jsonb(t4.*), '{}')",
              "FROM agreego.\"entity\" t1",
              "LEFT JOIN agreego.\"organization\" t2 ON t2.id = t1.id",
              "LEFT JOIN agreego.\"user\" t3 ON t3.id = t1.id",
@ -1975,7 +2002,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"organization\" (",
@ -1985,7 +2013,8 @@
              "VALUES (",
              "  '{{uuid:mocks.0.id}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"organization\".*)"
            ],
            [
              "INSERT INTO agreego.\"user\" (",
@ -1995,7 +2024,8 @@
              "VALUES (",
              "  '{{uuid:mocks.0.id}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"user\".*)"
            ],
            [
              "INSERT INTO agreego.\"person\" (",
@ -2009,7 +2039,8 @@
              "  '{{uuid:mocks.0.id}}',",
              "  'NewLast',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"person\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -2074,7 +2105,7 @@
          "success": true,
          "sql": [
            [
-              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
+              "(SELECT COALESCE(to_jsonb(t1.*), '{}') || COALESCE(to_jsonb(t2.*), '{}') || COALESCE(to_jsonb(t3.*), '{}') || COALESCE(to_jsonb(t4.*), '{}')",
              "FROM agreego.\"entity\" t1",
              "LEFT JOIN agreego.\"organization\" t2 ON t2.id = t1.id",
              "LEFT JOIN agreego.\"user\" t3 ON t3.id = t1.id",
@ -2098,7 +2129,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"organization\" (",
@ -2108,7 +2140,8 @@
              "VALUES (",
              "  '123',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"organization\".*)"
            ],
            [
              "INSERT INTO agreego.\"user\" (",
@ -2118,7 +2151,8 @@
              "VALUES (",
              "  '123',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"user\".*)"
            ],
            [
              "INSERT INTO agreego.\"person\" (",
@ -2136,7 +2170,8 @@
              "  'Doe',",
              "  NULL,",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"person\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -2226,7 +2261,8 @@
              "  '00000000-0000-0000-0000-000000000000',",
              "  '{{uuid:generated_1}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"organization\" (",
@ -2236,7 +2272,8 @@
              "VALUES (",
              "  '{{uuid:generated_0}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"organization\".*)"
            ],
            [
              "INSERT INTO agreego.\"user\" (",
@ -2246,7 +2283,8 @@
              "VALUES (",
              "  '{{uuid:generated_0}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"user\".*)"
            ],
            [
              "INSERT INTO agreego.\"person\" (",
@ -2262,7 +2300,8 @@
              "  '{{uuid:generated_0}}',",
              "  'Smith',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"person\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -2306,7 +2345,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'order'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"order\" (",
@ -2320,7 +2360,8 @@
              "  '{{uuid:generated_3}}',",
              "  100,",
              "  'order'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"order\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -2413,7 +2454,7 @@
          "success": true,
          "sql": [
            [
-              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*)",
+              "(SELECT COALESCE(to_jsonb(t1.*), '{}') || COALESCE(to_jsonb(t2.*), '{}')",
              "FROM agreego.\"entity\" t1",
              "LEFT JOIN agreego.\"order\" t2 ON t2.id = t1.id",
              "WHERE",
@ -2435,7 +2476,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'order'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"order\" (",
@ -2447,7 +2489,8 @@
              "  'abc',",
              "  99,",
              "  'order'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"order\".*)"
            ],
            [
              "INSERT INTO agreego.\"entity\" (",
@ -2465,7 +2508,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'order_line'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"order_line\" (",
@ -2481,7 +2525,8 @@
              "  99,",
              "  'Widget',",
              "  'order_line'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"order_line\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -2630,7 +2675,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"organization\" (",
@ -2640,7 +2686,8 @@
              "VALUES (",
              "  '{{uuid:generated_0}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"organization\".*)"
            ],
            [
              "INSERT INTO agreego.\"user\" (",
@ -2650,7 +2697,8 @@
              "VALUES (",
              "  '{{uuid:generated_0}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"user\".*)"
            ],
            [
              "INSERT INTO agreego.\"person\" (",
@ -2664,7 +2712,8 @@
              "  '{{uuid:generated_0}}',",
              "  'Test',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"person\".*)"
            ],
            [
              "INSERT INTO agreego.\"entity\" (",
@ -2682,7 +2731,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'phone_number'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"phone_number\" (",
@ -2690,7 +2740,8 @@
              ")",
              "VALUES (",
              "  '555-0001'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"phone_number\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -2731,7 +2782,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'contact'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"relationship\" (",
@ -2745,7 +2797,8 @@
              "  'person',",
              "  '{{uuid:generated_1}}',",
              "  'phone_number'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"relationship\".*)"
            ],
            [
              "INSERT INTO agreego.\"contact\" (",
@ -2753,7 +2806,8 @@
              ")",
              "VALUES (",
              "  true",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"contact\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -2798,7 +2852,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'email_address'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"email_address\" (",
@ -2806,7 +2861,8 @@
              ")",
              "VALUES (",
              "  'test@example.com'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"email_address\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -2847,7 +2903,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'contact'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"relationship\" (",
@ -2861,7 +2918,8 @@
              "  'person',",
              "  '{{uuid:generated_5}}',",
              "  'email_address'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"relationship\".*)"
            ],
            [
              "INSERT INTO agreego.\"contact\" (",
@ -2869,7 +2927,8 @@
              ")",
              "VALUES (",
              "  false",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"contact\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -2914,7 +2973,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'email_address'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"email_address\" (",
@ -2922,7 +2982,8 @@
              ")",
              "VALUES (",
              "  'test2@example.com'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"email_address\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -2963,7 +3024,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'contact'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"relationship\" (",
@ -2977,7 +3039,8 @@
              "  'person',",
              "  '{{uuid:generated_9}}',",
              "  'email_address'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"relationship\".*)"
            ],
            [
              "INSERT INTO agreego.\"contact\" (",
@ -2985,7 +3048,8 @@
              ")",
              "VALUES (",
              "  false",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"contact\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -3215,7 +3279,7 @@
          "success": true,
          "sql": [
            [
-              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
+              "(SELECT COALESCE(to_jsonb(t1.*), '{}') || COALESCE(to_jsonb(t2.*), '{}') || COALESCE(to_jsonb(t3.*), '{}') || COALESCE(to_jsonb(t4.*), '{}')",
              "FROM agreego.\"entity\" t1",
              "LEFT JOIN agreego.\"organization\" t2 ON t2.id = t1.id",
              "LEFT JOIN agreego.\"user\" t3 ON t3.id = t1.id",
@ -3241,7 +3305,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"organization\" (",
@ -3251,7 +3316,8 @@
              "VALUES (",
              "  'abc-archived',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"organization\".*)"
            ],
            [
              "INSERT INTO agreego.\"user\" (",
@ -3261,7 +3327,8 @@
              "VALUES (",
              "  'abc-archived',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"user\".*)"
            ],
            [
              "INSERT INTO agreego.\"person\" (",
@ -3271,7 +3338,8 @@
              "VALUES (",
              "  'abc-archived',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"person\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -3353,7 +3421,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'attachment'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"attachment\" (",
@ -3373,7 +3442,8 @@
              "  '{",
              "      \"type\": \"type_metadata\"",
              "  }'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"attachment\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -3480,7 +3550,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'order_line'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"order_line\" (",
@ -3496,7 +3567,8 @@
              "  99,",
              "  'Widget',",
              "  'order_line'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"order_line\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -3568,7 +3640,7 @@
          "success": true,
          "sql": [
            [
-              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*)",
+              "(SELECT COALESCE(to_jsonb(t1.*), '{}') || COALESCE(to_jsonb(t2.*), '{}')",
              "FROM agreego.\"entity\" t1",
              "LEFT JOIN agreego.\"order_line\" t2 ON t2.id = t1.id",
              "WHERE",
@ -3590,7 +3662,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'order_line'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"order_line\" (",
@ -3606,7 +3679,8 @@
              "  99,",
              "  'Widget',",
              "  'order_line'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"order_line\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -3692,7 +3766,7 @@
          "success": true,
          "sql": [
            [
-              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*)",
+              "(SELECT COALESCE(to_jsonb(t1.*), '{}') || COALESCE(to_jsonb(t2.*), '{}')",
              "FROM agreego.\"entity\" t1",
              "LEFT JOIN agreego.\"invoice\" t2 ON t2.id = t1.id",
              "WHERE",
@ -3714,7 +3788,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'invoice'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"invoice\" (",
@ -3746,7 +3821,8 @@
              "  }',",
              "  200,",
              "  'invoice'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"invoice\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -3808,7 +3884,7 @@
          "success": true,
          "sql": [
            [
-              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*)",
+              "(SELECT COALESCE(to_jsonb(t1.*), '{}') || COALESCE(to_jsonb(t2.*), '{}')",
              "FROM agreego.\"entity\" t1",
              "LEFT JOIN agreego.\"account\" t2 ON t2.id = t1.id",
              "WHERE",
@ -3830,7 +3906,8 @@
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000',",
              "  'account'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"account\" (",
@ -3844,7 +3921,8 @@
              "  'checking',",
              "  '123456789',",
              "  'account'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"account\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -3936,7 +4014,8 @@
              "  '00000000-0000-0000-0000-000000000000',",
              "  '{{uuid:generated_1}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"organization\" (",
@ -3946,7 +4025,8 @@
              "VALUES (",
              "  '{{uuid:generated_0}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"organization\".*)"
            ],
            [
              "INSERT INTO agreego.\"user\" (",
@ -3956,7 +4036,8 @@
              "VALUES (",
              "  '{{uuid:generated_0}}',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"user\".*)"
            ],
            [
              "INSERT INTO agreego.\"person\" (",
@ -3970,7 +4051,8 @@
              "  '{{uuid:generated_0}}',",
              "  'Person',",
              "  'person'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"person\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -4015,7 +4097,8 @@
              "  '00000000-0000-0000-0000-000000000000',",
              "  'parent-org-id',",
              "  'order'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"order\" (",
@ -4027,7 +4110,8 @@
              "  '{{uuid:generated_0}}',",
              "  '{{uuid:generated_3}}',",
              "  'order'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"order\".*)"
            ],
            [
              "INSERT INTO agreego.\"entity\" (",
@ -4047,7 +4131,8 @@
              "  '00000000-0000-0000-0000-000000000000',",
              "  'parent-org-id',",
              "  'order_line'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"order_line\" (",
@ -4059,7 +4144,8 @@
              "  '{{uuid:generated_4}}',",
              "  '{{uuid:generated_3}}',",
              "  'order_line'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"order_line\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
@ -4103,7 +4189,8 @@
              "  '00000000-0000-0000-0000-000000000000',",
              "  'explicit-org-id',",
              "  'order_line'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"entity\".*)"
            ],
            [
              "INSERT INTO agreego.\"order_line\" (",
@ -4115,7 +4202,8 @@
              "  '{{uuid:generated_6}}',",
              "  '{{uuid:generated_3}}',",
              "  'order_line'",
-              ")"
+              ")",
+              "RETURNING to_jsonb(\"order_line\".*)"
            ],
            [
              "INSERT INTO agreego.change (",
--- a/fixtures/properties.json
+++ b/fixtures/properties.json
@ -888,7 +888,7 @@
                },
                "created_at": {
                  "type": "string",
-                  "immutable": true
+                  "immutable": "always"
                }
              }
            },
@ -899,7 +899,7 @@
                },
                "created_at": {
                  "type": "string",
-                  "immutable": true
+                  "immutable": "always"
                }
              }
            }
@ -945,5 +945,70 @@
        }
      }
    ]
+  },
+  {
+    "description": "immutable external vs always property validation",
+    "database": {
+      "types": [
+        {
+          "name": "invoice",
+          "schemas": {
+            "save_invoice.request": {
+              "properties": {
+                "id": {
+                  "type": "string"
+                },
+                "status": {
+                  "type": "string",
+                  "immutable": "external"
+                },
+                "created_at": {
+                  "type": "string",
+                  "immutable": "always"
+                }
+              }
+            }
+          }
+        }
+      ]
+    },
+    "tests": [
+      {
+        "description": "immutable external property in request context allowed when internal (punc.external = false)",
+        "data": {
+          "id": "123",
+          "status": "paid"
+        },
+        "schema_id": "save_invoice.request",
+        "action": "validate",
+        "expect": {
+          "success": true
+        }
+      },
+      {
+        "description": "immutable always property in request context rejected even when internal (punc.external = false)",
+        "data": {
+          "id": "123",
+          "created_at": "2026-07-21T00:00:00Z"
+        },
+        "schema_id": "save_invoice.request",
+        "action": "validate",
+        "expect": {
+          "success": false,
+          "errors": [
+            {
+              "code": "IMMUTABLE_PROPERTY_VIOLATION",
+              "values": {
+                "property_name": "created_at"
+              },
+              "details": {
+                "path": "created_at",
+                "schema": "save_invoice.request"
+              }
+            }
+          ]
+        }
+      }
+    ]
  }
 ]
--- a/fixtures/queryer.json
+++ b/fixtures/queryer.json
@ -1739,20 +1739,20 @@
              "    AND entity_1.created_at <= ($16 #>> '{}')::TIMESTAMPTZ",
              "    AND entity_1.created_at <> ($17 #>> '{}')::TIMESTAMPTZ",
              "    AND person_3.first_name ILIKE $18 #>> '{}'",
-              "    AND person_3.first_name > ($19 #>> '{)",
-              "      AND person_3.first_name >= ($20 #>> '{)",
-              "        AND person_3.first_name < ($21 #>> '{)",
-              "          AND person_3.first_name <= ($22 #>> '{)",
-              "            AND person_3.first_name NOT ILIKE $23 #>> '{}'",
-              "            AND person_3.first_name NOT IN (SELECT value FROM jsonb_array_elements_text(($24 #>> '{}')::jsonb))",
-              "            AND person_3.first_name IN (SELECT value FROM jsonb_array_elements_text(($25 #>> '{}')::jsonb))",
-              "            AND entity_1.id = ($26 #>> '{}')::UUID",
-              "            AND entity_1.id <> ($27 #>> '{}')::UUID",
-              "            AND entity_1.id NOT IN (SELECT value::UUID FROM jsonb_array_elements_text(($28 #>> '{}')::jsonb))",
-              "            AND entity_1.id IN (SELECT value::UUID FROM jsonb_array_elements_text(($29 #>> '{}')::jsonb))",
-              "            AND person_3.last_name ILIKE $30 #>> '{}'",
-              "            AND person_3.last_name NOT ILIKE $31 #>> '{}'",
-              "        ))))"
+              "    AND person_3.first_name > ($19 #>> '{}')",
+              "    AND person_3.first_name >= ($20 #>> '{}')",
+              "    AND person_3.first_name < ($21 #>> '{}')",
+              "    AND person_3.first_name <= ($22 #>> '{}')",
+              "    AND person_3.first_name NOT ILIKE $23 #>> '{}'",
+              "    AND person_3.first_name NOT IN (SELECT value FROM jsonb_array_elements_text(($24 #>> '{}')::jsonb))",
+              "    AND person_3.first_name IN (SELECT value FROM jsonb_array_elements_text(($25 #>> '{}')::jsonb))",
+              "    AND entity_1.id = ($26 #>> '{}')::UUID",
+              "    AND entity_1.id <> ($27 #>> '{}')::UUID",
+              "    AND entity_1.id NOT IN (SELECT value::UUID FROM jsonb_array_elements_text(($28 #>> '{}')::jsonb))",
+              "    AND entity_1.id IN (SELECT value::UUID FROM jsonb_array_elements_text(($29 #>> '{}')::jsonb))",
+              "    AND person_3.last_name ILIKE $30 #>> '{}'",
+              "    AND person_3.last_name NOT ILIKE $31 #>> '{}'",
+              "))))"
            ]
          ]
        }
--- a/src/database/executors/mock.rs
+++ b/src/database/executors/mock.rs
@ -13,6 +13,7 @@ pub struct MockState {
  pub query_responses: Vec<Result<Value, String>>,
  pub execute_responses: Vec<Result<(), String>>,
  pub mocks: Vec<Value>,
+  pub punc_external: bool,
 }

 #[cfg(test)]
@ -23,10 +24,12 @@ impl MockState {
      query_responses: Default::default(),
      execute_responses: Default::default(),
      mocks: Default::default(),
+      punc_external: false,
    }
  }
 }

+
 #[cfg(test)]
 thread_local! {
  pub static MOCK_STATE: RefCell<MockState> = RefCell::new(MockState::new());
@ -85,6 +88,10 @@ impl DatabaseExecutor for MockExecutor {
    Ok("2026-03-10T00:00:00Z".to_string())
  }

+  fn punc_external(&self) -> Result<bool, String> {
+    Ok(MOCK_STATE.with(|state| state.borrow().punc_external))
+  }
+
  #[cfg(test)]
  fn get_queries(&self) -> Vec<String> {
    MOCK_STATE.with(|state| state.borrow().captured_queries.clone())
@ -105,10 +112,21 @@ impl DatabaseExecutor for MockExecutor {
      s.query_responses.clear();
      s.execute_responses.clear();
      s.mocks.clear();
+      s.punc_external = false;
    });
  }
 }

+#[cfg(test)]
+impl MockExecutor {
+  pub fn set_punc_external(&self, external: bool) {
+    MOCK_STATE.with(|state| {
+      state.borrow_mut().punc_external = external;
+    });
+  }
+}
+
+
 #[cfg(test)]
 fn parse_and_match_mocks(sql: &str, mocks: &[Value]) -> Option<Vec<Value>> {
  let sql_upper = sql.to_uppercase();
--- a/src/database/executors/mod.rs
+++ b/src/database/executors/mod.rs
@ -20,6 +20,9 @@ pub trait DatabaseExecutor: Send + Sync {
  /// Returns the current transaction timestamp
  fn timestamp(&self) -> Result<String, String>;

+  /// Returns true if the current execution context is marked as an external client API cue (punc.external = true)
+  fn punc_external(&self) -> Result<bool, String>;
+
  #[cfg(test)]
  fn get_queries(&self) -> Vec<String>;

--- a/src/database/executors/pgrx.rs
+++ b/src/database/executors/pgrx.rs
@ -150,4 +150,26 @@ impl DatabaseExecutor for SpiExecutor {
      })
    })
  }
+
+  fn punc_external(&self) -> Result<bool, String> {
+    self.transact(|| {
+      Spi::connect(|client| {
+        let mut tup_table = client
+          .select(
+            "SELECT COALESCE(current_setting('punc.external', true), 'false')::boolean",
+            None,
+            &[],
+          )
+          .map_err(|e| format!("SPI Select Error: {}", e))?;
+
+        let row = tup_table
+          .next()
+          .ok_or("No setting returned from context".to_string())?;
+        let is_external: Option<bool> = row.get(1).map_err(|e| e.to_string())?;
+
+        Ok(is_external.unwrap_or(false))
+      })
+    })
+  }
 }
+
--- a/src/database/object.rs
+++ b/src/database/object.rs
@ -151,19 +151,7 @@ pub struct SchemaObject {
  pub extensible: Option<bool>,
  #[serde(default)]
  #[serde(skip_serializing_if = "Option::is_none")]
-  pub immutable: Option<bool>,
-  // readOnly = the CLIENT may not write it; the SERVER still may. Deliberately NOT
-  // enforced here (see validator/rules/object.rs, which rejects `immutable` on any
-  // request) — enforcing it would break legitimate server writers such as the
-  // Mercury feed matcher stamping `reconciliation_status`, or the rollup triggers
-  // that own `total_amount`/`amount_paid`. It is carried purely so it survives
-  // compilation and reaches the punc code generator, which turns it into a
-  // client-side immutable Reactor. Without this field the key was silently dropped
-  // at this boundary and ten authored declarations did nothing for months.
-  #[serde(default)]
-  #[serde(rename = "readOnly")]
-  #[serde(skip_serializing_if = "Option::is_none")]
-  pub read_only: Option<bool>,
+  pub immutable: Option<ImmutableMode>,

  // Contains ALL structural fields perfectly flattened from the ENTIRE Database inheritance tree (e.g. `entity` fields like `id`) as well as local fields hidden inside conditional `cases` blocks.
  // This JSON exported array gives clients absolute deterministic visibility to O(1) validation and masking bounds without duplicating structural memory.
@ -275,6 +263,13 @@ pub fn is_primitive_type(t: &str) -> bool {
  )
 }

+#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "lowercase")]
+pub enum ImmutableMode {
+  Always,
+  External,
+}
+
 impl SchemaObject {
  pub fn get_discriminator_value(&self, dim: &str, schema_id: &str) -> Option<String> {
    let is_split = self
@ -322,7 +317,11 @@ impl SchemaObject {
    false
  }

-  pub fn is_immutable(&self) -> bool {
-    self.immutable == Some(true)
+  pub fn is_immutable(&self, is_external: bool) -> bool {
+    match self.immutable {
+      Some(ImmutableMode::Always) => true,
+      Some(ImmutableMode::External) => is_external,
+      None => false,
+    }
  }
 }
--- a/src/lib.rs
+++ b/src/lib.rs
@ -57,7 +57,7 @@ pub fn jspg_setup(database: Json) -> Json {
  Json(serde_json::to_value(drop).unwrap())
 }

-#[cfg_attr(not(test), pg_extern)]
+#[cfg_attr(not(test), pg_extern(volatile))]
 pub fn jspg_merge(schema_id: &str, data: JsonB) -> JsonB {
  // Try to acquire a read lock to get a clone of the Engine Arc
  let engine_opt = {
@ -74,7 +74,7 @@ pub fn jspg_merge(schema_id: &str, data: JsonB) -> JsonB {
  }
 }

-#[cfg_attr(not(test), pg_extern)]
+#[cfg_attr(not(test), pg_extern(volatile))]
 pub fn jspg_merge_ordered(schema_id: &str, data: Json) -> Json {
  let engine_opt = {
    let lock = GLOBAL_JSPG.read().unwrap();
--- a/src/merger/mod.rs
+++ b/src/merger/mod.rs
@ -6,8 +6,8 @@ pub mod cache;
 use crate::database::Database;
 use crate::database::r#type::Type;
 use crate::drop::{Drop, Error, ErrorDetails};
-use serde_json::Value;
 use indexmap::IndexMap;
+use serde_json::Value;
 use std::sync::Arc;

 pub struct Merger {
@ -31,9 +31,10 @@ impl Merger {
      None => {
        return Drop::with_errors(vec![Error {
          code: "SCHEMA_NOT_FOUND".to_string(),
-          values: Some(IndexMap::from([
-            ("schema".to_string(), schema_id.to_string()),
-          ])),
+          values: Some(IndexMap::from([(
+            "schema".to_string(),
+            schema_id.to_string(),
+          )])),
          details: ErrorDetails {
            path: None,
            cause: None,
@ -56,9 +57,7 @@ impl Merger {
      if let Err(e) = self.db.execute(&notify_sql, None) {
        return Drop::with_errors(vec![Error {
          code: "MERGE_FAILED".to_string(),
-          values: Some(IndexMap::from([
-            ("error".to_string(), e.clone()),
-          ])),
+          values: Some(IndexMap::from([("error".to_string(), e.clone())])),
          details: ErrorDetails {
            path: None,
            cause: Some(e),
@ -121,9 +120,15 @@ impl Merger {
                  } else {
                    return Err(Error {
                      code: "TARGET_SCHEMA_NOT_FOUND".to_string(),
-                      values: Some(IndexMap::from([("target_id".to_string(), target_id.clone())])),
+                      values: Some(IndexMap::from([(
+                        "target_id".to_string(),
+                        target_id.clone(),
+                      )])),
                      details: ErrorDetails {
-                        cause: Some(format!("Polymorphic mapped target '{}' not found in database registry", target_id)),
+                        cause: Some(format!(
+                          "Polymorphic mapped target '{}' not found in database registry",
+                          target_id
+                        )),
                        ..Default::default()
                      },
                    });
@ -141,7 +146,10 @@ impl Merger {
                      code: "ONE_OF_INDEX_NOT_FOUND".to_string(),
                      values: Some(IndexMap::from([("index".to_string(), idx.to_string())])),
                      details: ErrorDetails {
-                        cause: Some(format!("Polymorphic index target '{}' not found in local oneOf array", idx)),
+                        cause: Some(format!(
+                          "Polymorphic index target '{}' not found in local oneOf array",
+                          idx
+                        )),
                        ..Default::default()
                      },
                    });
@ -164,7 +172,10 @@ impl Merger {
                    ("value".to_string(), v.to_string()),
                  ])),
                  details: ErrorDetails {
-                    cause: Some(format!("Polymorphic discriminator {}='{}' matched no compiled options", disc, v)),
+                    cause: Some(format!(
+                      "Polymorphic discriminator {}='{}' matched no compiled options",
+                      disc, v
+                    )),
                    ..Default::default()
                  },
                });
@ -172,9 +183,15 @@ impl Merger {
            } else {
              return Err(Error {
                code: "MISSING_DISCRIMINATOR".to_string(),
-                values: Some(IndexMap::from([("discriminator".to_string(), disc.to_string())])),
+                values: Some(IndexMap::from([(
+                  "discriminator".to_string(),
+                  disc.to_string(),
+                )])),
                details: ErrorDetails {
-                  cause: Some(format!("Polymorphic merging failed: missing required discriminator '{}'", disc)),
+                  cause: Some(format!(
+                    "Polymorphic merging failed: missing required discriminator '{}'",
+                    disc
+                  )),
                  ..Default::default()
                },
              });
@ -289,10 +306,6 @@ impl Merger {
      }

      if let Some(prop_schema) = compiled_props.get(&k) {
-        if prop_schema.is_immutable() {
-          continue;
-        }
-
        let mut is_edge = false;
        if let Some(edges) = schema.obj.compiled_edges.get() {
          if edges.contains_key(&k) {
@ -369,7 +382,10 @@ impl Merger {
        if let Some(deps) = &schema.obj.dependencies {
          if let Some(crate::database::object::Dependency::Props(req_props)) = deps.get("created") {
            for req in req_props {
-              if !entity_fields.contains_key(req) && !entity_objects.contains_key(req) && !entity_arrays.contains_key(req) {
+              if !entity_fields.contains_key(req)
+                && !entity_objects.contains_key(req)
+                && !entity_arrays.contains_key(req)
+              {
                return Err(Error {
                  code: "REQUIRED_FIELD_MISSING".to_string(),
                  values: Some(IndexMap::from([
@ -378,7 +394,10 @@ impl Merger {
                  ])),
                  details: ErrorDetails {
                    path: Some(req.to_string()),
-                    cause: Some(format!("Missing required creation field '{}' for entity {}", req, type_name)),
+                    cause: Some(format!(
+                      "Missing required creation field '{}' for entity {}",
+                      req, type_name
+                    )),
                    ..Default::default()
                  },
                });
@ -489,7 +508,7 @@ impl Merger {
      entity_change_kind.as_deref().unwrap_or(""),
      &type_name,
      type_def,
-      &entity_fields,
+      &mut entity_fields,
      entity_fetched.as_ref(),
    )?;

@ -768,7 +787,7 @@ impl Merger {
    let fetch_sql_template = if let Some(cached) = self.cache.get(entity_type_name) {
      cached
    } else {
-      let mut select_list = String::from("to_jsonb(t1.*)");
+      let mut select_list = String::from("COALESCE(to_jsonb(t1.*), '{}')");
      let mut join_clauses = format!("FROM agreego.\"{}\" t1", entity_type.hierarchy[0]);

      for (i, table_name) in entity_type.hierarchy.iter().enumerate().skip(1) {
@ -777,7 +796,7 @@ impl Merger {
          " LEFT JOIN agreego.\"{}\" {} ON {}.id = t1.id",
          table_name, t_alias, t_alias
        ));
-        select_list.push_str(&format!(" || to_jsonb({}.*)", t_alias));
+        select_list.push_str(&format!(" || COALESCE(to_jsonb({}.*), '{{}}')", t_alias));
      }

      let template = format!("SELECT {} {}", select_list, join_clauses);
@ -825,9 +844,15 @@ impl Merger {
        if table.len() > 1 {
          Err(Error {
            code: "TOO_MANY_LOOKUP_ROWS".to_string(),
-            values: Some(IndexMap::from([("entity_type".to_string(), entity_type_name.to_string())])),
+            values: Some(IndexMap::from([(
+              "entity_type".to_string(),
+              entity_type_name.to_string(),
+            )])),
            details: ErrorDetails {
-              cause: Some(format!("Lookup for {} found too many existing rows", entity_type_name)),
+              cause: Some(format!(
+                "Lookup for {} found too many existing rows",
+                entity_type_name
+              )),
              ..Default::default()
            },
          })
@ -874,7 +899,7 @@ impl Merger {
    change_kind: &str,
    entity_type_name: &str,
    entity_type: &crate::database::r#type::Type,
-    entity_fields: &serde_json::Map<String, Value>,
+    entity_fields: &mut serde_json::Map<String, Value>,
    _entity_fetched: Option<&serde_json::Map<String, Value>>,
  ) -> Result<(), Error> {
    if change_kind.is_empty() {
@ -882,7 +907,7 @@ impl Merger {
    }

    let id_str = match entity_fields.get("id").and_then(|v| v.as_str()) {
-      Some(id) => id,
+      Some(id) => id.to_string(),
      None => {
        return Err(Error {
          code: "MISSING_ENTITY_ID".to_string(),
@ -900,9 +925,15 @@ impl Merger {
      _ => {
        return Err(Error {
          code: "MISSING_GROUPED_FIELDS".to_string(),
-          values: Some(IndexMap::from([("type".to_string(), entity_type_name.to_string())])),
+          values: Some(IndexMap::from([(
+            "type".to_string(),
+            entity_type_name.to_string(),
+          )])),
          details: ErrorDetails {
-            cause: Some(format!("Grouped fields missing for type {}", entity_type_name)),
+            cause: Some(format!(
+              "Grouped fields missing for type {}",
+              entity_type_name
+            )),
            ..Default::default()
          },
        });
@ -919,7 +950,7 @@ impl Merger {
      };

      let mut entity_pairs = serde_json::Map::new();
-      for (k, v) in entity_fields {
+      for (k, v) in entity_fields.iter() {
        if table_fields.contains(k) {
          entity_pairs.insert(k.clone(), v.clone());
        }
@ -953,20 +984,33 @@ impl Merger {
        }

        let sql = format!(
-          "INSERT INTO agreego.\"{}\" ({}) VALUES ({})",
+          "INSERT INTO agreego.\"{}\" ({}) VALUES ({}) RETURNING to_jsonb(\"{}\".*)",
          table_name,
          columns.join(", "),
-          values.join(", ")
+          values.join(", "),
+          table_name
        );
-        if let Err(e) = self.db.execute(&sql, None) {
-          return Err(Error {
-            code: "DATABASE_SPI_ERROR".to_string(),
-            values: Some(IndexMap::from([("error".to_string(), e.clone())])),
-            details: ErrorDetails {
-              cause: Some(e),
-              ..Default::default()
-            },
-          });
+        match self.db.query(&sql, None) {
+          Ok(Value::Array(rows)) => {
+            if let Some(Value::Object(row_map)) = rows.into_iter().next() {
+              for (k, v) in row_map {
+                if !v.is_null() {
+                  entity_fields.insert(k, v);
+                }
+              }
+            }
+          }
+          Err(e) => {
+            return Err(Error {
+              code: "DATABASE_SPI_ERROR".to_string(),
+              values: Some(IndexMap::from([("error".to_string(), e.clone())])),
+              details: ErrorDetails {
+                cause: Some(e),
+                ..Default::default()
+              },
+            });
+          }
+          _ => {}
        }
      } else if change_kind == "update" || change_kind == "delete" {
        entity_pairs.remove("id");
@ -994,20 +1038,33 @@ impl Merger {
        }

        let sql = format!(
-          "UPDATE agreego.\"{}\" SET {} WHERE id = {}",
+          "UPDATE agreego.\"{}\" SET {} WHERE id = {} RETURNING to_jsonb(\"{}\".*)",
          table_name,
          set_clauses.join(", "),
-          Self::quote_literal(&Value::String(id_str.to_string()))
+          Self::quote_literal(&Value::String(id_str.to_string())),
+          table_name
        );
-        if let Err(e) = self.db.execute(&sql, None) {
-          return Err(Error {
-            code: "DATABASE_SPI_ERROR".to_string(),
-            values: Some(IndexMap::from([("error".to_string(), e.clone())])),
-            details: ErrorDetails {
-              cause: Some(e),
-              ..Default::default()
-            },
-          });
+        match self.db.query(&sql, None) {
+          Ok(Value::Array(rows)) => {
+            if let Some(Value::Object(row_map)) = rows.into_iter().next() {
+              for (k, v) in row_map {
+                if !v.is_null() {
+                  entity_fields.insert(k, v);
+                }
+              }
+            }
+          }
+          Err(e) => {
+            return Err(Error {
+              code: "DATABASE_SPI_ERROR".to_string(),
+              values: Some(IndexMap::from([("error".to_string(), e.clone())])),
+              details: ErrorDetails {
+                cause: Some(e),
+                ..Default::default()
+              },
+            });
+          }
+          _ => {}
        }
      }
    }
--- a/src/tests/fixtures.rs
+++ b/src/tests/fixtures.rs
@ -2531,6 +2531,18 @@ fn test_properties_13_1() {
    crate::tests::runner::run_test_case(&path, 13, 1).unwrap();
 }

+#[test]
+fn test_properties_14_0() {
+    let path = format!("{}/fixtures/properties.json", env!("CARGO_MANIFEST_DIR"));
+    crate::tests::runner::run_test_case(&path, 14, 0).unwrap();
+}
+
+#[test]
+fn test_properties_14_1() {
+    let path = format!("{}/fixtures/properties.json", env!("CARGO_MANIFEST_DIR"));
+    crate::tests::runner::run_test_case(&path, 14, 1).unwrap();
+}
+
 #[test]
 fn test_max_contains_0_0() {
    let path = format!("{}/fixtures/maxContains.json", env!("CARGO_MANIFEST_DIR"));
--- a/src/tests/formatter.rs
+++ b/src/tests/formatter.rs
@ -97,7 +97,14 @@ impl SqlFormatter {
            self.push_line("VALUES (");
            self.indent += 2;
            
-            let vals = if suffix.ends_with(")") { &suffix[..suffix.len() - 1] } else { suffix };
+            let (vals, returning_clause) = if let Some(ret_idx) = suffix.rfind(") RETURNING ") {
+                (&suffix[..ret_idx], Some(&suffix[ret_idx + 2..]))
+            } else if suffix.ends_with(")") {
+                (&suffix[..suffix.len() - 1], None)
+            } else {
+                (suffix, None)
+            };
+
            let mut val_tokens = Vec::new();
            let mut curr = String::new();
            let mut in_str = false;
@ -119,7 +126,7 @@ impl SqlFormatter {
            for (i, val) in val_tokens.iter().enumerate() {
                let comma = if i < val_tokens.len() - 1 { "," } else { "" };
                
-                if val.starts_with("'{") && val.ends_with("}'") {
+                if val.starts_with("'{") && val.ends_with("}'") && val.len() > 4 {
                    let inner = &val[1..val.len() - 1];
                    // Unescape single quotes from SQL strings
                    let unescaped = inner.replace("''", "'");
@ -146,6 +153,9 @@ impl SqlFormatter {
            }
            self.indent -= 2;
            self.push_line(")");
+            if let Some(ret) = returning_clause {
+                self.push_line(ret);
+            }
        } else {
            self.push_line(&s);
        }
@ -168,10 +178,19 @@ impl SqlFormatter {
            self.indent -= 2;
            
            if let Some(w) = where_idx {
-                self.push_line("WHERE");
-                self.indent += 2;
-                self.push_line(&after_set[w + 7..]);
-                self.indent -= 2;
+                let where_clause = &after_set[w + 7..];
+                if let Some(ret_idx) = where_clause.find(" RETURNING ") {
+                    self.push_line("WHERE");
+                    self.indent += 2;
+                    self.push_line(&where_clause[..ret_idx]);
+                    self.indent -= 2;
+                    self.push_line(&where_clause[ret_idx + 1..]);
+                } else {
+                    self.push_line("WHERE");
+                    self.indent += 2;
+                    self.push_line(where_clause);
+                    self.indent -= 2;
+                }
            }
        } else {
            self.push_line(&s);
@ -341,7 +360,7 @@ impl SqlFormatter {
            }

            Expr::Value(sqlparser::ast::ValueWithSpan { value: Value::SingleQuotedString(s), .. }) | Expr::Value(sqlparser::ast::ValueWithSpan { value: Value::EscapedStringLiteral(s), .. }) => {
-                if s.starts_with('{') && s.ends_with('}') {
+                if s.starts_with('{') && s.ends_with('}') && s.len() > 2 {
                    if let Ok(json) = serde_json::from_str::<serde_json::Value>(s) {
                        if let Ok(pretty) = serde_json::to_string_pretty(&json) {
                            let lines: Vec<&str> = pretty.split('\n').collect();
--- a/src/validator/rules/object.rs
+++ b/src/validator/rules/object.rs
@ -180,9 +180,10 @@ impl<'a> ValidationContext<'a> {
      }

      if !self.response {
+        let is_external = self.db.executor.punc_external().unwrap_or(false);
        if let Some(compiled_props) = self.schema.compiled_properties.get() {
          for (key, sub_schema) in compiled_props {
-            if sub_schema.is_immutable() && obj.contains_key(key) {
+            if sub_schema.is_immutable(is_external) && obj.contains_key(key) {
              result.errors.push(ValidationError {
                code: "IMMUTABLE_PROPERTY_VIOLATION".to_string(),
                values: Some(IndexMap::from([
@ -194,7 +195,7 @@ impl<'a> ValidationContext<'a> {
          }
        } else if let Some(props) = &self.schema.properties {
          for (key, sub_schema) in props {
-            if sub_schema.is_immutable() && obj.contains_key(key) {
+            if sub_schema.is_immutable(is_external) && obj.contains_key(key) {
              result.errors.push(ValidationError {
                code: "IMMUTABLE_PROPERTY_VIOLATION".to_string(),
                values: Some(IndexMap::from([
@ -207,6 +208,8 @@ impl<'a> ValidationContext<'a> {
        }
      }

+
+
      if let Some(props) = &self.schema.properties {
        for (key, sub_schema) in props {
          if self.overrides.contains(key) {
--- a/2
+++ b/2
@ -1 +1 @@
-1.0.186
+1.0.193
Author	SHA1	Message	Date
Alex Groleau	3414a32bd6	version: 1.0.193	2026-08-03 19:09:54 -04:00
Alex Groleau	06432cf0f5	fixed volatile issues with merge	2026-08-03 19:09:46 -04:00
Alex Groleau	0d4b7c3dec	version: 1.0.192	2026-08-03 18:59:16 -04:00
Alex Groleau	b2f9fe387c	added returning statements to inserts and updates for trigger-based mutations	2026-08-03 18:57:08 -04:00
Alex Groleau	020286d603	version: 1.0.191	2026-08-03 16:40:36 -04:00
Alex Groleau	1619ca4400	fixed hierarchy null jsonb merging issue with merger when a part of the more specific hierarchy does not exist yet	2026-08-03 16:40:26 -04:00
Alex Groleau	580fa0bc9f	version: 1.0.190	2026-08-03 15:00:13 -04:00
Alex Groleau	2dfb4e68e4	fixed immutability effects in merger	2026-08-03 15:00:03 -04:00
Alex Groleau	ae31230ef2	version: 1.0.189	2026-08-03 12:08:46 -04:00
Alex Groleau	ce542a31cc	version: 1.0.188	2026-08-03 12:08:26 -04:00
Alex Groleau	75296ab107	version: 1.0.187	2026-08-03 12:05:53 -04:00
Alex Groleau	1a4b328b45	merged in main	2026-08-03 12:05:39 -04:00
Alex Groleau	c5e103c867	immutable tri-state	2026-08-03 12:03:03 -04:00
 @ -1 +1 @@
 .0.186
 .0.193