@contember/engine-system-api 2.1.0-alpha.3 → 2.1.0-alpha.30

package/graphql.codegen.yml

@@ -19,4 +19,4 @@ generates:
       - "typescript-resolvers"
 hooks:
   afterAllFileWrite:
-    - bun run -T eslint --fix
+    - bun run eslint --fix

package/package.json

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

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

@@ -14,6 +14,9 @@ export default async function (builder: MigrationBuilder, args: MigrationArgs<Sy
 		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)

package/src/model/migrations/ProjectMigrator.ts

@@ -15,6 +15,11 @@ import { SchemaProvider } from './SchemaProvider'
 import { SaveSchemaCommand } from '../commands/schema/SaveSchemaCommand'
 import { ImplementationException } from '../../utils'
 
+type MigrationVariables = {
+	system_schema: string
+	project_slug: string
+}
+
 export class ProjectMigrator {
 	constructor(
 		private readonly migrationDescriber: MigrationDescriber,
@@ -64,7 +69,7 @@ export class ProjectMigrator {
 						modification,
 						formatVersion,
 						migration.version,
-						db.client.schema,
+						project,
 						metadataStore,
 					)
 				}
@@ -200,6 +205,13 @@ export class ProjectMigrator {
 		return toExecute
 	}
 
+	private sqlPreprocessor(text: string, variables: MigrationVariables): string {
+		return Object.entries(variables).reduce(
+			(content, [key, value]) => content.replace(new RegExp(`\\{\\{${key}\\}\\}`, 'g'), value),
+			text,
+		)
+	}
+
 	private async applyModification(
 		db: Client,
 		stages: Stage[],
@@ -207,7 +219,7 @@ export class ProjectMigrator {
 		modification: Migration.Modification,
 		formatVersion: number,
 		migrationVersion: string,
-		systemSchema: string,
+		project: { slug: string; systemSchema: string },
 		metadataStore: SchemaDatabaseMetadataResolverStore,
 	): Promise<[Schema]> {
 		const {
@@ -217,17 +229,21 @@ export class ProjectMigrator {
 		for (const stage of stages) {
 			const databaseMetadata = await metadataStore.getMetadata(stage.schema)
 			const sql = getSql({
-				systemSchema,
+				systemSchema: project.systemSchema,
 				databaseMetadata,
 				invalidateDatabaseMetadata: () => metadataStore.invalidate(stage.schema),
 			})
-			await this.executeOnStage(db, stage, sql, migrationVersion)
+			const processedSql = this.sqlPreprocessor(sql, {
+				project_slug: project.slug,
+				system_schema: project.systemSchema,
+			})
+			await this.executeOnStage(db, stage, processedSql, migrationVersion)
 		}
 		return [newSchema]
 	}
 
 	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/migrations/SchemaProvider.ts

@@ -34,11 +34,10 @@ export class SchemaProvider {
 
 		const partialResult = newMigrations.reduce<SchemaWithMeta>(
 			(schema, migration) => {
-				if (migration.type !== 'schema') {
-					return schema
-				}
 				return {
-					schema: this.schemaMigrator.applyModifications(schema.schema, migration.modifications, migration.formatVersion),
+					schema: migration.type !== 'schema'
+						? schema.schema
+						: this.schemaMigrator.applyModifications(schema.schema, migration.modifications, migration.formatVersion),
 					meta: {
 						version: migration.version,
 						id: migration.id,
@@ -63,7 +62,7 @@ export class SchemaProvider {
 		}
 	}
 
-	public async fetch({ db, currentSchema  }: {
+	public async fetch({ db, currentSchema }: {
 		db: DatabaseContext
 		currentSchema?: SchemaWithMeta | null
 	}): Promise<SchemaWithMeta> {