@contember/engine-system-api 1.3.2 → 1.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-system-api",
-  "version": "1.3.2",
+  "version": "1.3.3",
   "license": "Apache-2.0",
   "main": "dist/src/index.js",
   "typings": "dist/src/index.d.ts",
@@ -13,22 +13,22 @@
     "test": "vitest --dir ./tests/cases"
   },
   "dependencies": {
-    "@contember/authorization": "1.3.2",
-    "@contember/database": "1.3.2",
-    "@contember/database-migrations": "1.3.2",
-    "@contember/dic": "1.3.2",
-    "@contember/graphql-utils": "1.3.2",
-    "@contember/logger": "1.3.2",
-    "@contember/queryable": "1.3.2",
-    "@contember/schema": "1.3.2",
-    "@contember/schema-migrations": "1.3.2",
-    "@contember/schema-utils": "1.3.2",
+    "@contember/authorization": "1.3.3",
+    "@contember/database": "1.3.3",
+    "@contember/database-migrations": "1.3.3",
+    "@contember/dic": "1.3.3",
+    "@contember/graphql-utils": "1.3.3",
+    "@contember/logger": "1.3.3",
+    "@contember/queryable": "1.3.3",
+    "@contember/schema": "1.3.3",
+    "@contember/schema-migrations": "1.3.3",
+    "@contember/schema-utils": "1.3.3",
     "@graphql-tools/utils": "^8.6.13",
     "graphql-tag": "^2.12.5"
   },
   "devDependencies": {
-    "@contember/engine-api-tester": "1.3.2",
-    "@contember/schema-definition": "1.3.2",
+    "@contember/engine-api-tester": "1.3.3",
+    "@contember/schema-definition": "1.3.3",
     "@graphql-codegen/cli": "^2.6.2",
     "@graphql-codegen/typescript": "^2.5.1",
     "@graphql-codegen/typescript-operations": "^2.4.2",

package/src/migrations/2023-09-11-174000-fix-on-delete.ts

@@ -0,0 +1,77 @@
+import { MigrationArgs, MigrationBuilder } from '@contember/database-migrations'
+import { wrapIdentifier } from '@contember/database'
+import { SystemMigrationArgs } from './types'
+import { acceptFieldVisitor, ForeignKeyDeleteAction, SchemaDatabaseMetadata } from '@contember/schema-utils'
+import { Model } from '@contember/schema'
+
+export default async function (builder: MigrationBuilder, args: MigrationArgs<SystemMigrationArgs>) {
+	const schema = await args.schemaResolver(args.connection)
+	const stages = (await args.connection.query<{schema: string}>('SELECT schema FROM stage')).rows
+	const metadataByStage: Record<string, SchemaDatabaseMetadata> = {}
+
+	for (const entity of Object.values(schema.model.entities)) {
+		for (const field of Object.values(entity.fields)) {
+			const result = acceptFieldVisitor<null | {
+				relation: Model.OneHasOneOwningRelation | Model.ManyHasOneRelation
+				targetEntity: Model.Entity
+			}>(schema.model, entity, field, {
+				visitManyHasOne: ({ entity, relation, targetEntity }) => {
+					return { relation, entity, targetEntity }
+				},
+				visitOneHasOneOwning: ({ entity, relation, targetEntity }) => {
+					return { relation, entity, targetEntity }
+				},
+				visitOneHasOneInverse: () => null,
+				visitManyHasManyInverse: () => null,
+				visitManyHasManyOwning: () => null,
+				visitOneHasMany: () => null,
+				visitColumn: () => null,
+			})
+			if (!result) {
+				continue
+			}
+			const { targetEntity, relation } = result
+			if (entity.view || targetEntity.view) {
+				continue
+			}
+			for (const stage of stages) {
+				const databaseMetadata = metadataByStage[stage.schema] ??= await args.databaseMetadataResolver(args.connection, stage.schema)
+
+				const fkNames = databaseMetadata.getForeignKeyConstraintNames({
+					fromTable: entity.tableName,
+					fromColumn: relation.joiningColumn.columnName,
+					toTable: targetEntity.tableName,
+					toColumn: targetEntity.primaryColumn,
+				})
+
+				if (fkNames.every(it => {
+					const constraint = databaseMetadata.getForeignKeyConstraint(entity.tableName, it)
+					const dbConstraintFlag = ({
+						[Model.OnDelete.setNull]: ForeignKeyDeleteAction.setnull,
+						[Model.OnDelete.cascade]: ForeignKeyDeleteAction.cascade,
+						[Model.OnDelete.restrict]: ForeignKeyDeleteAction.restrict,
+					} as const)[relation.joiningColumn.onDelete]
+
+					return constraint && constraint.deleteAction === dbConstraintFlag
+				})) {
+					continue
+				}
+
+				for (const name of fkNames) {
+					builder.sql(`ALTER TABLE ${wrapIdentifier(stage.schema)}.${wrapIdentifier(entity.tableName)} DROP CONSTRAINT ${wrapIdentifier(name)}`)
+				}
+
+				const onDelete = ({
+					[Model.OnDelete.setNull]: 'SET NULL',
+					[Model.OnDelete.cascade]: 'CASCADE',
+					[Model.OnDelete.restrict]: 'RESTRICT',
+				} as const)[relation.joiningColumn.onDelete]
+
+				builder.sql(`ALTER TABLE ${wrapIdentifier(stage.schema)}.${wrapIdentifier(entity.tableName)}
+					ADD FOREIGN KEY (${wrapIdentifier(relation.joiningColumn.columnName)}) 
+					REFERENCES ${wrapIdentifier(stage.schema)}.${wrapIdentifier(targetEntity.tableName)} (${wrapIdentifier(targetEntity.primaryColumn)}) ON DELETE ${onDelete} DEFERRABLE INITIALLY IMMEDIATE
+				`)
+			}
+		}
+	}
+}

package/src/migrations/runner.ts

@@ -17,6 +17,7 @@ import _20220208132600fnsearchpath from './2022-02-08-132600-fn-search-path'
 import _20220208140500dropdeadcode from './2022-02-08-140500-drop-deadcode'
 import _20220208144400dynamicstageschema from './2022-02-08-144400-dynamic-stage-schema'
 import _20221003110000tableondelete from './2022-10-03-110000-table-on-delete'
+import _20230911174000fixondelete from './2023-09-11-174000-fix-on-delete'
 import snapshot from './snapshot'
 
 import { Client, Connection, createDatabaseIfNotExists, DatabaseConfig } from '@contember/database'
@@ -46,6 +47,7 @@ const migrations = {
 	'2022-02-08-140500-drop-deadcode': _20220208140500dropdeadcode,
 	'2022-02-08-144400-dynamic-stage-schema': _20220208144400dynamicstageschema,
 	'2022-10-03-110000-table-on-delete': _20221003110000tableondelete,
+	'2023-09-11-174000-fix-on-delete': _20230911174000fixondelete,
 }
 
 

package/src/model/metadata/SchemaDatabaseMetadataResolver.ts

@@ -3,6 +3,7 @@ import {
 	IndexMetadata,
 	SchemaDatabaseMetadata,
 	UniqueConstraintMetadata,
+	ForeignKeyDeleteAction,
 } from '@contember/schema-utils'
 import { DatabaseContext } from '../database'
 import { Connection } from '@contember/database'
@@ -21,6 +22,7 @@ export class SchemaDatabaseMetadataResolver {
 				toColumn: it.target_columns[0],
 				fromTable: it.table_name,
 				toTable: it.target_table,
+				deleteAction: it.delete_action ?? ForeignKeyDeleteAction.noaction,
 			}))
 		const uniqueConstraints = constraintRows
 			.filter((it): it is UniqueConstraintsRow => it.type === ConstraintTypes.unique)
@@ -54,7 +56,8 @@ export class SchemaDatabaseMetadataResolver {
                 JSONB_AGG(DISTINCT pg_attribute_target.attname)
                 FILTER ( WHERE pg_attribute_target.attname IS NOT NULL) AS target_columns,
                 BOOL_OR(condeferrable),
-                BOOL_OR(condeferred)
+                BOOL_OR(condeferred),
+                MAX(confdeltype) AS delete_action
             FROM pg_constraint
             JOIN pg_class
                 ON pg_constraint.conrelid = pg_class.oid
@@ -116,6 +119,7 @@ type ForeignKeyConstraintsRow = {
 	type: ConstraintTypes.foreignKey
 	deferrable: boolean
 	deferred: boolean
+	delete_action: ForeignKeyDeleteAction | null
 }
 type UniqueConstraintsRow = {
 	constraint_name: string