@contember/engine-system-api 1.3.3 → 1.3.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-system-api",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "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.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",
+    "@contember/authorization": "1.3.5",
+    "@contember/database": "1.3.5",
+    "@contember/database-migrations": "1.3.5",
+    "@contember/dic": "1.3.5",
+    "@contember/graphql-utils": "1.3.5",
+    "@contember/logger": "1.3.5",
+    "@contember/queryable": "1.3.5",
+    "@contember/schema": "1.3.5",
+    "@contember/schema-migrations": "1.3.5",
+    "@contember/schema-utils": "1.3.5",
     "@graphql-tools/utils": "^8.6.13",
     "graphql-tag": "^2.12.5"
   },
   "devDependencies": {
-    "@contember/engine-api-tester": "1.3.3",
-    "@contember/schema-definition": "1.3.3",
+    "@contember/engine-api-tester": "1.3.5",
+    "@contember/schema-definition": "1.3.5",
     "@graphql-codegen/cli": "^2.6.2",
     "@graphql-codegen/typescript": "^2.5.1",
     "@graphql-codegen/typescript-operations": "^2.4.2",

package/src/migrations/2023-10-19-173000-fix-unique.ts

@@ -0,0 +1,49 @@
+import { MigrationArgs, MigrationBuilder } from '@contember/database-migrations'
+import { wrapIdentifier } from '@contember/database'
+import { SystemMigrationArgs } from './types'
+import { acceptEveryFieldVisitor, SchemaDatabaseMetadata } from '@contember/schema-utils'
+import { getUniqueConstraintColumns } from '@contember/schema-migrations'
+
+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)) {
+		if (entity.view) {
+			continue
+		}
+
+		const expectedUnique: string[][] = []
+
+		for (const uniq of entity.unique) {
+			const columns = getUniqueConstraintColumns({
+				entity,
+				fields: uniq.fields,
+				model: schema.model,
+			})
+			expectedUnique.push(columns)
+		}
+
+
+		for (const stage of stages) {
+			const databaseMetadata = metadataByStage[stage.schema] ??= await args.databaseMetadataResolver(args.connection, stage.schema)
+
+			const existingUniqueConstraints = databaseMetadata.getAllUniqueConstraints().filter(it => it.tableName === entity.tableName)
+			for (const constraint of existingUniqueConstraints) {
+				if (constraint.columnNames.length === 1 || expectedUnique.some(it => stringArrayEquals(it, constraint.columnNames))) {
+					continue
+				}
+				builder.sql(`ALTER TABLE ${wrapIdentifier(stage.schema)}.${wrapIdentifier(entity.tableName)} DROP CONSTRAINT ${wrapIdentifier(constraint.constraintName)}`)
+			}
+		}
+	}
+}
+const stringArrayEquals = (colA: string[], colB: string[]) => {
+	if (colA.length !== colB.length) {
+		return false
+	}
+	const a = [...colA].sort()
+	const b = [...colB].sort()
+	return a.every((it, index) => it === b[index])
+}

package/src/migrations/runner.ts

@@ -18,6 +18,7 @@ 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 _20231019173000fixunique from './2023-10-19-173000-fix-unique'
 import snapshot from './snapshot'
 
 import { Client, Connection, createDatabaseIfNotExists, DatabaseConfig } from '@contember/database'
@@ -48,6 +49,7 @@ const migrations = {
 	'2022-02-08-144400-dynamic-stage-schema': _20220208144400dynamicstageschema,
 	'2022-10-03-110000-table-on-delete': _20221003110000tableondelete,
 	'2023-09-11-174000-fix-on-delete': _20230911174000fixondelete,
+	'2023-10-19-173000-fix-unique': _20231019173000fixunique,
 }
 
 

package/src/model/metadata/ResolvedDatabaseMetadata.ts

@@ -9,8 +9,12 @@ import {
 } from '@contember/schema-utils'
 
 const stringArrayEquals = (colA: string[], colB: string[]) => {
-	return colA.length === colB.length
-		&& colA.every((it, index) => it === colB[index])
+	if (colA.length !== colB.length) {
+		return false
+	}
+	const a = [...colA].sort()
+	const b = [...colB].sort()
+	return a.every((it, index) => it === b[index])
 }
 
 export class ResolvedDatabaseMetadata implements SchemaDatabaseMetadata {
@@ -21,6 +25,10 @@ export class ResolvedDatabaseMetadata implements SchemaDatabaseMetadata {
 	) {
 	}
 
+	getAllUniqueConstraints(): UniqueConstraintMetadata[] {
+		return this.uniqueConstraints
+	}
+
 	getUniqueConstraint(tableName: string, constraintName: string): UniqueConstraintMetadata | null {
 		return this.uniqueConstraints.find(it => it.tableName === tableName && it.constraintName === constraintName) ?? null
 	}

package/tests/cases/migrations/2023-10-19-173000-fix-unique.test.ts

@@ -0,0 +1,66 @@
+import migration from '../../../src/migrations/2023-10-19-173000-fix-unique'
+import { createMigrationBuilder } from '@contember/database-migrations'
+import { assert, test } from 'vitest'
+import { c, createSchema } from '@contember/schema-definition'
+import { dummySchemaDatabaseMetadata } from '@contember/schema-utils'
+import { createConnectionMock } from '@contember/database-tester'
+
+namespace UniqueModel {
+
+	@c.Unique('colA', 'colB')
+	@c.Unique('manyHasOneBar', 'colB')
+	export class Foo {
+		hasOneBar = c.oneHasOne(Bar)
+		manyHasOneBar = c.manyHasOne(Bar)
+		singleColUnique = c.stringColumn().unique()
+
+		colA = c.stringColumn()
+		colB = c.stringColumn()
+		colC = c.stringColumn()
+	}
+
+	export class Bar {
+
+	}
+}
+
+test('unique fix test', async () => {
+	const builder = createMigrationBuilder()
+	const connection = createConnectionMock([{
+		sql: 'select schema from stage',
+		response: { rows: [{ schema: 'stage_live' }] },
+	}])
+	await migration(builder, {
+		connection: connection,
+		databaseMetadataResolver: () => Promise.resolve({
+			...dummySchemaDatabaseMetadata,
+			getAllUniqueConstraints: () => [
+				{ constraintName: 'valid1', tableName: 'foo', columnNames: ['col_a', 'col_b'] },
+				{ constraintName: 'valid2', tableName: 'foo', columnNames: ['col_b', 'many_has_one_bar_id'] },
+				{ constraintName: 'valid3', tableName: 'foo', columnNames: ['single_col_unique'] },
+				{ constraintName: 'valid4', tableName: 'foo', columnNames: ['has_one_bar_id'] },
+
+				{ constraintName: 'invalid1', tableName: 'foo', columnNames: ['col_a', 'col_c'] },
+				{ constraintName: 'invalid2', tableName: 'foo', columnNames: ['col_c', 'many_has_one_bar_id'] },
+
+			],
+		}),
+		schemaResolver: () => Promise.resolve(createSchema(UniqueModel)),
+		project: {
+			slug: 'test',
+			stages: [
+				{
+					slug: 'prod',
+					name: 'prod',
+				},
+			],
+		},
+	})
+	assert.equal(
+		builder.getSql(),
+		`ALTER TABLE "stage_live"."foo" DROP CONSTRAINT "invalid1";
+ALTER TABLE "stage_live"."foo" DROP CONSTRAINT "invalid2";
+`,
+	)
+})
+