BE-240: Fix foreign key violation check and sort entity type allOf array (#8185)

Author: TimDiekmann

libs/@local/graph/postgres-store/src/permissions/mod.rs

@@ -1165,9 +1165,7 @@ where
             .await
             .map_err(|error| {
                 let policy_error = match error.code() {
-                    Some(&SqlState::FOREIGN_KEY_VIOLATION) => {
-                        ActionError::HasChildren { id: action }
-                    }
+                    Some(&SqlState::RESTRICT_VIOLATION) => ActionError::HasChildren { id: action },
                     _ => ActionError::StoreError,
                 };
                 Report::new(error).change_context(policy_error)

tests/hash-backend-integration/src/tests/graph/ontology/primitive/entity-type.test.ts

@@ -372,6 +372,8 @@ describe("Entity type CRU", () => {
       ],
     );
 
+    closedMultiEntityType.allOf.sort((a, b) => a.$id.localeCompare(b.$id));
+
     // It's not specified how `required` is ordered, so we need to sort it before comparing
     if (closedMultiEntityType.required) {
       closedMultiEntityType.required.sort();
@@ -389,6 +391,7 @@ describe("Entity type CRU", () => {
       ),
     );
     assert(allOf !== undefined);
+    allOf.sort((a, b) => a.$id.localeCompare(b.$id));
 
     expect(closedMultiEntityType).toEqual({
       allOf,