@contember/engine-content-api 1.2.1 → 1.3.0-alpha.2

package/src/schema/mutations/CreateEntityInputFieldVisitor.ts

@@ -23,9 +23,7 @@ export class CreateEntityInputFieldVisitor implements
 			return undefined
 		}
 		const type = this.columnTypeResolver.getType(column)
-		return {
-			type,
-		}
+		return { type }
 	}
 
 	public visitHasOne({ entity, relation }: Model.AnyHasOneRelationContext): GraphQLInputFieldConfig | undefined {
@@ -33,9 +31,7 @@ export class CreateEntityInputFieldVisitor implements
 		if (type === undefined) {
 			return undefined
 		}
-		return {
-			type,
-		}
+		return { type }
 	}
 
 	public visitHasMany({ entity, relation }: Model.AnyHasManyRelationContext): GraphQLInputFieldConfig | undefined {

package/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.ts

@@ -58,10 +58,12 @@ export class CreateEntityRelationAllowedOperationsVisitor implements
 		if (canReadTargetEntity && canCreateOwning) {
 			result.push(Input.CreateRelationOperation.connect)
 		}
-
 		if (canCreateTargetEntity && canCreateOwning) {
 			result.push(Input.CreateRelationOperation.create)
 		}
+		if (canReadTargetEntity && canCreateTargetEntity && canCreateOwning) {
+			result.push(Input.CreateRelationOperation.connectOrCreate)
+		}
 
 		return result
 	}

package/src/schema/mutations/CreateEntityRelationInputFieldVisitor.ts

@@ -7,6 +7,7 @@ import { EntityInputProvider, EntityInputType } from './EntityInputProvider'
 import { CreateEntityRelationAllowedOperationsVisitor } from './CreateEntityRelationAllowedOperationsVisitor'
 import { acceptFieldVisitor } from '@contember/schema-utils'
 import { ImplementationException } from '../../exception'
+import { ConnectOrCreateRelationInputProvider } from './ConnectOrCreateRelationInputProvider'
 
 export class CreateEntityRelationInputFieldVisitor implements
 	Model.ColumnVisitor<never>,
@@ -15,10 +16,9 @@ export class CreateEntityRelationInputFieldVisitor implements
 	constructor(
 		private readonly schema: Model.Schema,
 		private readonly whereTypeBuilder: WhereTypeProvider,
-		private readonly createEntityInputProviderAccessor: Accessor<
-			Interface<EntityInputProvider<EntityInputType.create>>
-		>,
+		private readonly createEntityInputProviderAccessor: Accessor<Interface<EntityInputProvider<EntityInputType.create>>>,
 		private readonly createEntityRelationAllowedOperationsVisitor: CreateEntityRelationAllowedOperationsVisitor,
+		private readonly connectOrCreateRelationInputProvider: ConnectOrCreateRelationInputProvider,
 	) {}
 
 	public visitColumn(): never {
@@ -46,12 +46,10 @@ export class CreateEntityRelationInputFieldVisitor implements
 			this.createEntityRelationAllowedOperationsVisitor,
 		)
 
-		if (allowedOperations.includes(Input.CreateRelationOperation.connect)) {
-			const uniqueWhere = this.whereTypeBuilder.getEntityUniqueWhereType(targetEntity.name)
-			if (uniqueWhere) {
-				fields[Input.CreateRelationOperation.connect] = {
-					type: uniqueWhere,
-				}
+		const uniqueWhere = this.whereTypeBuilder.getEntityUniqueWhereType(targetEntity.name)
+		if (allowedOperations.includes(Input.CreateRelationOperation.connect) && uniqueWhere) {
+			fields[Input.CreateRelationOperation.connect] = {
+				type: uniqueWhere,
 			}
 		}
 
@@ -61,18 +59,25 @@ export class CreateEntityRelationInputFieldVisitor implements
 				type: createInput,
 			}
 		}
+		if (allowedOperations.includes(Input.CreateRelationOperation.connectOrCreate) && uniqueWhere !== undefined && createInput !== undefined) {
+			const connectOrCreateInput = this.connectOrCreateRelationInputProvider.getInput(entity.name, relation.name)
+			if (connectOrCreateInput) {
+				fields[Input.CreateRelationOperation.connectOrCreate] = {
+					type: connectOrCreateInput,
+				}
+			}
+		}
 		if (Object.keys(fields).length === 0) {
 			return undefined
 		}
 		return new GraphQLInputObjectType({
 			name: GqlTypeName`${entity.name}Create${relation.name}EntityRelationInput`,
-			fields: () =>
-				withAliasField
-					? {
-						...fields,
-						alias: { type: GraphQLString },
+			fields: () => withAliasField
+				? {
+					...fields,
+					alias: { type: GraphQLString },
 					  }
-					: fields,
+				: fields,
 		})
 	}
 }

package/src/schema/mutations/EntityInputProvider.ts

@@ -38,9 +38,6 @@ export class EntityInputProvider<Operation extends EntityInputType> {
 		}
 		const entityName = entity.name
 		const withoutSuffix = withoutRelation ? GqlTypeName`Without${withoutRelation}` : ''
-		if (entity.view) {
-			return undefined
-		}
 		const operation: Acl.Operation = (() => {
 			switch (this.operation) {
 				case EntityInputType.create:

package/src/schema/mutations/UpdateEntityInputFieldVisitor.ts

@@ -22,9 +22,7 @@ export class UpdateEntityInputFieldVisitor implements
 			return undefined
 		}
 		const type = this.columnTypeResolver.getType(column)
-		return {
-			type,
-		}
+		return { type }
 	}
 
 	public visitHasOne({ entity, relation }: Model.AnyHasOneRelationContext) {
@@ -32,9 +30,7 @@ export class UpdateEntityInputFieldVisitor implements
 		if (type === undefined) {
 			return undefined
 		}
-		return {
-			type,
-		}
+		return { type }
 	}
 
 	public visitHasMany({ entity, relation }: Model.AnyHasManyRelationContext) {

package/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.ts

@@ -72,7 +72,6 @@ export class UpdateEntityRelationAllowedOperationsVisitor implements
 			result.push(Input.UpdateRelationOperation.connect)
 			result.push(Input.UpdateRelationOperation.disconnect)
 		}
-
 		if (canCreateTargetEntity && canUpdateOwningRelation) {
 			result.push(Input.UpdateRelationOperation.create)
 		}
@@ -85,6 +84,9 @@ export class UpdateEntityRelationAllowedOperationsVisitor implements
 		if (canDeleteTargetEntity && canUpdateOwningRelation) {
 			result.push(Input.UpdateRelationOperation.delete)
 		}
+		if (canReadTargetEntity && canUpdateOwningRelation && canCreateTargetEntity) {
+			result.push(Input.UpdateRelationOperation.connectOrCreate)
+		}
 
 		return result
 	}

package/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.ts

@@ -14,9 +14,9 @@ import { acceptFieldVisitor } from '@contember/schema-utils'
 import { UpdateEntityRelationAllowedOperationsVisitor } from './UpdateEntityRelationAllowedOperationsVisitor'
 import { Authorizator } from '../../acl'
 import { ImplementationException } from '../../exception'
+import { ConnectOrCreateRelationInputProvider } from './ConnectOrCreateRelationInputProvider'
 
-export class UpdateEntityRelationInputFieldVisitor implements
-	Model.ColumnVisitor<never>,
+export class UpdateEntityRelationInputFieldVisitor implements Model.ColumnVisitor<never>,
 	Model.RelationByGenericTypeVisitor<GraphQLInputObjectType | undefined> {
 
 	constructor(
@@ -26,7 +26,9 @@ export class UpdateEntityRelationInputFieldVisitor implements
 		private readonly updateEntityInputProviderAccessor: Accessor<EntityInputProvider<EntityInputType.update>>,
 		private readonly createEntityInputProvider: EntityInputProvider<EntityInputType.create>,
 		private readonly updateEntityRelationAllowedOperationsVisitor: UpdateEntityRelationAllowedOperationsVisitor,
-	) {}
+		private readonly connectOrCreateRelationInputProvider: ConnectOrCreateRelationInputProvider,
+	) {
+	}
 
 	public visitColumn(): never {
 		throw new Error('UpdateEntityRelationInputFieldVisitor: Not applicable for a column')
@@ -36,39 +38,39 @@ export class UpdateEntityRelationInputFieldVisitor implements
 		const withoutRelation = targetRelation ? targetRelation.name : undefined
 
 		const whereInput = this.createWhereInput(targetEntity)
+
 		const createInputType = this.createEntityInputProvider.getInput(targetEntity.name, withoutRelation)
-		const createInput = createInputType
-			? {
-				type: createInputType,
-			  }
-			: undefined
+		const createInput = createInputType ? { type: createInputType } : undefined
+
 		const updateInputType = this.updateEntityInputProviderAccessor.get().getInput(targetEntity.name, withoutRelation)
-		const updateInput = updateInputType
+		const updateInput = updateInputType ? {  type: updateInputType } : undefined
+
+		const upsertInput = updateInput && createInput
 			? {
-				type: updateInputType,
-			  }
-			: undefined
-		const upsertInput =
-			updateInput && createInput
-				? {
-					type: new GraphQLInputObjectType({
-						name: GqlTypeName`${entity.name}Upsert${relation.name}RelationInput`,
-						fields: () => ({
-							update: updateInput,
-							create: createInput,
-						}),
+				type: new GraphQLInputObjectType({
+					name: GqlTypeName`${entity.name}Upsert${relation.name}RelationInput`,
+					fields: () => ({
+						update: updateInput,
+						create: createInput,
 					}),
-				  }
-				: undefined
+				}),
+			}
+			: undefined
+
 		const booleanInput = {
 			type: GraphQLBoolean,
 		}
 
+		const connectOrCreateInput = createInput && whereInput
+			? { type: this.connectOrCreateRelationInputProvider.getInput(entity.name, relation.name) }
+			: undefined
+
 		const fields = {
+			[Input.UpdateRelationOperation.connect]: whereInput,
 			[Input.UpdateRelationOperation.create]: createInput,
+			[Input.UpdateRelationOperation.connectOrCreate]: connectOrCreateInput,
 			[Input.UpdateRelationOperation.update]: updateInput,
 			[Input.UpdateRelationOperation.upsert]: upsertInput,
-			[Input.UpdateRelationOperation.connect]: whereInput,
 			[Input.UpdateRelationOperation.disconnect]: booleanInput,
 			[Input.UpdateRelationOperation.delete]: booleanInput,
 		}
@@ -88,45 +90,37 @@ export class UpdateEntityRelationInputFieldVisitor implements
 		const withoutRelation = targetRelation ? targetRelation.name : undefined
 
 		const whereInput = this.createWhereInput(targetEntity)
+
 		const createInputType = this.createEntityInputProvider.getInput(targetEntity.name, withoutRelation)
-		const createInput = createInputType
-			? {
-				type: createInputType,
-			  }
-			: undefined
+		const createInput = createInputType ? { type: createInputType } : undefined
+
 		const updateInputType = this.updateEntityInputProviderAccessor.get().getInput(targetEntity.name, withoutRelation)
-		const updateInput = updateInputType
+		const updateInput = updateInputType ? { type: updateInputType } : undefined
+
+		const updateSpecifiedInput = updateInput && whereInput
 			? {
-				type: updateInputType,
-			  }
+				type: new GraphQLInputObjectType({
+					name: GqlTypeName`${entity.name}Update${relation.name}RelationInput`,
+					fields: () => ({
+						by: whereInput,
+						data: updateInput,
+					}),
+				}),
+			}
 			: undefined
 
-		const updateSpecifiedInput =
-			updateInput && whereInput
-				? {
-					type: new GraphQLInputObjectType({
-						name: GqlTypeName`${entity.name}Update${relation.name}RelationInput`,
-						fields: () => ({
-							by: whereInput,
-							data: updateInput,
-						}),
-					}),
-				  }
-				: undefined
-
-		const upsertInput =
-			updateInput && createInput && whereInput
-				? {
-					type: new GraphQLInputObjectType({
-						name: GqlTypeName`${entity.name}Upsert${relation.name}RelationInput`,
-						fields: () => ({
-							by: whereInput,
-							update: updateInput,
-							create: createInput,
-						}),
+		const upsertInput = updateInput && createInput && whereInput
+			? {
+				type: new GraphQLInputObjectType({
+					name: GqlTypeName`${entity.name}Upsert${relation.name}RelationInput`,
+					fields: () => ({
+						by: whereInput,
+						update: updateInput,
+						create: createInput,
 					}),
-				  }
-				: undefined
+				}),
+			}
+			: undefined
 
 		const fields = {
 			[Input.UpdateRelationOperation.create]: createInput,
@@ -136,6 +130,7 @@ export class UpdateEntityRelationInputFieldVisitor implements
 			[Input.UpdateRelationOperation.disconnect]: whereInput,
 			[Input.UpdateRelationOperation.delete]: whereInput,
 		}
+
 		const filteredFields = this.filterAllowedOperations(entity, relation, fields)
 		if (Object.keys(filteredFields).length === 0) {
 			return undefined

package/src/tsconfig.json

@@ -5,26 +5,12 @@
 		"esModuleInterop": true
 	},
 	"references": [
-		{
-			"path": "../../database/src"
-		},
-		{
-			"path": "../../dic/src"
-		},
-		{
-			"path": "../../graphql-utils/src"
-		},
-		{
-			"path": "../../logger/src"
-		},
-		{
-			"path": "../../schema/src"
-		},
-		{
-			"path": "../../schema-definition/src"
-		},
-		{
-			"path": "../../schema-utils/src"
-		}
+		{ "path": "../../database/src" },
+		{ "path": "../../dic/src" },
+		{ "path": "../../graphql-utils/src" },
+		{ "path": "../../logger/src" },
+		{ "path": "../../schema/src" },
+		{ "path": "../../schema-definition/src" },
+		{ "path": "../../schema-utils/src" }
 	]
 }

package/src/types.ts

@@ -1,11 +1,10 @@
 import { Acl } from '@contember/schema'
 import { Client } from '@contember/database'
-import { Container } from '@contember/dic'
-import { ExecutionContainer } from './resolvers'
+import { ExecutionContainer } from './ExecutionContainer'
 
 export interface Context {
 	db: Client
 	identityVariables: Acl.VariablesMap
-	executionContainer: Container<ExecutionContainer>
+	executionContainer: ExecutionContainer
 	timer: <T>(event: string, cb?: () => T) => Promise<T>
 }

package/tests/cases/bugs/bug-update-by-nested-unique.test.ts

@@ -31,11 +31,9 @@ test('Update by nested unique where', async () => {
 					parameters: ['en'],
 				},
 				{
-					sql: SQL`
-							with "newData_" as
-							(select ? :: text as "title", "root_"."id", "root_"."site_id"  from "public"."front_page" as "root_"  where "root_"."id" = ?)
-							update  "public"."front_page" set  "title" =  "newData_"."title"   from "newData_"  where "front_page"."id" = "newData_"."id"`,
-					response: { rowCount: 1 },
+					sql: SQL`with "newData_" as (select ? :: text as "title", "root_"."title" as "title_old__", "root_"."id", "root_"."site_id"  from "public"."front_page" as "root_"  where "root_"."id" = ?) 
+							update  "public"."front_page" set  "title" =  "newData_"."title"   from "newData_"  where "front_page"."id" = "newData_"."id"  returning "title_old__"`,
+					response: { rows: [{}] },
 					parameters: ['Hello', testUuid(1)],
 				},
 			]),

package/tests/cases/integration/graphQlDb/insert/insertSequence.test.ts

@@ -10,9 +10,9 @@ namespace SeqModel {
 }
 
 test('insert author with id', async () => {
-	const schema = def.createModel(SeqModel)
+	const model = def.createModel(SeqModel)
 	await executeDbTest({
-		schema: schema,
+		schema: { model },
 		query: GQL`
           mutation {
               createOrder(data: {}) {

package/tests/cases/integration/graphQlDb/update/bug-freeze-connect-missing-one.test.ts

@@ -18,7 +18,7 @@ namespace Model {
 }
 test('create redirect to non-existing target', async () => {
 	await executeDbTest({
-		schema: def.createModel(Model),
+		schema: { model: def.createModel(Model) },
 		query: GQL`
 		mutation {
   createRedirect(

package/tests/cases/integration/graphQlDb/update/deferedConstraints.test.ts

@@ -6,7 +6,7 @@ import { executeDbTest } from '@contember/engine-api-tester'
 
 test('delete without deferring constraints', async () => {
 	await executeDbTest({
-		schema: new SchemaBuilder()
+		schema: { model: new SchemaBuilder()
 			.entity('Post', entity =>
 				entity
 					.column('slug')
@@ -25,7 +25,7 @@ test('delete without deferring constraints', async () => {
 					.manyHasOne('attachment', relation => relation.target('Attachment').inversedBy('refereces'))
 					.unique(['slug']),
 			)
-			.buildSchema(),
+			.buildSchema() },
 		seed: [
 			{
 				query: `mutation {
@@ -60,10 +60,10 @@ test('delete without deferring constraints', async () => {
 		return: {
 			transaction: {
 				ok: false,
-				errorMessage: 'Execution has failed:\nupdatePost.attachments.0: ForeignKeyConstraintViolation (Cannot delete row 123e4567-e89b-12d3-a456-000000000002 of entity Attachment, because it is still referenced from Reference::attachment. This is possibly caused by ACL denial or by missing "on delete cascade")',
+				errorMessage: 'Execution has failed:\nupdatePost.attachments.0: ForeignKeyConstraintViolation (Cannot delete 123e4567-e89b-12d3-a456-000000000004 row(s) of entity Attachment, because it is still referenced from 123e4567-e89b-12d3-a456-000000000006 row(s) of entity Reference in relation attachment. OnDelete behaviour of this relation is set to "restrict". You might consider changing it to "setNull" or "cascade".)',
 				updatePost: {
 					ok: false,
-					errorMessage: 'Execution has failed:\nattachments.0: ForeignKeyConstraintViolation (Cannot delete row 123e4567-e89b-12d3-a456-000000000002 of entity Attachment, because it is still referenced from Reference::attachment. This is possibly caused by ACL denial or by missing "on delete cascade")',
+					errorMessage: 'Execution has failed:\nattachments.0: ForeignKeyConstraintViolation (Cannot delete 123e4567-e89b-12d3-a456-000000000004 row(s) of entity Attachment, because it is still referenced from 123e4567-e89b-12d3-a456-000000000006 row(s) of entity Reference in relation attachment. OnDelete behaviour of this relation is set to "restrict". You might consider changing it to "setNull" or "cascade".)',
 				},
 			},
 		},
@@ -73,7 +73,7 @@ test('delete without deferring constraints', async () => {
 
 test('delete with successfully deferring constraints', async () => {
 	await executeDbTest({
-		schema: new SchemaBuilder()
+		schema: { model: new SchemaBuilder()
 			.entity('Post', entity =>
 				entity
 					.column('slug')
@@ -92,7 +92,7 @@ test('delete with successfully deferring constraints', async () => {
 					.manyHasOne('attachment', relation => relation.target('Attachment').inversedBy('refereces'))
 					.unique(['slug']),
 			)
-			.buildSchema(),
+			.buildSchema() },
 		seed: [
 			{
 				query: `mutation {
@@ -140,7 +140,7 @@ test('delete with successfully deferring constraints', async () => {
 
 test('delete with unsuccessfully deferring constraints', async () => {
 	await executeDbTest({
-		schema: new SchemaBuilder()
+		schema: { model: new SchemaBuilder()
 			.entity('Post', entity =>
 				entity
 					.column('slug')
@@ -159,7 +159,7 @@ test('delete with unsuccessfully deferring constraints', async () => {
 					.manyHasOne('attachment', relation => relation.target('Attachment').inversedBy('refereces'))
 					.unique(['slug']),
 			)
-			.buildSchema(),
+			.buildSchema() },
 		seed: [
 			{
 				query: `mutation {
@@ -194,7 +194,7 @@ test('delete with unsuccessfully deferring constraints', async () => {
 		return: {
 			transaction: {
 				ok: false,
-				errorMessage: 'Execution has failed:\nunknown field: ForeignKeyConstraintViolation (Cannot delete row 123e4567-e89b-12d3-a456-000000000002 of entity Attachment, because it is still referenced from Reference::attachment. This is possibly caused by ACL denial or by missing "on delete cascade")',
+				errorMessage: 'Execution has failed:\nunknown field: ForeignKeyConstraintViolation (Cannot delete row 123e4567-e89b-12d3-a456-000000000004 of entity Attachment, because it is still referenced from Reference::attachment. This is possibly caused by ACL denial or by missing "on delete cascade")',
 				updatePost: {
 					ok: false,
 					errorMessage: null,

package/tests/cases/integration/graphQlDb/update/failedDelete.test.ts

@@ -6,14 +6,14 @@ import { executeDbTest } from '@contember/engine-api-tester'
 
 test('fails when deleting entity without proper cascade', async () => {
 	await executeDbTest({
-		schema: new SchemaBuilder()
+		schema: { model: new SchemaBuilder()
 			.entity('Post', entity =>
 				entity.column('slug').unique(['slug']),
 			)
 			.entity('PostLocales', entity =>
 				entity.manyHasOne('post', relation => relation.target('Post').inversedBy('locales')).column('title'),
 			)
-			.buildSchema(),
+			.buildSchema() },
 		seed: [
 			{
 				query: `mutation {
@@ -37,7 +37,7 @@ test('fails when deleting entity without proper cascade', async () => {
         }`,
 		return: {
 			deletePost: {
-				errorMessage: 'Execution has failed:\nunknown field: ForeignKeyConstraintViolation (Cannot delete row 123e4567-e89b-12d3-a456-000000000001 of entity Post, because it is still referenced from PostLocales::post. This is possibly caused by ACL denial or by missing "on delete cascade")',
+				errorMessage: 'Execution has failed:\nunknown field: ForeignKeyConstraintViolation (Cannot delete 123e4567-e89b-12d3-a456-000000000003 row(s) of entity Post, because it is still referenced from 123e4567-e89b-12d3-a456-000000000004 row(s) of entity PostLocales in relation post. OnDelete behaviour of this relation is set to "restrict". You might consider changing it to "setNull" or "cascade".)',
 				node: null,
 			},
 		},

package/tests/cases/integration/graphQlDb/update/invalidInput.test.ts

@@ -4,7 +4,7 @@ import { test, assert } from 'vitest'
 import { executeDbTest } from '@contember/engine-api-tester'
 import { GQL } from '../../../../src/tags'
 
-const schema = new SchemaBuilder()
+const model = new SchemaBuilder()
 	.entity('Post', e =>
 		e
 			.column('slug', c => c.type(Model.ColumnType.String).unique())
@@ -13,7 +13,7 @@ const schema = new SchemaBuilder()
 	.buildSchema()
 test('returns error for invalid date input', async () => {
 	await executeDbTest({
-		schema,
+		schema: { model },
 		seed: [
 			{
 				query: GQL`mutation {

package/tests/cases/integration/graphQlDb/update/nullChecksNotNull.test.ts

@@ -5,7 +5,7 @@ import { executeDbTest } from '@contember/engine-api-tester'
 import { GQL } from '../../../../src/tags'
 import { testUuid } from '../../../../src/testUuid'
 
-const schema = new SchemaBuilder()
+const model = new SchemaBuilder()
 	.entity('Site', e =>
 		e
 			.column('slug', c => c.unique().type(Model.ColumnType.String))
@@ -17,7 +17,7 @@ const schema = new SchemaBuilder()
 
 test('update site & create contact page', async () => {
 	await executeDbTest({
-		schema,
+		schema: { model },
 		seed: [
 			{
 				query: GQL`mutation {
@@ -38,15 +38,15 @@ test('update site & create contact page', async () => {
 			},
 		},
 		expectDatabase: {
-			site: [{ id: testUuid(1), slug: 'en', contact_page_id: testUuid(2) }],
-			contact_page: [{ id: testUuid(2), title: 'Test' }],
+			site: [{ id: testUuid(3), slug: 'en', contact_page_id: testUuid(5) }],
+			contact_page: [{ id: testUuid(5), title: 'Test' }],
 		},
 	})
 })
 
 test('update site & try to create contact page which however exists', async () => {
 	await executeDbTest({
-		schema,
+		schema: { model },
 		seed: [
 			{
 				query: GQL`mutation {
@@ -69,14 +69,14 @@ test('update site & try to create contact page which however exists', async () =
 				ok: false,
 				errors: [
 					{
-						type: 'UniqueConstraintViolation',
+						type: 'NotNullConstraintViolation',
 					},
 				],
 			},
 		},
 		expectDatabase: {
-			site: [{ id: testUuid(1), slug: 'en', contact_page_id: testUuid(2) }],
-			contact_page: [{ id: testUuid(2), title: 'Test' }],
+			site: [{ id: testUuid(3), slug: 'en', contact_page_id: testUuid(4) }],
+			contact_page: [{ id: testUuid(4), title: 'Test' }],
 		},
 	})
 })

package/tests/cases/integration/graphQlDb/update/nullChecksNullable.test.ts

@@ -5,7 +5,7 @@ import { executeDbTest } from '@contember/engine-api-tester'
 import { GQL } from '../../../../src/tags'
 import { testUuid } from '../../../../src/testUuid'
 
-const schema = new SchemaBuilder()
+const model = new SchemaBuilder()
 	.entity('Site', e => e.column('slug', c => c.unique().type(Model.ColumnType.String)))
 	.entity('ContactPage', e =>
 		e.column('title').oneHasOne('site', r => r.target('Site').inversedBy('contactPage').notNull()),
@@ -14,7 +14,7 @@ const schema = new SchemaBuilder()
 
 test('update site & create contact page', async () => {
 	await executeDbTest({
-		schema,
+		schema: { model },
 		seed: [
 			{
 				query: GQL`mutation {
@@ -35,15 +35,15 @@ test('update site & create contact page', async () => {
 			},
 		},
 		expectDatabase: {
-			site: [{ id: testUuid(1), slug: 'en' }],
-			contact_page: [{ site_id: testUuid(1), id: testUuid(2), title: 'Test' }],
+			site: [{ id: testUuid(3), slug: 'en' }],
+			contact_page: [{ site_id: testUuid(3), id: testUuid(5), title: 'Test' }],
 		},
 	})
 })
 
 test('update site & try to create contact page which however exists', async () => {
 	await executeDbTest({
-		schema,
+		schema: { model },
 		seed: [
 			{
 				query: GQL`mutation {
@@ -68,15 +68,12 @@ test('update site & try to create contact page which however exists', async () =
 					{
 						type: 'NotNullConstraintViolation',
 					},
-					{
-						type: 'UniqueConstraintViolation',
-					},
 				],
 			},
 		},
 		expectDatabase: {
-			site: [{ id: testUuid(1), slug: 'en' }],
-			contact_page: [{ site_id: testUuid(1), id: testUuid(2), title: 'Test' }],
+			site: [{ id: testUuid(3), slug: 'en' }],
+			contact_page: [{ site_id: testUuid(3), id: testUuid(4), title: 'Test' }],
 		},
 	})
 })

package/tests/cases/integration/graphQlDb/update/uniqueConstraint.test.ts

@@ -4,7 +4,7 @@ import { test } from 'vitest'
 import { executeDbTest } from '@contember/engine-api-tester'
 import { GQL } from '../../../../src/tags'
 
-const schema = new SchemaBuilder()
+const model = new SchemaBuilder()
 	.entity('Site', e =>
 		e.column('slug', c => c.unique().type(Model.ColumnType.String)),
 	)
@@ -12,7 +12,7 @@ const schema = new SchemaBuilder()
 
 test('fail when creating a non-unique site', async () => {
 	await executeDbTest({
-		schema,
+		schema: { model },
 		seed: [
 			{
 				query: GQL`mutation {