version: 1.0.162

Revert "queryer: NULL-tolerant bound for optional single-family forward relations"
This reverts commit 94477b677d.
2026-06-19 15:35:01 -04:00 · 2026-06-19 15:34:24 -04:00 · 2026-06-19 15:34:23 -04:00 · 2026-06-19 11:08:52 -04:00 · 2026-06-19 11:03:13 -04:00 · 2026-06-19 10:22:29 -04:00
9 changed files with 1064 additions and 808 deletions
--- a/Cargo.toml
+++ b/Cargo.toml
@ -16,7 +16,7 @@ url = "2.5.8"
 fluent-uri = "0.3.2"
 idna = "1.1.0"
 percent-encoding = "2.3.2"
-uuid = { version = "1.20.0", features = ["v4", "serde"] }
+uuid = { version = "1.20.0", features = ["v7", "serde"] }
 chrono = { version = "0.4.43", features = ["serde"] }
 json-pointer = "0.3.4"
 indexmap = { version = "2.13.0", features = ["serde"] }
--- a/fixtures/database.json
+++ b/fixtures/database.json
@ -791,8 +791,8 @@
            }
          },
          "hierarchy": [
-            "invoice",
-            "entity"
+            "entity",
+            "invoice"
          ],
          "fields": [
            "id",
@ -867,8 +867,8 @@
            }
          },
          "hierarchy": [
-            "invoice_line",
-            "entity"
+            "entity",
+            "invoice_line"
          ],
          "fields": [
            "id",
--- a/fixtures/invoice.json
+++ b/fixtures/invoice.json
@ -110,8 +110,8 @@
            }
          },
          "hierarchy": [
-            "activity",
-            "entity"
+            "entity",
+            "activity"
          ],
          "variations": [
            "activity",
@ -166,9 +166,9 @@
            }
          },
          "hierarchy": [
-            "invoice",
+            "entity",
            "activity",
-            "entity"
+            "invoice"
          ],
          "variations": [
            "invoice"
@ -237,8 +237,8 @@
            }
          },
          "hierarchy": [
-            "attachment",
-            "entity"
+            "entity",
+            "attachment"
          ],
          "variations": [
            "attachment"
--- a/fixtures/merger.json
+++ b/fixtures/merger.json
@ -219,8 +219,8 @@
            }
          },
          "hierarchy": [
-            "organization",
-            "entity"
+            "entity",
+            "organization"
          ],
          "fields": [
            "id",
@ -262,9 +262,9 @@
            }
          },
          "hierarchy": [
-            "user",
+            "entity",
            "organization",
-            "entity"
+            "user"
          ],
          "fields": [
            "id",
@ -359,10 +359,10 @@
            }
          },
          "hierarchy": [
-            "person",
-            "user",
+            "entity",
            "organization",
-            "entity"
+            "user",
+            "person"
          ],
          "fields": [
            "id",
@ -445,8 +445,8 @@
            }
          },
          "hierarchy": [
-            "order",
-            "entity"
+            "entity",
+            "order"
          ],
          "fields": [
            "id",
@ -504,8 +504,8 @@
            }
          },
          "hierarchy": [
-            "order_line",
-            "entity"
+            "entity",
+            "order_line"
          ],
          "fields": [
            "id",
@ -548,8 +548,8 @@
          "name": "relationship",
          "relationship": true,
          "hierarchy": [
-            "relationship",
-            "entity"
+            "entity",
+            "relationship"
          ],
          "fields": [
            "source_id",
@ -611,9 +611,9 @@
          "name": "contact",
          "relationship": true,
          "hierarchy": [
-            "contact",
+            "entity",
            "relationship",
-            "entity"
+            "contact"
          ],
          "fields": [
            "is_primary",
@ -683,8 +683,8 @@
        {
          "name": "phone_number",
          "hierarchy": [
-            "phone_number",
-            "entity"
+            "entity",
+            "phone_number"
          ],
          "fields": [
            "number",
@ -741,8 +741,8 @@
        {
          "name": "email_address",
          "hierarchy": [
-            "email_address",
-            "entity"
+            "entity",
+            "email_address"
          ],
          "fields": [
            "address",
@ -834,8 +834,8 @@
            }
          },
          "hierarchy": [
-            "attachment",
-            "entity"
+            "entity",
+            "attachment"
          ],
          "fields": [
            "id",
@ -887,8 +887,8 @@
        {
          "name": "account",
          "hierarchy": [
-            "account",
-            "entity"
+            "entity",
+            "account"
          ],
          "fields": [
            "id",
@ -1031,8 +1031,8 @@
            }
          },
          "hierarchy": [
-            "invoice",
-            "entity"
+            "entity",
+            "invoice"
          ],
          "fields": [
            "id",
@ -1107,8 +1107,8 @@
            }
          },
          "hierarchy": [
-            "invoice_line",
-            "entity"
+            "entity",
+            "invoice_line"
          ],
          "fields": [
            "id",
@ -1309,10 +1309,10 @@
          "sql": [
            [
              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
-              "FROM agreego.\"person\" t1",
-              "JOIN agreego.\"user\" t2 ON ",
-              "JOIN agreego.\"organization\" t3 ON ",
-              "JOIN agreego.\"entity\" t4 ON ",
+              "FROM agreego.\"entity\" t1",
+              "JOIN agreego.\"organization\" t2 ON ",
+              "JOIN agreego.\"user\" t3 ON ",
+              "JOIN agreego.\"person\" t4 ON ",
              "WHERE",
              "  (\"first_name\" = 'LookupFirst'",
              "  AND \"last_name\" = 'LookupLast'",
@ -1320,17 +1320,62 @@
              "  AND \"pronouns\" = 'they/them'))"
            ],
            [
-              "UPDATE agreego.\"person\" SET",
-              "  contact_id = 'abc-contact'",
-              "WHERE",
-              "  id = '{{uuid:mocks.0.id}}'"
+              "INSERT INTO agreego.\"entity\" (",
+              "  \"created_at\",",
+              "  \"created_by\",",
+              "  \"id\",",
+              "  \"modified_at\",",
+              "  \"modified_by\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  '{{timestamp}}',",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  '{{uuid:generated_0}}',",
+              "  '{{timestamp}}',",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'person'",
+              ")"
            ],
            [
-              "UPDATE agreego.\"entity\" SET",
-              "  modified_at = '{{timestamp}}',",
-              "  modified_by = '00000000-0000-0000-0000-000000000000'",
-              "WHERE",
-              "  id = '{{uuid:mocks.0.id}}'"
+              "INSERT INTO agreego.\"organization\" (",
+              "  \"id\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  '{{uuid:generated_0}}',",
+              "  'person'",
+              ")"
+            ],
+            [
+              "INSERT INTO agreego.\"user\" (",
+              "  \"id\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  '{{uuid:generated_0}}',",
+              "  'person'",
+              ")"
+            ],
+            [
+              "INSERT INTO agreego.\"person\" (",
+              "  \"contact_id\",",
+              "  \"date_of_birth\",",
+              "  \"first_name\",",
+              "  \"id\",",
+              "  \"last_name\",",
+              "  \"pronouns\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  'abc-contact',",
+              "  '{{timestamp}}',",
+              "  'LookupFirst',",
+              "  '{{uuid:generated_0}}',",
+              "  'LookupLast',",
+              "  'they/them',",
+              "  'person'",
+              ")"
            ],
            [
              "INSERT INTO agreego.change (",
@ -1343,40 +1388,45 @@
              "  \"modified_by\"",
              ")",
              "VALUES (",
+              "  NULL,",
              "  '{",
-              "      \"contact_id\": \"old-contact\"",
-              "  }',",
-              "  '{",
+              "      \"first_name\": \"LookupFirst\",",
+              "      \"last_name\": \"LookupLast\",",
+              "      \"date_of_birth\": \"{{timestamp}}\",",
+              "      \"pronouns\": \"they/them\",",
              "      \"contact_id\": \"abc-contact\",",
              "      \"type\": \"person\"",
              "  }',",
-              "  '{{uuid:mocks.0.id}}',",
              "  '{{uuid:generated_0}}',",
-              "  'update',",
+              "  '{{uuid:generated_1}}',",
+              "  'create',",
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000'",
              ")"
            ],
            [
              "(SELECT pg_notify('entity', '{",
-              "    \"kind\": \"update\",",
+              "    \"kind\": \"create\",",
              "    \"complete\": {",
-              "      \"id\": \"{{uuid:mocks.0.id}}\",",
-              "      \"type\": \"person\",",
              "      \"first_name\": \"LookupFirst\",",
              "      \"last_name\": \"LookupLast\",",
              "      \"date_of_birth\": \"{{timestamp}}\",",
              "      \"pronouns\": \"they/them\",",
              "      \"contact_id\": \"abc-contact\",",
+              "      \"id\": \"{{uuid:generated_0}}\",",
+              "      \"type\": \"person\",",
+              "      \"created_by\": \"00000000-0000-0000-0000-000000000000\",",
+              "      \"created_at\": \"{{timestamp}}\",",
              "      \"modified_by\": \"00000000-0000-0000-0000-000000000000\",",
              "      \"modified_at\": \"{{timestamp}}\"",
              "    },",
              "    \"new\": {",
+              "      \"first_name\": \"LookupFirst\",",
+              "      \"last_name\": \"LookupLast\",",
+              "      \"date_of_birth\": \"{{timestamp}}\",",
+              "      \"pronouns\": \"they/them\",",
              "      \"contact_id\": \"abc-contact\",",
              "      \"type\": \"person\"",
-              "    },",
-              "    \"old\": {",
-              "      \"contact_id\": \"old-contact\"",
              "    }",
              "}'))"
            ]
@ -1412,10 +1462,10 @@
          "sql": [
            [
              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
-              "FROM agreego.\"person\" t1",
-              "JOIN agreego.\"user\" t2 ON ",
-              "JOIN agreego.\"organization\" t3 ON ",
-              "JOIN agreego.\"entity\" t4 ON ",
+              "FROM agreego.\"entity\" t1",
+              "JOIN agreego.\"organization\" t2 ON ",
+              "JOIN agreego.\"user\" t3 ON ",
+              "JOIN agreego.\"person\" t4 ON ",
              "WHERE",
              "  t1.id = '{{uuid:data.id}}'",
              "  OR (\"first_name\" = 'LookupFirst'",
@ -1424,17 +1474,62 @@
              "  AND \"pronouns\" = 'they/them'))"
            ],
            [
-              "UPDATE agreego.\"person\" SET",
-              "  contact_id = 'abc-contact'",
-              "WHERE",
-              "  id = '{{uuid:mocks.0.id}}'"
+              "INSERT INTO agreego.\"entity\" (",
+              "  \"created_at\",",
+              "  \"created_by\",",
+              "  \"id\",",
+              "  \"modified_at\",",
+              "  \"modified_by\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  '{{timestamp}}',",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  '{{uuid:data.id}}',",
+              "  '{{timestamp}}',",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'person'",
+              ")"
            ],
            [
-              "UPDATE agreego.\"entity\" SET",
-              "  modified_at = '{{timestamp}}',",
-              "  modified_by = '00000000-0000-0000-0000-000000000000'",
-              "WHERE",
-              "  id = '{{uuid:mocks.0.id}}'"
+              "INSERT INTO agreego.\"organization\" (",
+              "  \"id\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  '{{uuid:data.id}}',",
+              "  'person'",
+              ")"
+            ],
+            [
+              "INSERT INTO agreego.\"user\" (",
+              "  \"id\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  '{{uuid:data.id}}',",
+              "  'person'",
+              ")"
+            ],
+            [
+              "INSERT INTO agreego.\"person\" (",
+              "  \"contact_id\",",
+              "  \"date_of_birth\",",
+              "  \"first_name\",",
+              "  \"id\",",
+              "  \"last_name\",",
+              "  \"pronouns\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  'abc-contact',",
+              "  '{{timestamp}}',",
+              "  'LookupFirst',",
+              "  '{{uuid:data.id}}',",
+              "  'LookupLast',",
+              "  'they/them',",
+              "  'person'",
+              ")"
            ],
            [
              "INSERT INTO agreego.change (",
@ -1447,42 +1542,46 @@
              "  \"modified_by\"",
              ")",
              "VALUES (",
+              "  NULL,",
              "  '{",
-              "      \"contact_id\": \"old-contact\"",
-              "  }',",
-              "  '{",
+              "      \"first_name\": \"LookupFirst\",",
+              "      \"last_name\": \"LookupLast\",",
+              "      \"date_of_birth\": \"{{timestamp}}\",",
+              "      \"pronouns\": \"they/them\",",
              "      \"contact_id\": \"abc-contact\",",
              "      \"type\": \"person\"",
              "  }',",
-              "  '{{uuid:mocks.0.id}}',",
+              "  '{{uuid:data.id}}',",
              "  '{{uuid:generated_0}}',",
-              "  'update',",
+              "  'create',",
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000'",
              ")"
            ],
            [
              "(SELECT pg_notify('entity', '{",
-              "    \"kind\": \"update\",",
+              "    \"kind\": \"create\",",
              "    \"complete\": {",
-              "      \"id\": \"{{uuid:mocks.0.id}}\",",
-              "      \"type\": \"person\",",
              "      \"first_name\": \"LookupFirst\",",
              "      \"last_name\": \"LookupLast\",",
              "      \"date_of_birth\": \"{{timestamp}}\",",
              "      \"pronouns\": \"they/them\",",
              "      \"contact_id\": \"abc-contact\",",
+              "      \"id\": \"{{uuid:data.id}}\",",
+              "      \"type\": \"person\",",
+              "      \"created_by\": \"00000000-0000-0000-0000-000000000000\",",
+              "      \"created_at\": \"{{timestamp}}\",",
              "      \"modified_by\": \"00000000-0000-0000-0000-000000000000\",",
              "      \"modified_at\": \"{{timestamp}}\"",
              "    },",
              "    \"new\": {",
+              "      \"first_name\": \"LookupFirst\",",
+              "      \"last_name\": \"LookupLast\",",
+              "      \"date_of_birth\": \"{{timestamp}}\",",
+              "      \"pronouns\": \"they/them\",",
              "      \"contact_id\": \"abc-contact\",",
              "      \"type\": \"person\"",
-              "    },",
-              "    \"old\": {",
-              "      \"contact_id\": \"old-contact\"",
-              "    },",
-              "    \"replaces\": \"{{uuid:data.id}}\"",
+              "    }",
              "}'))"
            ]
          ]
@ -1516,10 +1615,10 @@
          "sql": [
            [
              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
-              "FROM agreego.\"person\" t1",
-              "JOIN agreego.\"user\" t2 ON ",
-              "JOIN agreego.\"organization\" t3 ON ",
-              "JOIN agreego.\"entity\" t4 ON ",
+              "FROM agreego.\"entity\" t1",
+              "JOIN agreego.\"organization\" t2 ON ",
+              "JOIN agreego.\"user\" t3 ON ",
+              "JOIN agreego.\"person\" t4 ON ",
              "WHERE",
              "  t1.id = '{{uuid:data.id}}'",
              "  OR (\"first_name\" = 'LookupFirst'",
@ -1528,23 +1627,109 @@
              "  AND \"pronouns\" = 'they/them'))"
            ],
            [
-              "(SELECT pg_notify('entity', '{",
-              "    \"kind\": \"replace\",",
-              "    \"complete\": {",
-              "      \"id\": \"{{uuid:mocks.0.id}}\",",
-              "      \"type\": \"person\",",
+              "INSERT INTO agreego.\"entity\" (",
+              "  \"created_at\",",
+              "  \"created_by\",",
+              "  \"id\",",
+              "  \"modified_at\",",
+              "  \"modified_by\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  '{{timestamp}}',",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  '{{uuid:data.id}}',",
+              "  '{{timestamp}}',",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'person'",
+              ")"
+            ],
+            [
+              "INSERT INTO agreego.\"organization\" (",
+              "  \"id\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  '{{uuid:data.id}}',",
+              "  'person'",
+              ")"
+            ],
+            [
+              "INSERT INTO agreego.\"user\" (",
+              "  \"id\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  '{{uuid:data.id}}',",
+              "  'person'",
+              ")"
+            ],
+            [
+              "INSERT INTO agreego.\"person\" (",
+              "  \"date_of_birth\",",
+              "  \"first_name\",",
+              "  \"id\",",
+              "  \"last_name\",",
+              "  \"pronouns\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  '{{timestamp}}',",
+              "  'LookupFirst',",
+              "  '{{uuid:data.id}}',",
+              "  'LookupLast',",
+              "  'they/them',",
+              "  'person'",
+              ")"
+            ],
+            [
+              "INSERT INTO agreego.change (",
+              "  \"old\",",
+              "  \"new\",",
+              "  \"entity_id\",",
+              "  \"id\",",
+              "  \"kind\",",
+              "  \"modified_at\",",
+              "  \"modified_by\"",
+              ")",
+              "VALUES (",
+              "  NULL,",
+              "  '{",
              "      \"first_name\": \"LookupFirst\",",
              "      \"last_name\": \"LookupLast\",",
              "      \"date_of_birth\": \"{{timestamp}}\",",
              "      \"pronouns\": \"they/them\",",
-              "      \"contact_id\": \"old-contact\",",
+              "      \"type\": \"person\"",
+              "  }',",
+              "  '{{uuid:data.id}}',",
+              "  '{{uuid:generated_0}}',",
+              "  'create',",
+              "  '{{timestamp}}',",
+              "  '00000000-0000-0000-0000-000000000000'",
+              ")"
+            ],
+            [
+              "(SELECT pg_notify('entity', '{",
+              "    \"kind\": \"create\",",
+              "    \"complete\": {",
+              "      \"first_name\": \"LookupFirst\",",
+              "      \"last_name\": \"LookupLast\",",
+              "      \"date_of_birth\": \"{{timestamp}}\",",
+              "      \"pronouns\": \"they/them\",",
+              "      \"id\": \"{{uuid:data.id}}\",",
+              "      \"type\": \"person\",",
+              "      \"created_by\": \"00000000-0000-0000-0000-000000000000\",",
+              "      \"created_at\": \"{{timestamp}}\",",
              "      \"modified_by\": \"00000000-0000-0000-0000-000000000000\",",
              "      \"modified_at\": \"{{timestamp}}\"",
              "    },",
              "    \"new\": {",
+              "      \"first_name\": \"LookupFirst\",",
+              "      \"last_name\": \"LookupLast\",",
+              "      \"date_of_birth\": \"{{timestamp}}\",",
+              "      \"pronouns\": \"they/them\",",
              "      \"type\": \"person\"",
-              "    },",
-              "    \"replaces\": \"{{uuid:data.id}}\"",
+              "    }",
              "}'))"
            ]
          ]
@ -1573,26 +1758,64 @@
          "sql": [
            [
              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
-              "FROM agreego.\"person\" t1",
-              "JOIN agreego.\"user\" t2 ON ",
-              "JOIN agreego.\"organization\" t3 ON ",
-              "JOIN agreego.\"entity\" t4 ON ",
+              "FROM agreego.\"entity\" t1",
+              "JOIN agreego.\"organization\" t2 ON ",
+              "JOIN agreego.\"user\" t3 ON ",
+              "JOIN agreego.\"person\" t4 ON ",
              "WHERE",
              "  t1.id = '{{uuid:mocks.0.id}}')"
            ],
            [
-              "UPDATE agreego.\"person\" SET",
-              "  first_name = 'NewFirst',",
-              "  last_name = 'NewLast'",
-              "WHERE",
-              "  id = '{{uuid:mocks.0.id}}'"
+              "INSERT INTO agreego.\"entity\" (",
+              "  \"created_at\",",
+              "  \"created_by\",",
+              "  \"id\",",
+              "  \"modified_at\",",
+              "  \"modified_by\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  '{{timestamp}}',",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  '{{uuid:mocks.0.id}}',",
+              "  '{{timestamp}}',",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'person'",
+              ")"
            ],
            [
-              "UPDATE agreego.\"entity\" SET",
-              "  modified_at = '{{timestamp}}',",
-              "  modified_by = '00000000-0000-0000-0000-000000000000'",
-              "WHERE",
-              "  id = '{{uuid:mocks.0.id}}'"
+              "INSERT INTO agreego.\"organization\" (",
+              "  \"id\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  '{{uuid:mocks.0.id}}',",
+              "  'person'",
+              ")"
+            ],
+            [
+              "INSERT INTO agreego.\"user\" (",
+              "  \"id\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  '{{uuid:mocks.0.id}}',",
+              "  'person'",
+              ")"
+            ],
+            [
+              "INSERT INTO agreego.\"person\" (",
+              "  \"first_name\",",
+              "  \"id\",",
+              "  \"last_name\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  'NewFirst',",
+              "  '{{uuid:mocks.0.id}}',",
+              "  'NewLast',",
+              "  'person'",
+              ")"
            ],
            [
              "INSERT INTO agreego.change (",
@ -1605,10 +1828,7 @@
              "  \"modified_by\"",
              ")",
              "VALUES (",
-              "  '{",
-              "      \"first_name\": \"OldFirst\",",
-              "      \"last_name\": \"OldLast\"",
-              "  }',",
+              "  NULL,",
              "  '{",
              "      \"first_name\": \"NewFirst\",",
              "      \"last_name\": \"NewLast\",",
@ -1616,19 +1836,21 @@
              "  }',",
              "  '{{uuid:mocks.0.id}}',",
              "  '{{uuid:generated_0}}',",
-              "  'update',",
+              "  'create',",
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000'",
              ")"
            ],
            [
              "(SELECT pg_notify('entity', '{",
-              "    \"kind\": \"update\",",
+              "    \"kind\": \"create\",",
              "    \"complete\": {",
-              "      \"id\": \"{{uuid:mocks.0.id}}\",",
-              "      \"type\": \"person\",",
              "      \"first_name\": \"NewFirst\",",
              "      \"last_name\": \"NewLast\",",
+              "      \"id\": \"{{uuid:mocks.0.id}}\",",
+              "      \"type\": \"person\",",
+              "      \"created_by\": \"00000000-0000-0000-0000-000000000000\",",
+              "      \"created_at\": \"{{timestamp}}\",",
              "      \"modified_by\": \"00000000-0000-0000-0000-000000000000\",",
              "      \"modified_at\": \"{{timestamp}}\"",
              "    },",
@ -1636,10 +1858,6 @@
              "      \"first_name\": \"NewFirst\",",
              "      \"last_name\": \"NewLast\",",
              "      \"type\": \"person\"",
-              "    },",
-              "    \"old\": {",
-              "      \"first_name\": \"OldFirst\",",
-              "      \"last_name\": \"OldLast\"",
              "    }",
              "}'))"
            ]
@ -1663,10 +1881,10 @@
          "sql": [
            [
              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
-              "FROM agreego.\"person\" t1",
-              "JOIN agreego.\"user\" t2 ON ",
-              "JOIN agreego.\"organization\" t3 ON ",
-              "JOIN agreego.\"entity\" t4 ON ",
+              "FROM agreego.\"entity\" t1",
+              "JOIN agreego.\"organization\" t2 ON ",
+              "JOIN agreego.\"user\" t3 ON ",
+              "JOIN agreego.\"person\" t4 ON ",
              "WHERE",
              "  t1.id = '123')"
            ],
@ -2002,8 +2220,8 @@
          "sql": [
            [
              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*)",
-              "FROM agreego.\"order\" t1",
-              "JOIN agreego.\"entity\" t2 ON ",
+              "FROM agreego.\"entity\" t1",
+              "JOIN agreego.\"order\" t2 ON ",
              "WHERE",
              "  t1.id = 'abc'",
              "  OR (\"id\" = 'abc'))"
@ -2805,20 +3023,62 @@
          "sql": [
            [
              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*) || to_jsonb(t3.*) || to_jsonb(t4.*)",
-              "FROM agreego.\"person\" t1",
-              "JOIN agreego.\"user\" t2 ON ",
-              "JOIN agreego.\"organization\" t3 ON ",
-              "JOIN agreego.\"entity\" t4 ON ",
+              "FROM agreego.\"entity\" t1",
+              "JOIN agreego.\"organization\" t2 ON ",
+              "JOIN agreego.\"user\" t3 ON ",
+              "JOIN agreego.\"person\" t4 ON ",
              "WHERE",
              "  t1.id = 'abc-archived')"
            ],
            [
-              "UPDATE agreego.\"entity\" SET",
-              "  archived = true,",
-              "  modified_at = '{{timestamp}}',",
-              "  modified_by = '00000000-0000-0000-0000-000000000000'",
-              "WHERE",
-              "  id = 'abc-archived'"
+              "INSERT INTO agreego.\"entity\" (",
+              "  \"archived\",",
+              "  \"created_at\",",
+              "  \"created_by\",",
+              "  \"id\",",
+              "  \"modified_at\",",
+              "  \"modified_by\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  true,",
+              "  '{{timestamp}}',",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'abc-archived',",
+              "  '{{timestamp}}',",
+              "  '00000000-0000-0000-0000-000000000000',",
+              "  'person'",
+              ")"
+            ],
+            [
+              "INSERT INTO agreego.\"organization\" (",
+              "  \"id\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  'abc-archived',",
+              "  'person'",
+              ")"
+            ],
+            [
+              "INSERT INTO agreego.\"user\" (",
+              "  \"id\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  'abc-archived',",
+              "  'person'",
+              ")"
+            ],
+            [
+              "INSERT INTO agreego.\"person\" (",
+              "  \"id\",",
+              "  \"type\"",
+              ")",
+              "VALUES (",
+              "  'abc-archived',",
+              "  'person'",
+              ")"
            ],
            [
              "INSERT INTO agreego.change (",
@ -2831,38 +3091,33 @@
              "  \"modified_by\"",
              ")",
              "VALUES (",
-              "  '{",
-              "      \"archived\": false",
-              "  }',",
+              "  NULL,",
              "  '{",
              "      \"archived\": true,",
              "      \"type\": \"person\"",
              "  }',",
              "  'abc-archived',",
              "  '{{uuid:generated_0}}',",
-              "  'delete',",
+              "  'create',",
              "  '{{timestamp}}',",
              "  '00000000-0000-0000-0000-000000000000'",
              ")"
            ],
            [
              "(SELECT pg_notify('entity', '{",
-              "    \"kind\": \"delete\",",
+              "    \"kind\": \"create\",",
              "    \"complete\": {",
+              "      \"archived\": true,",
              "      \"id\": \"abc-archived\",",
              "      \"type\": \"person\",",
-              "      \"first_name\": \"ArchivedFirst\",",
-              "      \"last_name\": \"ArchivedLast\",",
-              "      \"archived\": true,",
+              "      \"created_by\": \"00000000-0000-0000-0000-000000000000\",",
+              "      \"created_at\": \"{{timestamp}}\",",
              "      \"modified_by\": \"00000000-0000-0000-0000-000000000000\",",
              "      \"modified_at\": \"{{timestamp}}\"",
              "    },",
              "    \"new\": {",
              "      \"archived\": true,",
              "      \"type\": \"person\"",
-              "    },",
-              "    \"old\": {",
-              "      \"archived\": false",
              "    }",
              "}'))"
            ]
@ -3121,8 +3376,8 @@
          "sql": [
            [
              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*)",
-              "FROM agreego.\"order_line\" t1",
-              "JOIN agreego.\"entity\" t2 ON ",
+              "FROM agreego.\"entity\" t1",
+              "JOIN agreego.\"order_line\" t2 ON ",
              "WHERE",
              "  t1.id = '{{uuid:data.lines.0.id}}')"
            ],
@ -3245,8 +3500,8 @@
          "sql": [
            [
              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*)",
-              "FROM agreego.\"invoice\" t1",
-              "JOIN agreego.\"entity\" t2 ON ",
+              "FROM agreego.\"entity\" t1",
+              "JOIN agreego.\"invoice\" t2 ON ",
              "WHERE",
              "  t1.id = '{{uuid:data.id}}'",
              "  OR (\"id\" = '{{uuid:data.id}}'))"
@ -3362,8 +3617,8 @@
          "sql": [
            [
              "(SELECT to_jsonb(t1.*) || to_jsonb(t2.*)",
-              "FROM agreego.\"account\" t1",
-              "JOIN agreego.\"entity\" t2 ON ",
+              "FROM agreego.\"entity\" t1",
+              "JOIN agreego.\"account\" t2 ON ",
              "WHERE",
              "  t1.id = '{{uuid:data.id}}')"
            ],
--- a/fixtures/queryer.json
+++ b/fixtures/queryer.json
--- a/src/merger/mod.rs
+++ b/src/merger/mod.rs
@ -588,7 +588,7 @@ impl Merger {
        .and_then(|v| v.as_str())
        .unwrap_or("");
      let id_val = if entity_id.is_empty() {
-        Value::String(uuid::Uuid::new_v4().to_string())
+        Value::String(uuid::Uuid::now_v7().to_string())
      } else {
        Value::String(entity_id.to_string())
      };
@ -791,13 +791,8 @@ impl Merger {
      }
    };

-    let mut execute_order: Vec<String> = entity_type.hierarchy.clone();
-    if change_kind == "create" {
-      execute_order.reverse();
-    }
-
-    for table_name in execute_order {
-      let table_fields = match grouped_fields.get(&table_name).and_then(|v| v.as_array()) {
+    for table_name in &entity_type.hierarchy {
+      let table_fields = match grouped_fields.get(table_name).and_then(|v| v.as_array()) {
        Some(arr) => arr
          .iter()
          .filter_map(|v| v.as_str().map(|s| s.to_string()))
@ -980,7 +975,7 @@ impl Merger {
        Self::quote_literal(&old_val_obj),
        Self::quote_literal(&new_val_obj),
        Self::quote_literal(id_str),
-        Self::quote_literal(&Value::String(uuid::Uuid::new_v4().to_string())),
+        Self::quote_literal(&Value::String(uuid::Uuid::now_v7().to_string())),
        Self::quote_literal(&Value::String(change_kind.to_string())),
        Self::quote_literal(&Value::String(timestamp.to_string())),
        Self::quote_literal(&Value::String(user_id.to_string()))
--- a/src/tests/mod.rs
+++ b/src/tests/mod.rs
@ -44,7 +44,7 @@ fn test_library_api() {
          {
              "name": "source_schema",
              "variations": ["source_schema"],
-              "hierarchy": ["source_schema", "entity"],
+              "hierarchy": ["entity", "source_schema"],
              "schemas": {
                  "source_schema": {
                      "type": "object",
@ -60,7 +60,7 @@ fn test_library_api() {
          {
              "name": "target_schema",
              "variations": ["target_schema"],
-              "hierarchy": ["target_schema", "entity"],
+              "hierarchy": ["entity", "target_schema"],
              "schemas": {
                  "target_schema": {
                      "type": "object",
@ -109,7 +109,7 @@ fn test_library_api() {
                    "field_types": null,
                    "fields": [],
                    "grouped_fields": null,
-                    "hierarchy": ["source_schema", "entity"],
+                    "hierarchy": ["entity", "source_schema"],
                    "historical": false,
                    "id": "",
                    "longevity": null,
@ -174,7 +174,7 @@ fn test_library_api() {
                    "field_types": null,
                    "fields": [],
                    "grouped_fields": null,
-                    "hierarchy": ["target_schema", "entity"],
+                    "hierarchy": ["entity", "target_schema"],
                    "historical": false,
                    "id": "",
                    "longevity": null,
@ -251,12 +251,18 @@ fn test_library_api() {
            {
                "code": "REQUIRED_FIELD_MISSING",
                "message": "Missing name",
-                "details": { "path": "name" }
+                "details": {
+                    "path": "name",
+                    "schema": "source_schema"
+                }
            },
            {
                "code": "STRICT_PROPERTY_VIOLATION",
                "message": "Unexpected property 'wrong'",
-                "details": { "path": "wrong" }
+                "details": {
+                    "path": "wrong",
+                    "schema": "source_schema"
+                }
            }
        ]
    })
--- a/src/validator/mod.rs
+++ b/src/validator/mod.rs
@ -69,7 +69,7 @@ impl Validator {
                  path: Some(e.path),
                  cause: None,
                  context: None,
-                  schema: None,
+                  schema: Some(schema_id.to_string()),
                },
              })
              .collect();
@ -83,7 +83,7 @@ impl Validator {
            path: Some(e.path),
            cause: None,
            context: None,
-            schema: None,
+            schema: Some(schema_id.to_string()),
          },
        }]),
      }
@ -95,7 +95,7 @@ impl Validator {
          path: Some("/".to_string()),
          cause: None,
          context: None,
-          schema: None,
+          schema: Some(schema_id.to_string()),
        },
      }])
    }
--- a/2
+++ b/2
@ -1 +1 @@
-1.0.157
+1.0.162
Author	SHA1	Message	Date
Satya	10e388421d	version: 1.0.162	2026-06-19 15:35:01 -04:00
Satya	7f666e0ece	Revert "queryer: NULL-tolerant bound for optional single-family forward relations" This reverts commit `94477b677d`.	2026-06-19 15:34:24 -04:00
Satya	98a9719509	Revert "queryer: don't emit a parent type-bound for reified-relationship properties" This reverts commit `c97e5d75b3`.	2026-06-19 15:34:23 -04:00
Satya	0509995589	version: 1.0.161	2026-06-19 11:08:52 -04:00
Satya	c97e5d75b3	queryer: don't emit a parent type-bound for reified-relationship properties A SINGLE reified-relationship property (e.g. invoice.counterparty, person.primary_contact — a property whose type is a relationship subtype) is hydrated by a correlated subquery that joins the relationship table and correlates source_id/target_id = parent.id; its discriminators (the relationship subtype and the target's type CASE) are constrained INSIDE that subquery. For such a property the resolved edge is a REVERSE traversal (forward = false) over a generic relationship FK (fk_relationship_source_entity, destination = entity). compile_ polymorphic_bounds then took the `!edge.forward` branch with poly_col = destination_columns[1] = "type" and table_to_alias = "entity", which resolves to the PARENT's entity alias — emitting a bound like `entity_1.type = 'counterparty'` into the parent WHERE. No parent row has that type, so EVERY parent was dropped (e.g. get_invoice returned null for an existing invoice whose counterparty edge was absent). Array reified traversals (contacts, occupancies) never hit this: an array property has no bound_type_name. Only the single form did, and it was previously unexercised. Fix: in compile_polymorphic_bounds, skip the bound when the property's resolved type is itself a relationship (type_def.relationship) — there is no parent-row discriminator column to bound. Test: new queryer case (person.primary_contact, type=contact) asserts the parent WHERE has no spurious entity.type bound while the subquery keeps its discriminator + source_id correlation. Full suite green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-06-19 11:03:13 -04:00
Satya	94477b677d	queryer: NULL-tolerant bound for optional single-family forward relations An OPTIONAL forward polymorphic relation declared via `family` (e.g. order.counterparty / invoice.counterparty) had its auto-generated type bound `{alias}.{disc} IN (variations)` emitted into the PARENT row's WHERE. When the relation is absent (NULL discriminator) the parent row was wrongly excluded — a counterparty-less order/invoice returned nothing instead of the row with `counterparty: null`. Fix: in `compile_polymorphic_bounds`, make the forward-FK bound NULL-tolerant (`(… IN (…) OR …_type IS NULL)`), gated on `!r#type.relationship`: - real entities get NULL-tolerance (the relation is an optional attribute; an absent one must not drop the row — the inner CASE already resolves it to NULL); - edge entities (`relationship == true`, e.g. `contact`) keep the bound EXACT, because there source_type/target_type partition typed sub-collections (phone_numbers vs email_addresses) and a NULL endpoint belongs to no partition. Note: the `oneOf` path was already correct — it emits no parent bound (resolves via CASE … ELSE NULL), so cross-family optional relations already hydrate NULL-safely. Added a fixture case documenting that. Tests (fixtures/queryer.json): case 15 (entity → NULL-tolerant), cases 3/5/10 (contact edges → exact, unchanged), new case 16 (oneOf cross-family → no bound). Full suite green. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-06-19 10:22:29 -04:00
Alex Groleau	fb25224d22	version: 1.0.160	2026-06-18 20:31:49 -04:00
Alex Groleau	01368305de	fixed missing schema ids in validation results	2026-06-18 20:31:35 -04:00
Alex Groleau	9e362f2168	version: 1.0.159	2026-06-15 16:44:04 -04:00
Alex Groleau	9fffc7707f	Merge branch 'main' of gitea-ssh.thoughtpatterns.ai:cellular/jspg	2026-06-15 16:42:13 -04:00
Alex Groleau	c5d652c6fd	fixed merger ordering issue	2026-06-15 16:41:59 -04:00
Alex Groleau	d2cdd680ed	insert fix checkpoint	2026-06-15 16:18:44 -04:00
Satya	6f1c0d7ee9	version: 1.0.158	2026-06-12 22:11:14 -04:00
Satya	25bbf2b564	merger: generate entity and changelog ids with uuid v7 Switch the two UUID generation sites in the merger from v4 to time-ordered v7, and swap the uuid crate feature flag from v4 to v7 accordingly. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>	2026-06-12 22:11:09 -04:00
 @ -1 +1 @@
 .0.157
 .0.162