@contember/engine-system-api 2.1.0-alpha.28 → 2.1.0-alpha.29

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-system-api",
-  "version": "2.1.0-alpha.28",
+  "version": "2.1.0-alpha.29",
   "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.28",
-    "@contember/database": "2.1.0-alpha.28",
-    "@contember/database-migrations": "2.1.0-alpha.28",
-    "@contember/dic": "2.1.0-alpha.28",
-    "@contember/graphql-utils": "2.1.0-alpha.28",
-    "@contember/logger": "2.1.0-alpha.28",
-    "@contember/queryable": "2.1.0-alpha.28",
-    "@contember/schema": "2.1.0-alpha.28",
-    "@contember/schema-migrations": "2.1.0-alpha.28",
-    "@contember/schema-utils": "2.1.0-alpha.28",
+    "@contember/authorization": "2.1.0-alpha.29",
+    "@contember/database": "2.1.0-alpha.29",
+    "@contember/database-migrations": "2.1.0-alpha.29",
+    "@contember/dic": "2.1.0-alpha.29",
+    "@contember/graphql-utils": "2.1.0-alpha.29",
+    "@contember/logger": "2.1.0-alpha.29",
+    "@contember/queryable": "2.1.0-alpha.29",
+    "@contember/schema": "2.1.0-alpha.29",
+    "@contember/schema-migrations": "2.1.0-alpha.29",
+    "@contember/schema-utils": "2.1.0-alpha.29",
     "@graphql-tools/utils": "^10.5.5",
     "graphql-tag": "^2.12.6"
   },
   "devDependencies": {
-    "@contember/schema-definition": "2.1.0-alpha.28",
+    "@contember/schema-definition": "2.1.0-alpha.29",
     "@types/node": "^20.17.22",
     "graphql": "^16.9.0",
     "pg": "^8.12.0"

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,11 +229,15 @@ 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]
 	}