@contember/schema-migrations 1.2.0-alpha.8 → 1.2.0-beta.1

package/tests/cases/integration/updateColumnDefinition.test.ts

@@ -1,7 +1,8 @@
 import { testMigrations } from '../../src/tests'
-import { SchemaBuilder } from '@contember/schema-definition'
+import { SchemaBuilder, SchemaDefinition as def, createSchema } from '@contember/schema-definition'
 import { Model } from '@contember/schema'
 import { SQL } from '../../src/tags'
+import { updateColumnDefinitionModification } from '../../../src'
 
 testMigrations('update column definition', {
 	originalSchema: new SchemaBuilder()
@@ -31,3 +32,139 @@ testMigrations('update column definition', {
 	sql: SQL`ALTER TABLE "author"
 		ALTER "registered_at" SET DATA TYPE timestamptz USING "registered_at"::timestamptz;`,
 })
+
+namespace SeqOrig {
+	export class Author {
+		idSeq = def.intColumn()
+	}
+}
+namespace SeqUpdated {
+	export class Author {
+		idSeq = def.intColumn().notNull().sequence({ start: 10 })
+	}
+}
+testMigrations('add sequence to existing column', {
+	originalSchema: createSchema(SeqOrig).model,
+	updatedSchema: createSchema(SeqUpdated).model,
+	diff: [
+		updateColumnDefinitionModification.createModification({
+			entityName: 'Author',
+			fieldName: 'idSeq',
+			definition: {
+				type: Model.ColumnType.Int,
+				columnType: 'integer',
+				nullable: false,
+				sequence: {
+					precedence: 'BY DEFAULT',
+					start: 10,
+				},
+			},
+		}),
+	],
+	sql: SQL`
+ALTER TABLE "author"
+		ALTER "id_seq" SET DATA TYPE integer USING COALESCE("id_seq"::integer, nextval(PG_GET_SERIAL_SEQUENCE($pga$author$pga$, $pga$id_seq$pga$))),
+		ALTER "id_seq" SET NOT NULL,
+		ALTER "id_seq" ADD GENERATED BY DEFAULT AS IDENTITY (START WITH 10);`,
+})
+
+
+namespace ViewColDepOrig {
+	export class Author {
+		val = def.intColumn()
+	}
+
+	@def.View('SELECT * FROM author', {
+		dependencies: [Author],
+	})
+	export class AuthorMetaX {
+
+	}
+
+	@def.View('SELECT * FROM author_meta_x', {
+		dependencies: [AuthorMetaX],
+	})
+	export class AuthorMetaY {
+	}
+}
+
+namespace ViewColDepUpdated {
+	export class Author {
+		val = def.stringColumn()
+	}
+
+	@def.View('SELECT * FROM author', {
+		dependencies: [Author],
+	})
+	export class AuthorMetaX {
+
+	}
+
+	@def.View('SELECT * FROM author_meta_x', {
+		dependencies: [AuthorMetaX],
+	})
+	export class AuthorMetaY {
+	}
+}
+
+testMigrations('recreate view dependent on entity after changing column type', {
+	originalSchema: createSchema(ViewColDepOrig).model,
+	updatedSchema: createSchema(ViewColDepUpdated).model,
+	diff: [{ modification: 'removeEntity', entityName: 'AuthorMetaY' }, {
+		modification: 'removeEntity',
+		entityName: 'AuthorMetaX',
+	}, {
+		modification: 'updateColumnDefinition',
+		entityName: 'Author',
+		fieldName: 'val',
+		definition: { nullable: true, type: 'String', columnType: 'text' },
+	}, {
+		modification: 'createView',
+		entity: {
+			name: 'AuthorMetaX',
+			primary: 'id',
+			primaryColumn: 'id',
+			unique: {},
+			indexes: {},
+			fields: {
+				id: {
+					name: 'id',
+					columnName: 'id',
+					nullable: false,
+					type: 'Uuid',
+					columnType: 'uuid',
+				},
+			},
+			tableName: 'author_meta_x',
+			eventLog: { enabled: true },
+			view: { sql: 'SELECT * FROM author', dependencies: ['Author'] },
+		},
+	}, {
+		modification: 'createView',
+		entity: {
+			name: 'AuthorMetaY',
+			primary: 'id',
+			primaryColumn: 'id',
+			unique: {},
+			indexes: {},
+			fields: {
+				id: {
+					name: 'id',
+					columnName: 'id',
+					nullable: false,
+					type: 'Uuid',
+					columnType: 'uuid',
+				},
+			},
+			tableName: 'author_meta_y',
+			eventLog: { enabled: true },
+			view: { sql: 'SELECT * FROM author_meta_x', dependencies: ['AuthorMetaX'] },
+		},
+	}],
+	sql: SQL`DROP VIEW "author_meta_y";
+DROP VIEW "author_meta_x";
+ALTER TABLE "author"
+  ALTER "val" SET DATA TYPE text USING "val"::text;
+CREATE VIEW "author_meta_x" AS SELECT * FROM author;
+CREATE VIEW "author_meta_y" AS SELECT * FROM author_meta_x;`,
+})

package/tests/scripts/checkCreateConsistentMigrations.ts

@@ -1,4 +1,4 @@
-import { relative } from 'path'
+import { relative } from 'node:path'
 import {
 	MigrationFilesManager,
 	MigrationsResolver,
@@ -18,7 +18,8 @@ import { emptySchema, schemaType } from '@contember/schema-utils'
 	for (const migration of await migrationsResolver.getMigrations()) {
 		const nextSchema = migrator.applyModifications(schema, migration.modifications, migration.formatVersion)
 		schemaType(nextSchema)
-		differ.diffSchemas(schema, nextSchema)
+		const { meta, ...nextSchemaWithoutMeta } = nextSchema
+		differ.diffSchemas(schema, nextSchemaWithoutMeta)
 
 		schema = nextSchema
 	}

package/tests/src/tests.ts

@@ -2,6 +2,8 @@ import { Migration, ModificationHandlerFactory, SchemaDiffer, SchemaMigrator, VE
 import { Acl, Model } from '@contember/schema'
 import { createMigrationBuilder } from '@contember/database-migrations'
 import { assert, describe, it } from 'vitest'
+import { SchemaWithMeta } from '../../src/modifications/utils/schemaMeta'
+import { emptySchema } from '@contember/schema-utils'
 
 const modificationFactory = new ModificationHandlerFactory(ModificationHandlerFactory.defaultFactoryMap)
 const schemaMigrator = new SchemaMigrator(modificationFactory)
@@ -27,17 +29,24 @@ export function testDiffSchemas(
 	updatedAcl: Acl.Schema = emptyAcl,
 ) {
 	const actualDiff = schemaDiffer.diffSchemas(
-		{ model: originalModel, acl: originalAcl, validation: {} },
-		{ model: updatedModel, acl: updatedAcl, validation: {} },
-		false,
+		{ ...emptySchema, model: originalModel, acl: originalAcl, validation: {} },
+		{ ...emptySchema, model: updatedModel, acl: updatedAcl, validation: {} },
+		{ skipRecreateValidation: true },
 	)
-	assert.deepStrictEqual(actualDiff, expectedDiff)
-	const schema = schemaMigrator.applyModifications(
-		{ model: originalModel, acl: originalAcl, validation: {} },
+	try {
+		assert.deepStrictEqual(actualDiff, expectedDiff)
+	} catch (e) {
+		// eslint-disable-next-line no-console
+		console.log(JSON.stringify(actualDiff))
+		throw e
+	}
+	const { meta, ...schema } = schemaMigrator.applyModifications(
+		{ ...emptySchema, model: originalModel, acl: originalAcl, validation: {} },
 		actualDiff,
 		VERSION_LATEST,
-	)
+	) as SchemaWithMeta
 	assert.deepStrictEqual(schema, {
+		...emptySchema,
 		model: updatedModel,
 		acl: updatedAcl,
 		validation: {},
@@ -51,13 +60,14 @@ export function testApplyDiff(
 	originalAcl: Acl.Schema = emptyAcl,
 	expectedAcl: Acl.Schema = emptyAcl,
 ) {
-	const actualSchema = schemaMigrator.applyModifications(
-		{ model: originalModel, acl: originalAcl, validation: {} },
+	const { meta, ...actualSchema } = schemaMigrator.applyModifications(
+		{ ...emptySchema, model: originalModel, acl: originalAcl, validation: {} },
 		diff,
 		VERSION_LATEST,
-	)
+	) as SchemaWithMeta
 
 	assert.deepStrictEqual(actualSchema, {
+		...emptySchema,
 		model: expectedModel,
 		acl: expectedAcl,
 		validation: {},
@@ -65,7 +75,7 @@ export function testApplyDiff(
 }
 
 export function testGenerateSql(originalSchema: Model.Schema, diff: Migration.Modification[], expectedSql: string) {
-	let schema = { model: originalSchema, acl: emptyAcl, validation: {} }
+	let schema = { ...emptySchema, model: originalSchema, acl: emptyAcl, validation: {} }
 	const builder = createMigrationBuilder()
 	for (let { modification, ...data } of diff) {
 		const modificationHandler = modificationFactory.create(modification, data, schema, { formatVersion: VERSION_LATEST, systemSchema: 'system' })

package/dist/src/modifications/relations/ToggleManyHasManyEventLogModification.d.ts

@@ -1,8 +0,0 @@
-import { ModificationHandlerStatic } from '../ModificationHandler';
-export declare const ToggleJunctionEventLogModification: ModificationHandlerStatic<ToggleJunctionEventLogModificationData>;
-export interface ToggleJunctionEventLogModificationData {
-    entityName: string;
-    fieldName: string;
-    enabled: boolean;
-}
-//# sourceMappingURL=ToggleManyHasManyEventLogModification.d.ts.map

package/dist/src/modifications/relations/ToggleManyHasManyEventLogModification.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"ToggleManyHasManyEventLogModification.d.ts","sourceRoot":"","sources":["../../../../src/modifications/relations/ToggleManyHasManyEventLogModification.ts"],"names":[],"mappings":"AAGA,OAAO,EAA8B,yBAAyB,EAAE,MAAM,wBAAwB,CAAA;AAW9F,eAAO,MAAM,kCAAkC,EAAE,yBAAyB,CAAC,sCAAsC,CAiFhH,CAAA;AAED,MAAM,WAAW,sCAAsC;IACtD,UAAU,EAAE,MAAM,CAAA;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,OAAO,EAAE,OAAO,CAAA;CAChB"}

package/dist/src/modifications/relations/ToggleManyHasManyEventLogModification.js

@@ -1,81 +0,0 @@
-"use strict";
-var _a;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ToggleJunctionEventLogModification = void 0;
-const schema_1 = require("@contember/schema");
-const schemaUpdateUtils_1 = require("../utils/schemaUpdateUtils");
-const sqlUpdateUtils_1 = require("../utils/sqlUpdateUtils");
-const schema_utils_1 = require("@contember/schema-utils");
-const diffUtils_1 = require("../utils/diffUtils");
-const isIt_1 = require("../../utils/isIt");
-exports.ToggleJunctionEventLogModification = (_a = class {
-        constructor(data, schema, options) {
-            this.data = data;
-            this.schema = schema;
-            this.options = options;
-        }
-        createSql(builder) {
-            const entity = this.schema.model.entities[this.data.entityName];
-            const relation = entity.fields[this.data.fieldName];
-            if (!(0, schema_utils_1.isRelation)(relation) || relation.type !== schema_1.Model.RelationType.ManyHasMany || !(0, schema_utils_1.isOwningRelation)(relation)) {
-                throw new Error('invalid field');
-            }
-            const tableName = relation.joiningTable.tableName;
-            if (this.data.enabled) {
-                const primaryColumns = [
-                    relation.joiningTable.joiningColumn.columnName,
-                    relation.joiningTable.inverseJoiningColumn.columnName,
-                ];
-                (0, sqlUpdateUtils_1.createEventTrigger)(builder, this.options.systemSchema, tableName, primaryColumns);
-                (0, sqlUpdateUtils_1.createEventTrxTrigger)(builder, this.options.systemSchema, tableName);
-            }
-            else {
-                (0, sqlUpdateUtils_1.dropEventTrigger)(builder, tableName);
-                (0, sqlUpdateUtils_1.dropEventTrxTrigger)(builder, tableName);
-            }
-        }
-        getSchemaUpdater() {
-            const { entityName, fieldName, enabled } = this.data;
-            return (0, schemaUpdateUtils_1.updateModel)((0, schemaUpdateUtils_1.updateEntity)(entityName, (0, schemaUpdateUtils_1.updateField)(fieldName, ({ field: { joiningTable: { eventLog, ...joiningTable }, ...field } }) => {
-                return {
-                    ...field,
-                    joiningTable: {
-                        ...joiningTable,
-                        eventLog: {
-                            enabled,
-                        },
-                    },
-                };
-            })));
-        }
-        describe() {
-            return {
-                message: `${this.data.enabled ? 'Enable' : 'Disable'} event log for ${this.data.entityName}.${this.data.fieldName}`,
-            };
-        }
-        static createModification(data) {
-            return { modification: this.id, ...data };
-        }
-        static createDiff(originalSchema, updatedSchema) {
-            return (0, diffUtils_1.updateRelations)(originalSchema, updatedSchema, ({ originalRelation, updatedRelation, updatedEntity }) => {
-                var _a, _b, _c, _d;
-                if (originalRelation.type === updatedRelation.type &&
-                    (0, isIt_1.isIt)(updatedRelation, 'joiningTable') &&
-                    (0, isIt_1.isIt)(originalRelation, 'joiningTable')) {
-                    const newValue = (_b = (_a = updatedRelation.joiningTable.eventLog) === null || _a === void 0 ? void 0 : _a.enabled) !== null && _b !== void 0 ? _b : false;
-                    const oldValue = (_d = (_c = originalRelation.joiningTable.eventLog) === null || _c === void 0 ? void 0 : _c.enabled) !== null && _d !== void 0 ? _d : false;
-                    if (newValue !== oldValue) {
-                        return exports.ToggleJunctionEventLogModification.createModification({
-                            entityName: updatedEntity.name,
-                            fieldName: updatedRelation.name,
-                            enabled: newValue,
-                        });
-                    }
-                }
-                return undefined;
-            });
-        }
-    },
-    _a.id = 'toggleJunctionEventLog',
-    _a);
-//# sourceMappingURL=ToggleManyHasManyEventLogModification.js.map

package/dist/src/modifications/relations/ToggleManyHasManyEventLogModification.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ToggleManyHasManyEventLogModification.js","sourceRoot":"","sources":["../../../../src/modifications/relations/ToggleManyHasManyEventLogModification.ts"],"names":[],"mappings":"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"}