@contember/schema-migrations 2.1.0-rc.3 → 2.2.0-alpha.10

package/dist/types/utils/applyPatchCopyOnWrite.d.ts

@@ -0,0 +1,10 @@
+import { Operation } from 'rfc6902';
+/**
+ * Applies the patch to a copy of `root`, leaving `root` untouched. Only the containers on the paths
+ * the patch writes to are copied; everything else stays shared with `root`.
+ */
+export declare const applyPatchCopyOnWrite: <T extends object>(root: T, patch: Operation[]) => {
+    result: T;
+    errors: Error[];
+};
+//# sourceMappingURL=applyPatchCopyOnWrite.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"applyPatchCopyOnWrite.d.ts","sourceRoot":"","sources":["../../../src/utils/applyPatchCopyOnWrite.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,SAAS,EAAW,MAAM,SAAS,CAAA;AAsBxD;;;GAGG;AACH,eAAO,MAAM,qBAAqB,GAAI,CAAC,SAAS,MAAM,QAAQ,CAAC,SAAS,SAAS,EAAE,KAAG;IAAE,MAAM,EAAE,CAAC,CAAC;IAAC,MAAM,EAAE,KAAK,EAAE,CAAA;CAiBjH,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"dbHelpers.d.ts","sourceRoot":"","sources":["../../../src/utils/dbHelpers.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc,GAAI,OAAO,MAAM,WAA0C,CAAA"}
+{"version":3,"file":"dbHelpers.d.ts","sourceRoot":"","sources":["../../../src/utils/dbHelpers.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,cAAc,UAAW,MAAM,WAA0C,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"isDefined.d.ts","sourceRoot":"","sources":["../../../src/utils/isDefined.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,GAAI,CAAC,EAAE,OAAO,SAAS,GAAG,CAAC,KAAG,KAAK,IAAI,CAAwB,CAAA"}
+{"version":3,"file":"isDefined.d.ts","sourceRoot":"","sources":["../../../src/utils/isDefined.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,SAAS,GAAG,CAAC,KAAG,KAAK,IAAI,CAAwB,CAAA"}

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

@@ -1 +1 @@
-{"version":3,"file":"isIt.d.ts","sourceRoot":"","sources":["../../../src/utils/isIt.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,CAAC,GAAG,MAAM,CAAC,EAAE,KAAK,GAAG,EAAE,UAAU,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAG,GAAG,IAAI,CAKhH,CAAA"}
+{"version":3,"file":"isIt.d.ts","sourceRoot":"","sources":["../../../src/utils/isIt.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,IAAI,GAAI,CAAC,SAAS,MAAM,EAAE,CAAC,SAAS,MAAM,CAAC,GAAG,MAAM,CAAC,OAAO,GAAG,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,KAAG,GAAG,IAAI,CAKhH,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/schema-migrations",
-  "version": "2.1.0-rc.3",
+  "version": "2.2.0-alpha.10",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -23,16 +23,16 @@
     }
   },
   "dependencies": {
-    "@contember/database": "2.1.0-rc.3",
-    "@contember/database-migrations": "2.1.0-rc.3",
-    "@contember/engine-common": "2.1.0-rc.3",
-    "@contember/schema": "2.1.0-rc.3",
-    "@contember/schema-utils": "2.1.0-rc.3",
+    "@contember/database": "2.2.0-alpha.10",
+    "@contember/database-migrations": "2.2.0-alpha.10",
+    "@contember/engine-common": "2.2.0-alpha.10",
+    "@contember/schema": "2.2.0-alpha.10",
+    "@contember/schema-utils": "2.2.0-alpha.10",
     "fast-deep-equal": "^3.1.3",
     "rfc6902": "^5.2.0"
   },
   "devDependencies": {
-    "@contember/schema-definition": "2.1.0-rc.3"
+    "@contember/schema-definition": "2.2.0-alpha.10"
   },
   "peerDependencies": {
     "pg": "^8.20.0"

package/src/MigrationDescriber.ts

@@ -9,9 +9,9 @@ import {
 	ModificationHandlerFactory,
 	ModificationHandlerOptions,
 	SchemaUpdateError,
-} from './modifications'
+} from './modifications/index.js'
 import { createMigrationBuilder } from '@contember/database-migrations'
-import { Migration } from './Migration'
+import { Migration } from './Migration.js'
 import { Schema } from '@contember/schema'
 
 export interface ModificationDescriptionResult {

package/src/SchemaDiffer.ts

@@ -8,9 +8,9 @@ import {
 	SchemaValidator,
 	ValidationError,
 } from '@contember/schema-utils'
-import { SchemaMigrator } from './SchemaMigrator'
-import { Migration } from './Migration'
-import { ImplementationException } from './exceptions'
+import { SchemaMigrator } from './SchemaMigrator.js'
+import { Migration } from './Migration.js'
+import { ImplementationException } from './exceptions.js'
 import {
 	ConvertOneHasManyToManyHasManyRelationDiffer,
 	ConvertOneToManyRelationDiffer,
@@ -42,18 +42,29 @@ import {
 	UpdateRelationOrderByDiffer,
 	UpdateValidationSchemaDiffer,
 	VERSION_LATEST,
-} from './modifications'
-import { RemoveChangedFieldDiffer, RemoveViewDiffer } from './modifications/differs'
-import { CreateIndexDiffer, RemoveIndexDiffer } from './modifications/indexes'
-import { CreateTriggerDiffer, RemoveTriggerDiffer, UpdateTriggerDiffer } from './modifications/actions'
-import { UpdateTargetDiffer } from './modifications/actions/UpdateTargetModification'
-import { CreateTargetDiffer } from './modifications/actions/CreateTargetModification'
-import { RemoveTargetDiffer } from './modifications/actions/RemoveTargetModification'
-import { UpdateSettingsDiffer } from './modifications/settings'
-import { RemoveIndexNamesDiffer } from './modifications/upgrade/RemoveIndexNamesModification'
-import { ConvertOneHasManyToOneHasOneRelationDiffer } from './modifications/relations/ConvertOneHasManyToOneHasOneRelationModification'
+} from './modifications/index.js'
+import { RemoveChangedFieldDiffer, RemoveViewDiffer, UpdateViewDiffer } from './modifications/differs/index.js'
+import { CreateIndexDiffer, RemoveIndexDiffer } from './modifications/indexes/index.js'
+import { CreateTriggerDiffer, RemoveTriggerDiffer, UpdateTriggerDiffer } from './modifications/actions/index.js'
+import { UpdateTargetDiffer } from './modifications/actions/UpdateTargetModification.js'
+import { CreateTargetDiffer } from './modifications/actions/CreateTargetModification.js'
+import { RemoveTargetDiffer } from './modifications/actions/RemoveTargetModification.js'
+import { UpdateSettingsDiffer } from './modifications/settings/index.js'
+import { RemoveIndexNamesDiffer } from './modifications/upgrade/RemoveIndexNamesModification.js'
+import { ConvertOneHasManyToOneHasOneRelationDiffer } from './modifications/relations/ConvertOneHasManyToOneHasOneRelationModification.js'
 
-type DiffOptions = { skipRecreateValidation?: boolean; skipInitialSchemaValidation?: boolean }
+export type DiffOptions = {
+	skipRecreateValidation?: boolean
+	skipInitialSchemaValidation?: boolean
+	skipNonModelDiffers?: boolean
+	/**
+	 * Disable the in-place `CREATE OR REPLACE VIEW` optimization and drop & recreate every
+	 * changed view (with its dependant cascade) instead. Escape hatch for views whose real
+	 * output columns drifted without a matching field change (which would otherwise fail at
+	 * execute time with `SQLSTATE 42P16`).
+	 */
+	recreateViews?: boolean
+}
 
 export class SchemaDiffer {
 	constructor(
@@ -66,6 +77,8 @@ export class SchemaDiffer {
 	diffSchemas(originalSchema: Schema, updatedSchema: Schema, {
 		skipInitialSchemaValidation = false,
 		skipRecreateValidation = false,
+		skipNonModelDiffers = false,
+		recreateViews = false,
 	}: DiffOptions = {}): Migration.Modification[] {
 		if (!skipInitialSchemaValidation) {
 			const originalErrors = SchemaValidator.validate(originalSchema)
@@ -80,13 +93,13 @@ export class SchemaDiffer {
 
 		const differs: Differ[] = [
 			new RemoveIndexNamesDiffer(),
-			new UpdateSettingsDiffer(),
+			...skipNonModelDiffers ? [] : [new UpdateSettingsDiffer()],
 			new ConvertOneToManyRelationDiffer(),
 			new ConvertOneHasManyToManyHasManyRelationDiffer(),
 			new ConvertOneHasManyToOneHasOneRelationDiffer(),
 			new RemoveUniqueConstraintDiffer(),
 			new RemoveIndexDiffer(),
-			new RemoveViewDiffer(),
+			new RemoveViewDiffer(recreateViews),
 			new RemoveEntityDiffer(),
 			new RemoveFieldDiffer(),
 			new CreateEnumDiffer(),
@@ -108,19 +121,24 @@ export class SchemaDiffer {
 			new CreateColumnDiffer(),
 			new CreateRelationDiffer(),
 			new CreateViewDiffer(),
+			...recreateViews ? [] : [new UpdateViewDiffer()],
 			new CreateRelationInverseSideDiffer(),
 			new CreateUniqueConstraintDiffer(),
 			new CreateIndexDiffer(),
 			new RemoveEnumDiffer(),
-			new UpdateAclSchemaDiffer(this.options),
-			new UpdateValidationSchemaDiffer(this.options),
+			...skipNonModelDiffers ? [] : [
+				new UpdateAclSchemaDiffer(this.options),
+				new UpdateValidationSchemaDiffer(this.options),
+			],
 			new UpdateEntityOrderByDiffer(),
-			new UpdateTargetDiffer(),
-			new CreateTargetDiffer(),
-			new UpdateTriggerDiffer(this.options),
-			new CreateTriggerDiffer(),
-			new RemoveTriggerDiffer(),
-			new RemoveTargetDiffer(),
+			...skipNonModelDiffers ? [] : [
+				new UpdateTargetDiffer(),
+				new CreateTargetDiffer(),
+				new UpdateTriggerDiffer(this.options),
+				new CreateTriggerDiffer(),
+				new RemoveTriggerDiffer(),
+				new RemoveTargetDiffer(),
+			],
 		]
 
 		const diffs: Migration.Modification[] = []
@@ -132,7 +150,16 @@ export class SchemaDiffer {
 		}
 
 		if (!skipRecreateValidation) {
-			const errors = deepCompare(updatedSchema, appliedDiffsSchema, [], path => {
+			const targetForCompare = skipNonModelDiffers
+				? {
+					...updatedSchema,
+					acl: appliedDiffsSchema.acl,
+					validation: appliedDiffsSchema.validation,
+					actions: appliedDiffsSchema.actions,
+					settings: appliedDiffsSchema.settings,
+				}
+				: updatedSchema
+			const errors = deepCompare(targetForCompare, appliedDiffsSchema, [], path => {
 				if (path[0] === 'model' && path[1] === 'entities' && (path[3] === 'unique' || path[3] === 'index')) {
 					return (a, b) => {
 						return compareArraysIgnoreOrder(a, b, path)

package/src/SchemaMigrator.ts

@@ -1,6 +1,6 @@
 import { Schema } from '@contember/schema'
-import { ModificationHandlerFactory } from './modifications'
-import { Migration } from './Migration'
+import { ModificationHandlerFactory } from './modifications/index.js'
+import { Migration } from './Migration.js'
 
 export class SchemaMigrator {
 	constructor(private readonly modificationHandlerFactory: ModificationHandlerFactory) {}

package/src/index.ts

@@ -1,7 +1,7 @@
-export * from './SchemaDiffer'
-export * from './Migration'
-export * from './SchemaMigrator'
-export * from './SchemaDiffer'
-export * from './MigrationDescriber'
-export * from './modifications'
+export * from './SchemaDiffer.js'
+export * from './Migration.js'
+export * from './SchemaMigrator.js'
+export * from './SchemaDiffer.js'
+export * from './MigrationDescriber.js'
+export * from './modifications/index.js'
 export { MigrationVersionHelper } from '@contember/engine-common'

package/src/modifications/ModificationHandler.ts

@@ -1,7 +1,7 @@
 import { MigrationBuilder } from '@contember/database-migrations'
-import { SchemaUpdater } from './utils/schemaUpdateUtils'
+import { SchemaUpdater } from './utils/schemaUpdateUtils.js'
 import { Schema } from '@contember/schema'
-import { Migration } from '../Migration'
+import { Migration } from '../Migration.js'
 import { DatabaseMetadata } from '@contember/database'
 
 export interface ModificationDescription {

package/src/modifications/ModificationHandlerFactory.ts

@@ -1,8 +1,8 @@
 import { Schema } from '@contember/schema'
-import { ModificationHandler, ModificationHandlerOptions, ModificationType } from './ModificationHandler'
-import { patchAclSchemaModification, updateAclSchemaModification } from './acl'
-import { createColumnModification, updateColumnDefinitionModification, updateColumnNameModification } from './columns'
-import { createUniqueConstraintModification, removeUniqueConstraintModification } from './constraints'
+import { ModificationHandler, ModificationHandlerOptions, ModificationType } from './ModificationHandler.js'
+import { patchAclSchemaModification, updateAclSchemaModification } from './acl/index.js'
+import { createColumnModification, updateColumnDefinitionModification, updateColumnNameModification } from './columns/index.js'
+import { createUniqueConstraintModification, removeUniqueConstraintModification } from './constraints/index.js'
 import {
 	createEntityModification,
 	createViewModification,
@@ -10,11 +10,12 @@ import {
 	toggleEventLogModification,
 	updateEntityNameModification,
 	updateEntityTableNameModification,
-} from './entities'
-import { updateViewModification } from './entities/UpdateViewModification'
-import { createEnumModification, removeEnumModification, updateEnumModification } from './enums'
-import { removeFieldModification, updateFieldNameModification } from './fields'
+} from './entities/index.js'
+import { updateViewModification } from './entities/UpdateViewModification.js'
+import { createEnumModification, removeEnumModification, updateEnumModification } from './enums/index.js'
+import { removeFieldModification, updateFieldNameModification } from './fields/index.js'
 import {
+	convertManyHasManyToJoiningEntityModification,
 	convertOneHasManyToManyHasManyRelationModification,
 	convertOneToManyRelationModification,
 	createRelationInverseSideModification,
@@ -26,17 +27,17 @@ import {
 	toggleJunctionEventLogModification,
 	updateRelationOnDeleteModification,
 	updateRelationOrderByModification,
-} from './relations'
-import { patchValidationSchemaModification, updateValidationSchemaModification } from './validation'
-import { createIndexModification, removeIndexModification } from './indexes'
-import { updateSettingsModification } from './settings'
-import { createTriggerModification, patchTriggerModification, removeTriggerModification, updateTriggerModification } from './actions'
-import { createTargetModification } from './actions/CreateTargetModification'
-import { removeTargetModification } from './actions/RemoveTargetModification'
-import { updateTargetModification } from './actions/UpdateTargetModification'
-import { updateEntityOrderByModification } from './entities/UpdateEntityOrderByModification'
-import { removeIndexNamesModification } from './upgrade/RemoveIndexNamesModification'
-import { convertOneHasManyToOneHasOneRelationModification } from './relations/ConvertOneHasManyToOneHasOneRelationModification'
+} from './relations/index.js'
+import { patchValidationSchemaModification, updateValidationSchemaModification } from './validation/index.js'
+import { createIndexModification, removeIndexModification } from './indexes/index.js'
+import { updateSettingsModification } from './settings/index.js'
+import { createTriggerModification, patchTriggerModification, removeTriggerModification, updateTriggerModification } from './actions/index.js'
+import { createTargetModification } from './actions/CreateTargetModification.js'
+import { removeTargetModification } from './actions/RemoveTargetModification.js'
+import { updateTargetModification } from './actions/UpdateTargetModification.js'
+import { updateEntityOrderByModification } from './entities/UpdateEntityOrderByModification.js'
+import { removeIndexNamesModification } from './upgrade/RemoveIndexNamesModification.js'
+import { convertOneHasManyToOneHasOneRelationModification } from './relations/ConvertOneHasManyToOneHasOneRelationModification.js'
 
 class ModificationHandlerFactory {
 	constructor(private readonly map: Record<string, ModificationType<string, any>>) {}
@@ -90,6 +91,7 @@ namespace ModificationHandlerFactory {
 		toggleEventLogModification,
 		toggleJunctionEventLogModification,
 		convertOneHasManyToManyHasManyRelationModification,
+		convertManyHasManyToJoiningEntityModification,
 		updateEntityOrderByModification,
 		createTriggerModification,
 		updateTriggerModification,

package/src/modifications/NoopModification.ts

@@ -1,6 +1,6 @@
-import { ModificationHandler } from './ModificationHandler'
+import { ModificationHandler } from './ModificationHandler.js'
 import { MigrationBuilder } from '@contember/database-migrations'
-import { SchemaUpdater } from './utils/schemaUpdateUtils'
+import { SchemaUpdater } from './utils/schemaUpdateUtils.js'
 
 export class NoopModification implements ModificationHandler<{}> {
 	createSql(builder: MigrationBuilder): void | Promise<void> {}

package/src/modifications/acl/PatchAclSchemaModification.ts

@@ -1,7 +1,7 @@
-import { SchemaUpdater } from '../utils/schemaUpdateUtils'
-import { createModificationType, ModificationHandler } from '../ModificationHandler'
-import { applyPatch, Operation } from 'rfc6902'
-import deepCopy from '../../utils/deepCopy'
+import { SchemaUpdater } from '../utils/schemaUpdateUtils.js'
+import { createModificationType, ModificationHandler } from '../ModificationHandler.js'
+import { Operation } from 'rfc6902'
+import { applyPatchCopyOnWrite } from '../../utils/applyPatchCopyOnWrite.js'
 
 export class PatchAclSchemaModificationHandler implements ModificationHandler<PatchAclSchemaModificationData> {
 	constructor(private readonly data: PatchAclSchemaModificationData) {}
@@ -10,10 +10,9 @@ export class PatchAclSchemaModificationHandler implements ModificationHandler<Pa
 
 	public getSchemaUpdater(): SchemaUpdater {
 		return ({ schema }) => {
-			const acl = deepCopy(schema.acl)
-			const result = applyPatch(acl, this.data.patch).filter(it => it !== null)
-			if (result.length > 0) {
-				throw result[0]
+			const { result: acl, errors } = applyPatchCopyOnWrite(schema.acl, this.data.patch)
+			if (errors.length > 0) {
+				throw errors[0]
 			}
 
 			return {

package/src/modifications/acl/UpdateAclSchemaModification.ts

@@ -1,9 +1,9 @@
 import { Acl, Schema } from '@contember/schema'
-import { SchemaUpdater } from '../utils/schemaUpdateUtils'
-import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler'
+import { SchemaUpdater } from '../utils/schemaUpdateUtils.js'
+import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler.js'
 import deepEqual from 'fast-deep-equal'
 import { createPatch } from 'rfc6902'
-import { patchAclSchemaModification } from './PatchAclSchemaModification'
+import { patchAclSchemaModification } from './PatchAclSchemaModification.js'
 
 export class UpdateAclSchemaModificationHandler implements ModificationHandler<UpdateAclSchemaModificationData> {
 	constructor(private readonly data: UpdateAclSchemaModificationData) {}

package/src/modifications/acl/index.ts

@@ -1,2 +1,2 @@
-export * from './PatchAclSchemaModification'
-export * from './UpdateAclSchemaModification'
+export * from './PatchAclSchemaModification.js'
+export * from './UpdateAclSchemaModification.js'

package/src/modifications/actions/CreateTargetModification.ts

@@ -1,6 +1,6 @@
 import { Actions, Schema } from '@contember/schema'
-import { SchemaUpdater } from '../utils/schemaUpdateUtils'
-import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler'
+import { SchemaUpdater } from '../utils/schemaUpdateUtils.js'
+import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler.js'
 
 export class CreateTargetModificationHandler implements ModificationHandler<CreateTargetModificationData> {
 	constructor(private readonly data: CreateTargetModificationData) {

package/src/modifications/actions/CreateTriggerModification.ts

@@ -1,6 +1,6 @@
 import { Actions, Schema } from '@contember/schema'
-import { SchemaUpdater } from '../utils/schemaUpdateUtils'
-import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler'
+import { SchemaUpdater } from '../utils/schemaUpdateUtils.js'
+import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler.js'
 
 export class CreateTriggerModificationHandler implements ModificationHandler<CreateTriggerModificationData> {
 	constructor(private readonly data: CreateTriggerModificationData) {

package/src/modifications/actions/PatchTriggerModification.ts

@@ -1,8 +1,8 @@
 import { Actions } from '@contember/schema'
-import { SchemaUpdater } from '../utils/schemaUpdateUtils'
-import { createModificationType, ModificationHandler } from '../ModificationHandler'
+import { SchemaUpdater } from '../utils/schemaUpdateUtils.js'
+import { createModificationType, ModificationHandler } from '../ModificationHandler.js'
 import { applyPatch, Operation } from 'rfc6902'
-import deepCopy from '../../utils/deepCopy'
+import deepCopy from '../../utils/deepCopy.js'
 
 export class PatchTriggerModificationHandler implements ModificationHandler<PatchTriggerModificationData> {
 	constructor(private readonly data: PatchTriggerModificationData) {}

package/src/modifications/actions/RemoveTargetModification.ts

@@ -1,6 +1,6 @@
 import { Schema } from '@contember/schema'
-import { SchemaUpdater } from '../utils/schemaUpdateUtils'
-import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler'
+import { SchemaUpdater } from '../utils/schemaUpdateUtils.js'
+import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler.js'
 
 export class RemoveTargetModificationHandler implements ModificationHandler<RemoveTargetModificationData> {
 	constructor(private readonly data: RemoveTargetModificationData) {

package/src/modifications/actions/RemoveTriggerModification.ts

@@ -1,6 +1,6 @@
 import { Schema } from '@contember/schema'
-import { SchemaUpdater } from '../utils/schemaUpdateUtils'
-import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler'
+import { SchemaUpdater } from '../utils/schemaUpdateUtils.js'
+import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler.js'
 
 export class RemoveTriggerModificationHandler implements ModificationHandler<RemoveTriggerModificationData> {
 	constructor(private readonly data: RemoveTriggerModificationData) {

package/src/modifications/actions/UpdateTargetModification.ts

@@ -1,6 +1,6 @@
 import { Actions, Schema } from '@contember/schema'
-import { SchemaUpdater } from '../utils/schemaUpdateUtils'
-import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler'
+import { SchemaUpdater } from '../utils/schemaUpdateUtils.js'
+import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler.js'
 import deepEqual from 'fast-deep-equal'
 
 export class UpdateTargetModificationHandler implements ModificationHandler<UpdateTargetModificationData> {

package/src/modifications/actions/UpdateTriggerModification.ts

@@ -1,9 +1,9 @@
 import { Actions, Schema } from '@contember/schema'
-import { SchemaUpdater } from '../utils/schemaUpdateUtils'
-import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler'
+import { SchemaUpdater } from '../utils/schemaUpdateUtils.js'
+import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler.js'
 import deepEqual from 'fast-deep-equal'
 import { createPatch } from 'rfc6902'
-import { patchTriggerModification } from './PatchTriggerModification'
+import { patchTriggerModification } from './PatchTriggerModification.js'
 
 export class UpdateTriggerModificationHandler implements ModificationHandler<UpdateTriggerModificationData> {
 	constructor(private readonly data: UpdateTriggerModificationData) {

package/src/modifications/actions/index.ts

@@ -1,4 +1,4 @@
-export * from './CreateTriggerModification'
-export * from './RemoveTriggerModification'
-export * from './UpdateTriggerModification'
-export * from './PatchTriggerModification'
+export * from './CreateTriggerModification.js'
+export * from './RemoveTriggerModification.js'
+export * from './UpdateTriggerModification.js'
+export * from './PatchTriggerModification.js'

package/src/modifications/columns/CreateColumnModification.ts

@@ -1,11 +1,12 @@
 import { MigrationBuilder } from '@contember/database-migrations'
 import { JSONValue, Model, Schema } from '@contember/schema'
-import { addField, SchemaUpdater, updateEntity, updateModel } from '../utils/schemaUpdateUtils'
-import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler'
+import { addField, SchemaUpdater, updateEntity, updateModel } from '../utils/schemaUpdateUtils.js'
+import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler.js'
 import { isColumn } from '@contember/schema-utils'
-import { createFields } from '../utils/diffUtils'
-import { getColumnSqlType } from '../utils/columnUtils'
-import { fillSeed, formatSeedExpression } from './columnUtils'
+import { createFields } from '../utils/diffUtils.js'
+import { getColumnSqlType } from '../utils/columnUtils.js'
+import { fillSeed, formatSeedExpression } from './columnUtils.js'
+import { wrapIdentifier } from '../../utils/dbHelpers.js'
 
 export class CreateColumnModificationHandler implements ModificationHandler<CreateColumnModificationData> {
 	constructor(private readonly data: CreateColumnModificationData, private readonly schema: Schema) {}
@@ -32,7 +33,7 @@ export class CreateColumnModificationHandler implements ModificationHandler<Crea
 				type: columnType,
 				notNull: !column.nullable && seedExpression === null,
 				sequenceGenerated: column.sequence,
-				collation: column.collation,
+				collation: column.collation !== undefined ? wrapIdentifier(column.collation) : undefined,
 			},
 		})
 

package/src/modifications/columns/UpdateColumnDefinitionModification.ts

@@ -1,12 +1,12 @@
 import { escapeValue, MigrationBuilder } from '@contember/database-migrations'
 import { JSONValue, Model, Schema } from '@contember/schema'
-import { SchemaUpdater, updateEntity, updateField, updateModel } from '../utils/schemaUpdateUtils'
-import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler'
+import { SchemaUpdater, updateEntity, updateField, updateModel } from '../utils/schemaUpdateUtils.js'
+import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler.js'
 import deepEqual from 'fast-deep-equal'
-import { updateColumns } from '../utils/diffUtils'
-import { wrapIdentifier } from '../../utils/dbHelpers'
-import { getColumnSqlType } from '../utils/columnUtils'
-import { fillSeed, formatSeedExpression } from './columnUtils'
+import { updateColumns } from '../utils/diffUtils.js'
+import { wrapIdentifier } from '../../utils/dbHelpers.js'
+import { getColumnSqlType } from '../utils/columnUtils.js'
+import { fillSeed, formatSeedExpression } from './columnUtils.js'
 
 export class UpdateColumnDefinitionModificationHandler implements ModificationHandler<UpdateColumnDefinitionModificationData> {
 	constructor(private readonly data: UpdateColumnDefinitionModificationData, private readonly schema: Schema) {}

package/src/modifications/columns/UpdateColumnNameModification.ts

@@ -1,8 +1,8 @@
 import { MigrationBuilder } from '@contember/database-migrations'
 import { Model, Schema } from '@contember/schema'
-import { SchemaUpdater, updateEntity, updateField, updateModel } from '../utils/schemaUpdateUtils'
-import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler'
-import { updateColumns } from '../utils/diffUtils'
+import { SchemaUpdater, updateEntity, updateField, updateModel } from '../utils/schemaUpdateUtils.js'
+import { createModificationType, Differ, ModificationHandler } from '../ModificationHandler.js'
+import { updateColumns } from '../utils/diffUtils.js'
 import { acceptFieldVisitor } from '@contember/schema-utils'
 
 export class UpdateColumnNameModificationHandler implements ModificationHandler<UpdateColumnNameModificationData> {

package/src/modifications/columns/columnUtils.ts

@@ -1,4 +1,4 @@
-import { wrapIdentifier } from '../../utils/dbHelpers'
+import { wrapIdentifier } from '../../utils/dbHelpers.js'
 import { JSONValue, Model } from '@contember/schema'
 import { escapeValue, MigrationBuilder } from '@contember/database-migrations'
 import { getColumnName } from '@contember/schema-utils'

package/src/modifications/columns/index.ts

@@ -1,3 +1,3 @@
-export * from './CreateColumnModification'
-export * from './UpdateColumnDefinitionModification'
-export * from './UpdateColumnNameModification'
+export * from './CreateColumnModification.js'
+export * from './UpdateColumnDefinitionModification.js'
+export * from './UpdateColumnNameModification.js'

package/src/modifications/constraints/CreateUniqueConstraintModification.ts

@@ -1,9 +1,9 @@
 import { MigrationBuilder } from '@contember/database-migrations'
 import { Model, Schema } from '@contember/schema'
-import { SchemaUpdater, updateEntity, updateModel } from '../utils/schemaUpdateUtils'
-import { createModificationType, Differ, ModificationHandler, ModificationHandlerCreateSqlOptions } from '../ModificationHandler'
-import { wrapIdentifier } from '../../utils/dbHelpers'
-import { getUniqueConstraintColumns } from './utils'
+import { SchemaUpdater, updateEntity, updateModel } from '../utils/schemaUpdateUtils.js'
+import { createModificationType, Differ, ModificationHandler, ModificationHandlerCreateSqlOptions } from '../ModificationHandler.js'
+import { wrapIdentifier } from '../../utils/dbHelpers.js'
+import { getUniqueConstraintColumns } from './utils.js'
 import deepEqual from 'fast-deep-equal'
 
 export class CreateUniqueConstraintModificationHandler implements ModificationHandler<CreateUniqueConstraintModificationData> {

package/src/modifications/constraints/RemoveUniqueConstraintModification.ts

@@ -1,10 +1,10 @@
 import { MigrationBuilder } from '@contember/database-migrations'
 import { Model, Schema } from '@contember/schema'
-import { SchemaUpdater, updateEntity, updateModel } from '../utils/schemaUpdateUtils'
-import { createModificationType, Differ, ModificationHandler, ModificationHandlerCreateSqlOptions } from '../ModificationHandler'
+import { SchemaUpdater, updateEntity, updateModel } from '../utils/schemaUpdateUtils.js'
+import { createModificationType, Differ, ModificationHandler, ModificationHandlerCreateSqlOptions } from '../ModificationHandler.js'
 import deepEqual from 'fast-deep-equal'
-import { getUniqueConstraintColumns } from './utils'
-import { wrapIdentifier } from '../../utils/dbHelpers'
+import { getUniqueConstraintColumns } from './utils.js'
+import { wrapIdentifier } from '../../utils/dbHelpers.js'
 
 export class RemoveUniqueConstraintModificationHandler implements ModificationHandler<RemoveUniqueConstraintModificationData> {
 	constructor(private readonly data: RemoveUniqueConstraintModificationData, private readonly schema: Schema) {

package/src/modifications/constraints/index.ts

@@ -1,3 +1,3 @@
-export * from './CreateUniqueConstraintModification'
-export * from './RemoveUniqueConstraintModification'
-export * from './utils'
+export * from './CreateUniqueConstraintModification.js'
+export * from './RemoveUniqueConstraintModification.js'
+export * from './utils.js'

package/src/modifications/differs/RemoveChangedFieldDiffer.ts

@@ -1,8 +1,8 @@
-import { Differ } from '../ModificationHandler'
+import { Differ } from '../ModificationHandler.js'
 import { Model, Schema } from '@contember/schema'
-import { updateFields } from '../utils/diffUtils'
+import { updateFields } from '../utils/diffUtils.js'
 import deepEqual from 'fast-deep-equal'
-import { removeFieldModification } from '../fields'
+import { removeFieldModification } from '../fields/index.js'
 
 export class RemoveChangedFieldDiffer implements Differ {
 	constructor(