@contember/engine-system-api 2.1.0-alpha.1 → 2.1.0-alpha.10

package/dist/types/utils/batchQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"batchQuery.d.ts","sourceRoot":"","sources":["../../../src/utils/batchQuery.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,UAAU,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAEhE,eAAO,MAAM,iBAAiB,GAAI,GAAG,EAAE,MAAM,EAAE,IAAI,gBACpC,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,WACrC,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,KACzC,UAAU,CAAC,GAAG,EAAE,IAAI,CAiBtB,CAAA"}
+{"version":3,"file":"batchQuery.d.ts","sourceRoot":"","sources":["../../../src/utils/batchQuery.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,UAAU,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,CAAA;AAEhE,eAAO,MAAM,iBAAiB,GAAI,GAAG,EAAE,MAAM,EAAE,IAAI,EAClD,cAAc,CAAC,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,MAAM,CAAC,EAC9C,SAAS,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,EAAE,MAAM,KAAK,IAAI,KACzC,UAAU,CAAC,GAAG,EAAE,IAAI,CAiBtB,CAAA"}

package/dist/types/utils/tuple.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tuple.d.ts","sourceRoot":"","sources":["../../../src/utils/tuple.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,GAAI,CAAC,SAAS,GAAG,EAAE,aAAa,CAAC,MAAW,CAAA"}
+{"version":3,"file":"tuple.d.ts","sourceRoot":"","sources":["../../../src/utils/tuple.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,KAAK,GAAI,CAAC,SAAS,GAAG,EAAE,EAAE,GAAG,QAAQ,CAAC,MAAW,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-system-api",
-  "version": "2.1.0-alpha.1",
+  "version": "2.1.0-alpha.10",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -23,22 +23,22 @@
     }
   },
   "dependencies": {
-    "@contember/authorization": "2.1.0-alpha.1",
-    "@contember/database": "2.1.0-alpha.1",
-    "@contember/database-migrations": "2.1.0-alpha.1",
-    "@contember/dic": "2.1.0-alpha.1",
-    "@contember/graphql-utils": "2.1.0-alpha.1",
-    "@contember/logger": "2.1.0-alpha.1",
-    "@contember/queryable": "2.1.0-alpha.1",
-    "@contember/schema": "2.1.0-alpha.1",
-    "@contember/schema-migrations": "2.1.0-alpha.1",
-    "@contember/schema-utils": "2.1.0-alpha.1",
+    "@contember/authorization": "2.1.0-alpha.10",
+    "@contember/database": "2.1.0-alpha.10",
+    "@contember/database-migrations": "2.1.0-alpha.10",
+    "@contember/dic": "2.1.0-alpha.10",
+    "@contember/graphql-utils": "2.1.0-alpha.10",
+    "@contember/logger": "2.1.0-alpha.10",
+    "@contember/queryable": "2.1.0-alpha.10",
+    "@contember/schema": "2.1.0-alpha.10",
+    "@contember/schema-migrations": "2.1.0-alpha.10",
+    "@contember/schema-utils": "2.1.0-alpha.10",
     "@graphql-tools/utils": "^10.5.5",
     "graphql-tag": "^2.12.6"
   },
   "devDependencies": {
-    "@contember/schema-definition": "2.1.0-alpha.1",
-    "@types/node": "^20.16.11",
+    "@contember/schema-definition": "2.1.0-alpha.10",
+    "@types/node": "^20.17.22",
     "graphql": "^16.9.0",
     "pg": "^8.12.0"
   },

package/src/migrations/2025-03-14-110000-fix-missing-index.ts

@@ -0,0 +1,71 @@
+import { MigrationArgs, MigrationBuilder } from '@contember/database-migrations'
+import { DatabaseMetadata } from '@contember/database'
+import { SystemMigrationArgs } from './types'
+import { wrapIdentifier } from '@contember/database'
+import { Model } from '@contember/schema'
+import { acceptFieldVisitor } from '@contember/schema-utils'
+
+export default async function (builder: MigrationBuilder, args: MigrationArgs<SystemMigrationArgs>) {
+	const schema = (await args.schemaResolver(args.connection)).schema
+	const stages = (await args.connection.query<{schema: string}>('SELECT schema FROM stage')).rows
+	const metadataByStage: Record<string, DatabaseMetadata> = {}
+
+	for (const entity of Object.values(schema.model.entities)) {
+		if (entity.indexes.length === 0) {
+			continue
+		}
+		if (entity.view) {
+			continue
+		}
+
+		for (const stage of stages) {
+			const databaseMetadata = metadataByStage[stage.schema] ??= await args.databaseMetadataResolver(args.connection, stage.schema)
+
+			for (const index of entity.indexes) {
+				const columns = getIndexColumns({
+					entity,
+					fields: index.fields,
+					model: schema.model,
+				})
+				const indexNames = databaseMetadata.indexes.filter({ tableName: entity.tableName, columnNames: columns }).getNames()
+				if (indexNames.length > 0) {
+					continue
+				}
+
+				const tableNameId = wrapIdentifier(entity.tableName)
+				const columnNameIds = columns.map(wrapIdentifier)
+
+				builder.sql(`CREATE INDEX ON ${wrapIdentifier(stage.schema)}.${tableNameId} (${columnNameIds.join(', ')})`)
+
+			}
+		}
+	}
+}
+
+const getIndexColumns = ({ entity, fields, model }: { fields: readonly string[]; model: Model.Schema; entity: Model.Entity }) => {
+	return fields.map(fieldName => {
+		return acceptFieldVisitor(model, entity, fieldName, {
+			visitColumn: ({ column }) => {
+				return column.columnName
+			},
+			visitManyHasOne: ({ relation }) => {
+				return relation.joiningColumn.columnName
+			},
+			visitOneHasOneOwning: ({ relation }) => {
+				return relation.joiningColumn.columnName
+			},
+			visitOneHasMany: () => {
+				throw new Error(`Cannot create index on 1:m relation in ${entity.name}.${fieldName}`)
+			},
+			visitOneHasOneInverse: () => {
+				throw new Error(`Cannot create index on 1:1 inverse relation in ${entity.name}.${fieldName}`)
+			},
+			visitManyHasManyOwning: () => {
+				throw new Error(`Cannot create index on m:m relation in ${entity.name}.${fieldName}`)
+			},
+			visitManyHasManyInverse: () => {
+				throw new Error(`Cannot create index on m:m inverse relation in ${entity.name}.${fieldName}`)
+			},
+		})
+	})
+}

package/src/migrations/runner.ts

@@ -29,6 +29,7 @@ import _20240628150000migrationsdropsequence from './2024-06-28-150000-migration
 import _20240628153000schema from './2024-06-28-153000-schema'
 import _20240628153001schemainit from './2024-06-28-153001-schema-init'
 import _20240729150000eventdataindex from './2024-07-29-150000-event-data-index'
+import _20250314110000fixmissingindex from './2025-03-14-110000-fix-missing-index'
 import snapshot from './snapshot'
 
 import { Connection, createDatabaseIfNotExists, DatabaseConfig, DatabaseMetadataResolver } from '@contember/database'
@@ -62,6 +63,7 @@ const migrations = {
 	'2024-06-28-153000-schema': _20240628153000schema,
 	'2024-06-28-153001-schema-init': _20240628153001schemainit,
 	'2024-07-29-150000-event-data-index': _20240729150000eventdataindex,
+	'2025-03-14-110000-fix-missing-index': _20250314110000fixmissingindex,
 }
 
 

package/src/model/migrations/ProjectMigrator.ts

@@ -227,7 +227,7 @@ export class ProjectMigrator {
 	}
 
 	private async executeOnStage(db: Client, stage: Stage, sql: string, migrationVersion: string) {
-		await db.query('SET search_path TO ' + wrapIdentifier(stage.schema))
+		await db.query('SET LOCAL search_path TO ' + wrapIdentifier(stage.schema))
 		try {
 			await db.query(sql)
 		} catch (e) {

package/src/model/queries/events/LatestTransactionIdByStageQuery.ts

@@ -1,12 +1,11 @@
 import { DatabaseQuery, DatabaseQueryable, SelectBuilder } from '@contember/database'
-import { ImplementationException } from '../../../utils'
 
-export class LatestTransactionIdByStageQuery extends DatabaseQuery<string> {
+export class LatestTransactionIdByStageQuery extends DatabaseQuery<string | null> {
 	constructor(private readonly stageId: string) {
 		super()
 	}
 
-	async fetch(queryable: DatabaseQueryable): Promise<string> {
+	async fetch(queryable: DatabaseQueryable): Promise<string | null> {
 		const rows = await SelectBuilder.create<{ transaction_id: string }>()
 			.from('stage_transaction')
 			.select('transaction_id')
@@ -15,9 +14,6 @@ export class LatestTransactionIdByStageQuery extends DatabaseQuery<string> {
 			.limit(1)
 			.getResult(queryable.db)
 
-		if (rows.length !== 1) {
-			throw new ImplementationException()
-		}
-		return rows[0].transaction_id
+		return rows.length === 0 ? null : rows[0].transaction_id
 	}
 }

package/tests/cases/migrations/2025-03-14-110000-fix-missing-index.test.ts

@@ -0,0 +1,62 @@
+import migration from '../../../src/migrations/2025-03-14-110000-fix-missing-index'
+import { createMigrationBuilder } from '@contember/database-migrations'
+import { expect, test } from 'bun:test'
+import { c, createSchema } from '@contember/schema-definition'
+import { createConnectionMock } from '@contember/database-tester'
+import { createDatabaseMetadata } from '@contember/database'
+
+namespace IndexModel {
+
+	@c.Index('colA', 'colB')
+	@c.Index('colB', 'colC')
+	export class Foo {
+		colA = c.stringColumn()
+		colB = c.stringColumn()
+		colC = c.stringColumn()
+	}
+
+}
+
+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(createDatabaseMetadata({
+			foreignKeys: [],
+			indexes: [
+				{ indexName: 'valid1', tableName: 'foo', columnNames: ['col_a', 'col_b'], unique: false },
+			],
+			uniqueConstraints: [],
+		})),
+		schemaResolver: () => Promise.resolve({
+			schema: createSchema(IndexModel),
+			meta: {
+				id: 1,
+				version: '2024-06-28-153001',
+				checksum: '_checksum_',
+				updatedAt: new Date(),
+			},
+		}),
+		project: {
+			slug: 'test',
+			stages: [
+				{
+					slug: 'prod',
+					name: 'prod',
+				},
+			],
+			systemSchema: 'system',
+		},
+	})
+	expect(
+		builder.getSql(),
+	).toEqual(
+		`CREATE INDEX ON "stage_live"."foo" ("col_b", "col_c");
+`,
+	)
+})
+