@contember/schema-migrations 1.3.0-rc.2 → 1.3.0

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

@@ -4,20 +4,24 @@ import { Model } from '@contember/schema'
 import { SQL } from '../../src/tags'
 
 testMigrations('enable orphan removal', {
-	originalSchema: new SchemaBuilder()
-		.entity('Post', entity =>
-			entity.column('name', c => c.type(Model.ColumnType.String)).oneHasOne('content', r => r.target('Content')),
-		)
-		.entity('Content', e => e.column('text', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
-	updatedSchema: new SchemaBuilder()
-		.entity('Post', entity =>
-			entity
-				.column('name', c => c.type(Model.ColumnType.String))
-				.oneHasOne('content', r => r.target('Content').removeOrphan()),
-		)
-		.entity('Content', e => e.column('text', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
+	original: {
+		model: new SchemaBuilder()
+			.entity('Post', entity =>
+				entity.column('name', c => c.type(Model.ColumnType.String)).oneHasOne('content', r => r.target('Content')),
+			)
+			.entity('Content', e => e.column('text', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
+	updated: {
+		model: new SchemaBuilder()
+			.entity('Post', entity =>
+				entity
+					.column('name', c => c.type(Model.ColumnType.String))
+					.oneHasOne('content', r => r.target('Content').removeOrphan()),
+			)
+			.entity('Content', e => e.column('text', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
 	diff: [
 		{
 			modification: 'enableOrphanRemoval',

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

@@ -4,12 +4,16 @@ import { Model } from '@contember/schema'
 import { SQL } from '../../src/tags'
 
 testMigrations('make column not null', {
-	originalSchema: new SchemaBuilder()
-		.entity('Author', e => e.column('name', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
-	updatedSchema: new SchemaBuilder()
-		.entity('Author', e => e.column('name', c => c.type(Model.ColumnType.String).notNull()))
-		.buildSchema(),
+	original: {
+		model: new SchemaBuilder()
+			.entity('Author', e => e.column('name', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
+	updated: {
+		model: new SchemaBuilder()
+			.entity('Author', e => e.column('name', c => c.type(Model.ColumnType.String).notNull()))
+			.buildSchema(),
+	},
 	diff: [
 		{
 			modification: 'updateColumnDefinition',

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

@@ -4,20 +4,24 @@ import { Model } from '@contember/schema'
 import { SQL } from '../../src/tags'
 
 testMigrations('make relation not null', {
-	originalSchema: new SchemaBuilder()
-		.entity('Post', entity =>
-			entity.column('name', c => c.type(Model.ColumnType.String)).manyHasOne('category', r => r.target('Category')),
-		)
-		.entity('Category', e => e.column('name', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
-	updatedSchema: new SchemaBuilder()
-		.entity('Post', entity =>
-			entity
-				.column('name', c => c.type(Model.ColumnType.String))
-				.manyHasOne('category', r => r.target('Category').notNull()),
-		)
-		.entity('Category', e => e.column('name', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
+	original: {
+		model: new SchemaBuilder()
+			.entity('Post', entity =>
+				entity.column('name', c => c.type(Model.ColumnType.String)).manyHasOne('category', r => r.target('Category')),
+			)
+			.entity('Category', e => e.column('name', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
+	updated: {
+		model: new SchemaBuilder()
+			.entity('Post', entity =>
+				entity
+					.column('name', c => c.type(Model.ColumnType.String))
+					.manyHasOne('category', r => r.target('Category').notNull()),
+			)
+			.entity('Category', e => e.column('name', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
 	diff: [
 		{
 			modification: 'makeRelationNotNull',

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

@@ -4,20 +4,24 @@ import { Model } from '@contember/schema'
 import { SQL } from '../../src/tags'
 
 testMigrations('make relation nullable', {
-	originalSchema: new SchemaBuilder()
-		.entity('Post', entity =>
-			entity
-				.column('name', c => c.type(Model.ColumnType.String))
-				.manyHasOne('category', r => r.target('Category').notNull()),
-		)
-		.entity('Category', e => e.column('name', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
-	updatedSchema: new SchemaBuilder()
-		.entity('Post', entity =>
-			entity.column('name', c => c.type(Model.ColumnType.String)).manyHasOne('category', r => r.target('Category')),
-		)
-		.entity('Category', e => e.column('name', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
+	original: {
+		model: new SchemaBuilder()
+			.entity('Post', entity =>
+				entity
+					.column('name', c => c.type(Model.ColumnType.String))
+					.manyHasOne('category', r => r.target('Category').notNull()),
+			)
+			.entity('Category', e => e.column('name', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
+	updated: {
+		model: new SchemaBuilder()
+			.entity('Post', entity =>
+				entity.column('name', c => c.type(Model.ColumnType.String)).manyHasOne('category', r => r.target('Category')),
+			)
+			.entity('Category', e => e.column('name', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
 	diff: [
 		{
 			modification: 'makeRelationNullable',
@@ -30,14 +34,18 @@ testMigrations('make relation nullable', {
 })
 
 testMigrations('make inverse relation nullable', {
-	originalSchema: new SchemaBuilder()
-		.entity('Post', entity => entity.column('name', c => c.type(Model.ColumnType.String)))
-		.entity('Link', e => e.oneHasOne('post', r => r.target('Post').inverseNotNull().inversedBy('link')))
-		.buildSchema(),
-	updatedSchema: new SchemaBuilder()
-		.entity('Post', entity => entity.column('name', c => c.type(Model.ColumnType.String)))
-		.entity('Link', e => e.oneHasOne('post', r => r.target('Post').inversedBy('link')))
-		.buildSchema(),
+	original: {
+		model: new SchemaBuilder()
+			.entity('Post', entity => entity.column('name', c => c.type(Model.ColumnType.String)))
+			.entity('Link', e => e.oneHasOne('post', r => r.target('Post').inverseNotNull().inversedBy('link')))
+			.buildSchema(),
+	},
+	updated: {
+		model: new SchemaBuilder()
+			.entity('Post', entity => entity.column('name', c => c.type(Model.ColumnType.String)))
+			.entity('Link', e => e.oneHasOne('post', r => r.target('Post').inversedBy('link')))
+			.buildSchema(),
+	},
 	diff: [
 		{
 			modification: 'makeRelationNullable',

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

@@ -4,23 +4,27 @@ import { Model } from '@contember/schema'
 import { SQL } from '../../src/tags'
 
 testMigrations('patch acl', {
-	originalSchema: new SchemaBuilder()
-		.entity('Site', entity => entity.column('name', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
-	updatedSchema: new SchemaBuilder()
-		.entity('Site', entity => entity.column('name', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
-	updatedAcl: {
-		roles: {
-			admin: {
-				variables: {},
-				stages: '*',
-				entities: {
-					Site: {
-						predicates: {},
-						operations: {
-							read: {
-								id: true,
+	original: {
+		model: new SchemaBuilder()
+			.entity('Site', entity => entity.column('name', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
+	updated: {
+		model: new SchemaBuilder()
+			.entity('Site', entity => entity.column('name', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+		acl: {
+			roles: {
+				admin: {
+					variables: {},
+					stages: '*',
+					entities: {
+						Site: {
+							predicates: {},
+							operations: {
+								read: {
+									id: true,
+								},
 							},
 						},
 					},

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

@@ -1,21 +1,25 @@
 import { testMigrations } from '../../src/tests'
-import { SchemaBuilder } from '@contember/schema-definition'
+import { createSchema, SchemaBuilder } from '@contember/schema-definition'
 import { Acl, Model } from '@contember/schema'
 import { SQL } from '../../src/tags'
 import { SchemaDefinition as def } from '@contember/schema-definition'
 
 testMigrations('remove an entity', {
-	originalSchema: new SchemaBuilder()
-		.entity('Author', e => e.column('name', c => c.type(Model.ColumnType.String)))
-		.entity('Post', e =>
-			e
-				.column('title', c => c.type(Model.ColumnType.String))
-				.manyHasOne('author', r => r.target('Author').onDelete(Model.OnDelete.cascade)),
-		)
-		.buildSchema(),
-	updatedSchema: new SchemaBuilder()
-		.entity('Post', e => e.column('title', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
+	original: {
+		model: new SchemaBuilder()
+			.entity('Author', e => e.column('name', c => c.type(Model.ColumnType.String)))
+			.entity('Post', e =>
+				e
+					.column('title', c => c.type(Model.ColumnType.String))
+					.manyHasOne('author', r => r.target('Author').onDelete(Model.OnDelete.cascade)),
+			)
+			.buildSchema(),
+	},
+	updated: {
+		model: new SchemaBuilder()
+			.entity('Post', e => e.column('title', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
 	diff: [
 		{
 			modification: 'removeEntity',
@@ -26,36 +30,38 @@ testMigrations('remove an entity', {
 })
 
 testMigrations('remove entity with acl', {
-	originalSchema: new SchemaBuilder()
-		.entity('Site', entity => entity.column('name', c => c.type(Model.ColumnType.String)))
-		.entity('Post', entity => entity.column('title').manyHasOne('site', r => r.target('Site')))
-		.buildSchema(),
-	originalAcl: {
-		roles: {
-			admin: {
-				variables: {
-					siteId: {
-						type: Acl.VariableType.entity,
-						entityName: 'Site',
-					},
-				},
-				stages: '*',
-				entities: {
-					Site: {
-						predicates: {},
-						operations: {
-							read: {
-								id: true,
-							},
+	original: {
+		model: new SchemaBuilder()
+			.entity('Site', entity => entity.column('name', c => c.type(Model.ColumnType.String)))
+			.entity('Post', entity => entity.column('title').manyHasOne('site', r => r.target('Site')))
+			.buildSchema(),
+		acl: {
+			roles: {
+				admin: {
+					variables: {
+						siteId: {
+							type: Acl.VariableType.entity,
+							entityName: 'Site',
 						},
 					},
-					Post: {
-						predicates: {
-							site: { site: { id: 'siteId' } },
+					stages: '*',
+					entities: {
+						Site: {
+							predicates: {},
+							operations: {
+								read: {
+									id: true,
+								},
+							},
 						},
-						operations: {
-							read: {
-								title: 'site',
+						Post: {
+							predicates: {
+								site: { site: { id: 'siteId' } },
+							},
+							operations: {
+								read: {
+									title: 'site',
+								},
 							},
 						},
 					},
@@ -63,20 +69,22 @@ testMigrations('remove entity with acl', {
 			},
 		},
 	},
-	updatedSchema: new SchemaBuilder().entity('Post', entity => entity.column('title')).buildSchema(),
-	updatedAcl: {
-		roles: {
-			admin: {
-				variables: {},
-				stages: '*',
-				entities: {
-					Post: {
-						predicates: {
-							site: {},
-						},
-						operations: {
-							read: {
-								title: 'site',
+	updated: {
+		model: new SchemaBuilder().entity('Post', entity => entity.column('title')).buildSchema(),
+		acl: {
+			roles: {
+				admin: {
+					variables: {},
+					stages: '*',
+					entities: {
+						Post: {
+							predicates: {
+								site: {},
+							},
+							operations: {
+								read: {
+									title: 'site',
+								},
 							},
 						},
 					},
@@ -100,8 +108,8 @@ namespace ViewEntityOriginalSchema {
 	}
 }
 testMigrations('remove a view', {
-	originalSchema: def.createModel(ViewEntityOriginalSchema),
-	updatedSchema: new SchemaBuilder().buildSchema(),
+	original: createSchema(ViewEntityOriginalSchema),
+	updated: {},
 	diff: [
 		{
 			modification: 'removeEntity',

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

@@ -4,17 +4,21 @@ import { Model } from '@contember/schema'
 import { SQL } from '../../src/tags'
 
 testMigrations('remove enum', {
-	originalSchema: new SchemaBuilder()
-		.entity('Post', e =>
-			e
-				.column('title', c => c.type(Model.ColumnType.String))
-				.column('status', c => c.type(Model.ColumnType.Enum, { enumName: 'postStatus' })),
-		)
-		.enum('postStatus', ['publish', 'draft'])
-		.buildSchema(),
-	updatedSchema: new SchemaBuilder()
-		.entity('Post', e => e.column('title', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
+	original: {
+		model: new SchemaBuilder()
+			.entity('Post', e =>
+				e
+					.column('title', c => c.type(Model.ColumnType.String))
+					.column('status', c => c.type(Model.ColumnType.Enum, { enumName: 'postStatus' })),
+			)
+			.enum('postStatus', ['publish', 'draft'])
+			.buildSchema(),
+	},
+	updated: {
+		model: new SchemaBuilder()
+			.entity('Post', e => e.column('title', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
 	diff: [
 		{
 			modification: 'removeField',

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

@@ -1,23 +1,27 @@
 import { testMigrations } from '../../src/tests'
-import { SchemaBuilder } from '@contember/schema-definition'
+import { createSchema, SchemaBuilder } from '@contember/schema-definition'
 import { Model } from '@contember/schema'
 import { SQL } from '../../src/tags'
 import { SchemaDefinition as def } from '@contember/schema-definition'
 
 
 testMigrations('remove relation (many has one)', {
-	originalSchema: new SchemaBuilder()
-		.entity('Author', e => e.column('name', c => c.type(Model.ColumnType.String)))
-		.entity('Post', e =>
-			e
-				.column('title', c => c.type(Model.ColumnType.String))
-				.manyHasOne('author', r => r.target('Author').onDelete(Model.OnDelete.cascade)),
-		)
-		.buildSchema(),
-	updatedSchema: new SchemaBuilder()
-		.entity('Author', e => e.column('name', c => c.type(Model.ColumnType.String)))
-		.entity('Post', e => e.column('title', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
+	original: {
+		model: new SchemaBuilder()
+			.entity('Author', e => e.column('name', c => c.type(Model.ColumnType.String)))
+			.entity('Post', e =>
+				e
+					.column('title', c => c.type(Model.ColumnType.String))
+					.manyHasOne('author', r => r.target('Author').onDelete(Model.OnDelete.cascade)),
+			)
+			.buildSchema(),
+	},
+	updated: {
+		model: new SchemaBuilder()
+			.entity('Author', e => e.column('name', c => c.type(Model.ColumnType.String)))
+			.entity('Post', e => e.column('title', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
 	diff: [
 		{
 			modification: 'removeField',
@@ -30,21 +34,25 @@ testMigrations('remove relation (many has one)', {
 })
 
 testMigrations('remove relation (one has many)', {
-	originalSchema: new SchemaBuilder()
-		.entity('Post', e => e.oneHasMany('locales', r => r.target('PostLocale').ownerNotNull().ownedBy('post')))
-		.entity('PostLocale', e =>
-			e
-				.unique(['post', 'locale'])
-				.column('title', c => c.type(Model.ColumnType.String))
-				.column('locale', c => c.type(Model.ColumnType.String)),
-		)
-		.buildSchema(),
-	updatedSchema: new SchemaBuilder()
-		.entity('Post', e => e)
-		.entity('PostLocale', e =>
-			e.column('title', c => c.type(Model.ColumnType.String)).column('locale', c => c.type(Model.ColumnType.String)),
-		)
-		.buildSchema(),
+	original: {
+		model: new SchemaBuilder()
+			.entity('Post', e => e.oneHasMany('locales', r => r.target('PostLocale').ownerNotNull().ownedBy('post')))
+			.entity('PostLocale', e =>
+				e
+					.unique(['post', 'locale'])
+					.column('title', c => c.type(Model.ColumnType.String))
+					.column('locale', c => c.type(Model.ColumnType.String)),
+			)
+			.buildSchema(),
+	},
+	updated: {
+		model: new SchemaBuilder()
+			.entity('Post', e => e)
+			.entity('PostLocale', e =>
+				e.column('title', c => c.type(Model.ColumnType.String)).column('locale', c => c.type(Model.ColumnType.String)),
+			)
+			.buildSchema(),
+	},
 	diff: [
 		{
 			entityName: 'PostLocale',
@@ -62,16 +70,20 @@ testMigrations('remove relation (one has many)', {
 })
 
 testMigrations('remove relation (many has many)', {
-	originalSchema: new SchemaBuilder()
-		.entity('Post', e =>
-			e.column('title', c => c.type(Model.ColumnType.String)).manyHasMany('categories', r => r.target('Category')),
-		)
-		.entity('Category', e => e.column('title', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
-	updatedSchema: new SchemaBuilder()
-		.entity('Post', e => e.column('title', c => c.type(Model.ColumnType.String)))
-		.entity('Category', e => e.column('title', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
+	original: {
+		model: new SchemaBuilder()
+			.entity('Post', e =>
+				e.column('title', c => c.type(Model.ColumnType.String)).manyHasMany('categories', r => r.target('Category')),
+			)
+			.entity('Category', e => e.column('title', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
+	updated: {
+		model: new SchemaBuilder()
+			.entity('Post', e => e.column('title', c => c.type(Model.ColumnType.String)))
+			.entity('Category', e => e.column('title', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
 	diff: [
 		{
 			modification: 'removeField',
@@ -83,18 +95,22 @@ testMigrations('remove relation (many has many)', {
 })
 
 testMigrations('remove relation (one has one)', {
-	originalSchema: new SchemaBuilder()
-		.entity('Site', entity =>
-			entity
-				.column('name', c => c.type(Model.ColumnType.String))
-				.oneHasOne('setting', r => r.target('SiteSetting').inversedBy('site')),
-		)
-		.entity('SiteSetting', e => e.column('url', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
-	updatedSchema: new SchemaBuilder()
-		.entity('Site', entity => entity.column('name', c => c.type(Model.ColumnType.String)))
-		.entity('SiteSetting', e => e.column('url', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
+	original: {
+		model: new SchemaBuilder()
+			.entity('Site', entity =>
+				entity
+					.column('name', c => c.type(Model.ColumnType.String))
+					.oneHasOne('setting', r => r.target('SiteSetting').inversedBy('site')),
+			)
+			.entity('SiteSetting', e => e.column('url', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
+	updated: {
+		model: new SchemaBuilder()
+			.entity('Site', entity => entity.column('name', c => c.type(Model.ColumnType.String)))
+			.entity('SiteSetting', e => e.column('url', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
 	diff: [
 		{
 			modification: 'removeField',
@@ -106,20 +122,24 @@ testMigrations('remove relation (one has one)', {
 })
 
 testMigrations('remove relation inverse side', {
-	originalSchema: new SchemaBuilder()
-		.entity('Site', entity =>
-			entity
-				.column('name', c => c.type(Model.ColumnType.String))
-				.oneHasOne('setting', r => r.target('SiteSetting').inversedBy('site')),
-		)
-		.entity('SiteSetting', e => e.column('url', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
-	updatedSchema: new SchemaBuilder()
-		.entity('Site', entity =>
-			entity.column('name', c => c.type(Model.ColumnType.String)).oneHasOne('setting', r => r.target('SiteSetting')),
-		)
-		.entity('SiteSetting', e => e.column('url', c => c.type(Model.ColumnType.String)))
-		.buildSchema(),
+	original: {
+		model: new SchemaBuilder()
+			.entity('Site', entity =>
+				entity
+					.column('name', c => c.type(Model.ColumnType.String))
+					.oneHasOne('setting', r => r.target('SiteSetting').inversedBy('site')),
+			)
+			.entity('SiteSetting', e => e.column('url', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
+	updated: {
+		model: new SchemaBuilder()
+			.entity('Site', entity =>
+				entity.column('name', c => c.type(Model.ColumnType.String)).oneHasOne('setting', r => r.target('SiteSetting')),
+			)
+			.entity('SiteSetting', e => e.column('url', c => c.type(Model.ColumnType.String)))
+			.buildSchema(),
+	},
 	diff: [
 		{
 			modification: 'removeField',
@@ -160,8 +180,8 @@ namespace DropIndexUpSchema {
 
 
 testMigrations('test drop index / unique when removing a field', {
-	originalSchema: def.createModel(DropIndexOrigSchema),
-	updatedSchema: def.createModel(DropIndexUpSchema),
+	original: createSchema(DropIndexOrigSchema),
+	updated: createSchema(DropIndexUpSchema),
 	diff: [{
 		modification: 'removeField',
 		entityName: 'Article',

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

@@ -1,4 +1,4 @@
-import { SchemaDefinition as def } from '@contember/schema-definition'
+import { createSchema, SchemaDefinition as def } from '@contember/schema-definition'
 import { testMigrations } from '../../src/tests'
 import { SQL } from '../../src/tags'
 
@@ -17,8 +17,8 @@ namespace EventLogDisabled {
 
 
 testMigrations('event log - disable', {
-	originalSchema: def.createModel(EventLogNoConfig),
-	updatedSchema: def.createModel(EventLogDisabled),
+	original: createSchema(EventLogNoConfig),
+	updated: createSchema(EventLogDisabled),
 	diff: [
 		{
 			modification: 'toggleEventLog',
@@ -31,8 +31,8 @@ testMigrations('event log - disable', {
 })
 
 testMigrations('event log - enable', {
-	originalSchema: def.createModel(EventLogDisabled),
-	updatedSchema: def.createModel(EventLogNoConfig),
+	original: createSchema(EventLogDisabled),
+	updated: createSchema(EventLogNoConfig),
 	diff: [
 		{
 			modification: 'toggleEventLog',