@contember/schema-migrations 1.1.0-alpha.4 → 1.1.0-alpha.7

package/src/modifications/utils/sqlUpdateUtils.ts

@@ -13,6 +13,10 @@ export const createEventTrigger = (builder: MigrationBuilder, systemSchema: stri
 	})
 }
 
+export const dropEventTrigger = (builder: MigrationBuilder, tableName: Name) => {
+	builder.dropTrigger(tableName, 'log_event')
+}
+
 export const createEventTrxTrigger = (builder: MigrationBuilder, systemSchema: string, tableName: Name) => {
 	builder.createTrigger(tableName, 'log_event_trx', {
 		when: 'AFTER',
@@ -27,3 +31,7 @@ export const createEventTrxTrigger = (builder: MigrationBuilder, systemSchema: s
 		},
 	})
 }
+
+export const dropEventTrxTrigger = (builder: MigrationBuilder, tableName: Name) => {
+	builder.dropTrigger(tableName, 'log_event_trx')
+}

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

@@ -48,6 +48,9 @@ testMigrations('convert one has many to many has many', {
 						columnName: 'category_id',
 						onDelete: 'cascade',
 					},
+					eventLog: {
+						enabled: true,
+					},
 				},
 			},
 			inverseSide: {

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

@@ -32,6 +32,9 @@ testMigrations('create a table (no relations, unique on column)', {
 				primaryColumn: 'id',
 				tableName: 'author',
 				unique: {},
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 		{
@@ -135,6 +138,9 @@ testMigrations('create a view', {
 				tableName: 'author',
 				unique: {},
 				view: { sql: "SELECT null as id, 'John' AS name" },
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 	],

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

@@ -31,6 +31,9 @@ testMigrations('create many has many relation (post with categories)', {
 				primaryColumn: 'id',
 				tableName: 'category',
 				unique: {},
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 		{
@@ -61,6 +64,9 @@ testMigrations('create many has many relation (post with categories)', {
 						columnName: 'category_id',
 						onDelete: Model.OnDelete.cascade,
 					},
+					eventLog: {
+						enabled: true,
+					},
 				},
 			},
 		},

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

@@ -33,6 +33,9 @@ testMigrations('create many has one relation (post with author)', {
 				primaryColumn: 'id',
 				tableName: 'post',
 				unique: {},
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 		{

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

@@ -34,6 +34,9 @@ testMigrations('create one has many relation (post with locales)', {
 				primaryColumn: 'id',
 				tableName: 'post_locale',
 				unique: {},
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 		{

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

@@ -31,6 +31,9 @@ testMigrations('create one has one relation (site with settings)', {
 				primaryColumn: 'id',
 				tableName: 'site',
 				unique: {},
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 		{
@@ -50,6 +53,9 @@ testMigrations('create one has one relation (site with settings)', {
 				primaryColumn: 'id',
 				tableName: 'site_setting',
 				unique: {},
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 		{

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

@@ -65,6 +65,9 @@ testMigrations('create view', {
 				view: {
 					sql: 'SELECT 1',
 				},
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 		{

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

@@ -0,0 +1,54 @@
+import { SchemaDefinition as def } from '@contember/schema-definition'
+import { testMigrations } from '../../src/tests'
+import { SQL } from '../../src/tags'
+
+namespace EventLogNoConfig {
+	export class Author {
+		name = def.stringColumn()
+	}
+}
+
+namespace EventLogDisabled {
+	@def.DisableEventLog()
+	export class Author {
+		name = def.stringColumn()
+	}
+}
+
+
+testMigrations('event log - disable', {
+	originalSchema: def.createModel(EventLogNoConfig),
+	updatedSchema: def.createModel(EventLogDisabled),
+	diff: [
+		{
+			modification: 'toggleEventLog',
+			entityName: 'Author',
+			enabled: false,
+		},
+	],
+	sql: SQL `DROP TRIGGER "log_event" ON "author";
+	DROP TRIGGER "log_event_trx" ON "author";`,
+})
+
+testMigrations('event log - enable', {
+	originalSchema: def.createModel(EventLogDisabled),
+	updatedSchema: def.createModel(EventLogNoConfig),
+	diff: [
+		{
+			modification: 'toggleEventLog',
+			entityName: 'Author',
+			enabled: true,
+		},
+	],
+	sql: SQL`CREATE TRIGGER "log_event"
+		AFTER INSERT OR UPDATE OR DELETE
+		ON "author"
+		FOR EACH ROW
+	EXECUTE PROCEDURE "system"."trigger_event"($pga$id$pga$);
+	CREATE CONSTRAINT TRIGGER "log_event_trx"
+		AFTER INSERT OR UPDATE OR DELETE
+		ON "author"
+		DEFERRABLE INITIALLY DEFERRED
+		FOR EACH ROW
+	EXECUTE PROCEDURE "system"."trigger_event_commit"();`,
+})

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

@@ -0,0 +1,63 @@
+import { SchemaDefinition as def } from '@contember/schema-definition'
+import { testMigrations } from '../../src/tests'
+import { SQL } from '../../src/tags'
+
+namespace EventLogNoConfig {
+	export class Author {
+		name = def.stringColumn()
+		tags = def.manyHasMany(Tag)
+	}
+	export class Tag {
+		name = def.stringColumn()
+	}
+}
+
+namespace EventLogDisabled {
+	export class Author {
+		name = def.stringColumn()
+		tags = def.manyHasMany(Tag).joiningTable({ eventLog: { enabled: false } })
+	}
+
+	export class Tag {
+		name = def.stringColumn()
+	}
+}
+
+testMigrations('event log junction - disable', {
+	originalSchema: def.createModel(EventLogNoConfig),
+	updatedSchema: def.createModel(EventLogDisabled),
+	diff: [
+		{
+			modification: 'toggleJunctionEventLog',
+			entityName: 'Author',
+			fieldName: 'tags',
+			enabled: false,
+		},
+	],
+	sql: SQL `DROP TRIGGER "log_event" ON "author_tags";
+	DROP TRIGGER "log_event_trx" ON "author_tags";`,
+})
+
+testMigrations('event log junction - enable', {
+	originalSchema: def.createModel(EventLogDisabled),
+	updatedSchema: def.createModel(EventLogNoConfig),
+	diff: [
+		{
+			modification: 'toggleJunctionEventLog',
+			entityName: 'Author',
+			fieldName: 'tags',
+			enabled: true,
+		},
+	],
+	sql: SQL`CREATE TRIGGER "log_event"
+		AFTER INSERT OR UPDATE OR DELETE
+		ON "author_tags"
+		FOR EACH ROW
+	EXECUTE PROCEDURE "system"."trigger_event"($pga$author_id$pga$, $pga$tag_id$pga$);
+	CREATE CONSTRAINT TRIGGER "log_event_trx"
+		AFTER INSERT OR UPDATE OR DELETE
+		ON "author_tags"
+		DEFERRABLE INITIALLY DEFERRED
+		FOR EACH ROW
+	EXECUTE PROCEDURE "system"."trigger_event_commit"();`,
+})

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

@@ -22,6 +22,27 @@ testMigrations('rename a field', {
 	noDiff: true,
 })
 
+testMigrations('rename a field with column', {
+	originalSchema: new SchemaBuilder()
+		.entity('Author', e => e.column('firstName', c => c.type(Model.ColumnType.String)))
+		.buildSchema(),
+	updatedSchema: new SchemaBuilder()
+		.entity('Author', e => e.column('name', c => c.type(Model.ColumnType.String)))
+		.buildSchema(),
+	diff: [
+		{
+			modification: 'updateFieldName',
+			entityName: 'Author',
+			fieldName: 'firstName',
+			newFieldName: 'name',
+			columnName: 'name',
+		},
+	],
+	sql: SQL`ALTER TABLE "author" RENAME "first_name" TO "name";`,
+	noDiff: true,
+})
+
+
 testMigrations('rename a field with a constraint', {
 	originalSchema: new SchemaBuilder()
 		.entity('Author', e => e.column('slug', c => c.type(Model.ColumnType.String).unique()))
@@ -65,6 +86,32 @@ testMigrations('rename a relation', {
 	noDiff: true,
 })
 
+
+testMigrations('rename a relation with joining column', {
+	originalSchema: new SchemaBuilder()
+		.entity('Post', e => e.column('title').manyHasOne('user', r => r.target('Author').inversedBy('posts')))
+		.entity('Author', e => e.column('name'))
+		.buildSchema(),
+	updatedSchema: new SchemaBuilder()
+		.entity('Post', e =>
+			e.column('title').manyHasOne('author', r => r.target('Author').inversedBy('posts')),
+		)
+		.entity('Author', e => e.column('name'))
+		.buildSchema(),
+	diff: [
+		{
+			modification: 'updateFieldName',
+			entityName: 'Post',
+			fieldName: 'user',
+			newFieldName: 'author',
+			columnName: 'author_id',
+		},
+	],
+	sql: SQL`ALTER TABLE "post" RENAME "user_id" TO "author_id";`,
+	noDiff: true,
+})
+
+
 testMigrations('rename relation with acl', {
 	originalSchema: new SchemaBuilder()
 		.entity('Post', e => e.column('title').manyHasOne('user', r => r.target('Author').inversedBy('posts')))

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

@@ -80,6 +80,9 @@ testMigrations('update a view 1', {
 				view: {
 					sql: "SELECT null as id, 'Jack' AS name",
 				},
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 		{
@@ -112,6 +115,9 @@ testMigrations('update a view 1', {
 						'Author',
 					],
 				},
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 		{
@@ -144,6 +150,9 @@ testMigrations('update a view 1', {
 						'Author2',
 					],
 				},
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 	],
@@ -215,6 +224,9 @@ testMigrations('update a view 2', {
 						'Author',
 					],
 				},
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 		{
@@ -247,6 +259,9 @@ testMigrations('update a view 2', {
 						'Author2',
 					],
 				},
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 	],
@@ -313,6 +328,9 @@ testMigrations('update a view 3', {
 						'Author2',
 					],
 				},
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 	],
@@ -381,6 +399,9 @@ testMigrations('update a view 4', {
 				view: {
 					sql: "SELECT null as id, 'Jack' AS name",
 				},
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 		{
@@ -413,6 +434,9 @@ testMigrations('update a view 4', {
 						'Author',
 					],
 				},
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 		{
@@ -445,6 +469,9 @@ testMigrations('update a view 4', {
 						'Author2',
 					],
 				},
+				eventLog: {
+					enabled: true,
+				},
 			},
 		},
 	],

package/tests/scripts/checkCreateConsistentMigrations.ts

@@ -6,8 +6,10 @@ import {
 	SchemaDiffer,
 	SchemaMigrator,
 } from '../../src'
-import { emptySchema } from '@contember/schema-utils'
+import { emptySchema, schemaType } from '@contember/schema-utils'
 ;(async () => {
+	// eslint-disable-next-line no-console
+	console.log(relative(process.cwd(), process.argv[2]))
 	const migrationsResolver = new MigrationsResolver(new MigrationFilesManager(relative(process.cwd(), process.argv[2])))
 	const modificationHandlerFactory = new ModificationHandlerFactory(ModificationHandlerFactory.defaultFactoryMap)
 	const differ = new SchemaDiffer(new SchemaMigrator(modificationHandlerFactory))
@@ -15,10 +17,13 @@ import { emptySchema } from '@contember/schema-utils'
 	let schema = emptySchema
 	for (const migration of await migrationsResolver.getMigrations()) {
 		const nextSchema = migrator.applyModifications(schema, migration.modifications, migration.formatVersion)
+		schemaType(nextSchema)
 		differ.diffSchemas(schema, nextSchema)
 
 		schema = nextSchema
 	}
+	// eslint-disable-next-line no-console
+	console.log('OK')
 })().catch(e => {
 	// eslint-disable-next-line no-console
 	console.error(e)

package/tests/src/tests.ts

@@ -1,8 +1,7 @@
 import { Migration, ModificationHandlerFactory, SchemaDiffer, SchemaMigrator, VERSION_LATEST } from '../../src'
 import { Acl, Model } from '@contember/schema'
 import { createMigrationBuilder } from '@contember/database-migrations'
-import * as assert from 'uvu/assert'
-import { suite } from 'uvu'
+import { assert, describe, it } from 'vitest'
 
 const modificationFactory = new ModificationHandlerFactory(ModificationHandlerFactory.defaultFactoryMap)
 const schemaMigrator = new SchemaMigrator(modificationFactory)
@@ -32,13 +31,13 @@ export function testDiffSchemas(
 		{ model: updatedModel, acl: updatedAcl, validation: {} },
 		false,
 	)
-	assert.equal(actualDiff, expectedDiff)
+	assert.deepStrictEqual(actualDiff, expectedDiff)
 	const schema = schemaMigrator.applyModifications(
 		{ model: originalModel, acl: originalAcl, validation: {} },
 		actualDiff,
 		VERSION_LATEST,
 	)
-	assert.equal(schema, {
+	assert.deepStrictEqual(schema, {
 		model: updatedModel,
 		acl: updatedAcl,
 		validation: {},
@@ -58,7 +57,7 @@ export function testApplyDiff(
 		VERSION_LATEST,
 	)
 
-	assert.equal(actualSchema, {
+	assert.deepStrictEqual(actualSchema, {
 		model: expectedModel,
 		acl: expectedAcl,
 		validation: {},
@@ -77,19 +76,19 @@ export function testGenerateSql(originalSchema: Model.Schema, diff: Migration.Mo
 	assert.equal(actual, expectedSql)
 }
 
-export function testMigrations(title: string, ctx: TestContext) {
-	const migrationsSuite = suite<TestContext>(title, ctx)
-	migrationsSuite('diff schemas', ({ originalSchema, updatedSchema, diff, noDiff }) => {
-		if (noDiff) {
-			return
-		}
-		testDiffSchemas(originalSchema, updatedSchema, diff, ctx.originalAcl, ctx.updatedAcl)
+export function testMigrations(title: string, { originalSchema, updatedSchema, diff, noDiff, originalAcl, updatedAcl, sql }: TestContext) {
+	describe(title, () => {
+		it('diff schemas', () => {
+			if (noDiff) {
+				return
+			}
+			testDiffSchemas(originalSchema, updatedSchema, diff, originalAcl, updatedAcl)
+		})
+		it('apply diff', () => {
+			testApplyDiff(originalSchema, diff, updatedSchema, originalAcl, updatedAcl)
+		})
+		it('generate sql', () => {
+			testGenerateSql(originalSchema, diff, sql)
+		})
 	})
-	migrationsSuite('apply diff', ({ originalSchema, diff, updatedSchema }) => {
-		testApplyDiff(originalSchema, diff, updatedSchema, ctx.originalAcl, ctx.updatedAcl)
-	})
-	migrationsSuite('generate sql', ({ originalSchema, diff, sql }) => {
-		testGenerateSql(originalSchema, diff, sql)
-	})
-	migrationsSuite.run()
 }

package/tests/tsconfig.json

@@ -7,6 +7,9 @@
 	"references": [
 		{
 			"path": "../src"
+		},
+		{
+			"path": "../../schema-definition/src"
 		}
 	]
 }