@contember/engine-system-api 2.1.0-beta.1 → 2.1.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-system-api",
-  "version": "2.1.0-beta.1",
+  "version": "2.1.0-beta.2",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",

package/src/model/migrations/SchemaProvider.ts

@@ -66,7 +66,7 @@ export class SchemaProvider {
 		db: DatabaseContext
 		currentSchema?: SchemaWithMeta | null
 	}): Promise<SchemaWithMeta> {
-		const newSchema = await db.queryHandler.fetch(new SchemaQuery(currentSchema?.meta.checksum))
+		const newSchema = await db.queryHandler.fetch(new SchemaQuery(currentSchema?.meta.checksum, currentSchema?.meta.version))
 		if (!newSchema) {
 			return currentSchema ?? emptyVersionedSchema
 		}

package/src/model/queries/schema/SchemaQuery.ts

@@ -5,6 +5,7 @@ import { SchemaWithMeta } from '../../migrations'
 export class SchemaQuery extends DatabaseQuery<SchemaWithMeta | null> {
 	constructor(
 		private readonly currentHash?: string,
+		private readonly currentVersion?: string,
 	) {
 		super()
 	}
@@ -26,6 +27,9 @@ export class SchemaQuery extends DatabaseQuery<SchemaWithMeta | null> {
 				if (!this.currentHash) {
 					return it
 				}
+				if (this.currentVersion) {
+					return it.where(it => it.raw('(checksum != ? OR version != ?)', this.currentHash, this.currentVersion))
+				}
 				return it.where(it => it.raw('checksum != ?', this.currentHash))
 			})
 

package/vitest.config.ts

@@ -1,3 +0,0 @@
-import { defineProject } from 'vitest/config'
-
-export default defineProject({})