@contember/engine-content-api 1.3.0-alpha.1 → 1.3.0-alpha.13

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 123e4567-e89b-12d3-a456-000000000002 row(s) of entity Attachment, because it is still referenced from 123e4567-e89b-12d3-a456-000000000003 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".)',
+				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 123e4567-e89b-12d3-a456-000000000002 row(s) of entity Attachment, because it is still referenced from 123e4567-e89b-12d3-a456-000000000003 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".)',
+					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 123e4567-e89b-12d3-a456-000000000001 row(s) of entity Post, because it is still referenced from 123e4567-e89b-12d3-a456-000000000002 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".)',
+				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 {
@@ -75,8 +75,8 @@ test('update site & try to create contact page which however exists', 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(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 {
@@ -72,8 +72,8 @@ test('update site & try to create contact page which however exists', 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(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 {

package/tests/cases/integration/graphQlRequests/insert/oneHasMany/connect.test.ts

@@ -41,11 +41,11 @@ test('insert category and connect existing post (one has many)', async () => {
 					},
 				},
 				{
-					sql: SQL`with "newdata_" as (select ? :: uuid as "category_id", "root_"."id", "root_"."name" from "public"."post" as "root_" where "root_"."id" = ?)
-						update "public"."post" set "category_id" = "newdata_"."category_id" from "newdata_" where "post"."id" = "newdata_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "category_id", "root_"."category_id" as "category_id_old__", "root_"."id", "root_"."name"  from "public"."post" as "root_"  where "root_"."id" = ?) 
+							update  "public"."post" set  "category_id" =  "newData_"."category_id"   from "newData_"  where "post"."id" = "newData_"."id"  returning "category_id_old__"`,
 					parameters: [testUuid(1), testUuid(5)],
 					response: {
-						rowCount: 1,
+						rows: [{ category_id_old__: testUuid(99) }],
 					},
 				},
 				{

package/tests/cases/integration/graphQlRequests/query/acl/isNullAcl.test.ts

@@ -0,0 +1,77 @@
+import { AclDefinition as acl, createSchema, SchemaDefinition as def } from '@contember/schema-definition'
+import { test } from 'vitest'
+import { execute } from '../../../../../src/test'
+import { GQL, SQL } from '../../../../../src/tags'
+import { PermissionFactory } from '../../../../../../src'
+import { testUuid } from '@contember/engine-api-tester'
+
+
+namespace RowPredicateSubset {
+	export const ownerRole = acl.createRole('owner')
+	export const personIdVariable = acl.createPredefinedVariable('personId', 'personID', ownerRole)
+
+	@acl.allow(ownerRole, {
+		read: true,
+		when: { resource: acl.canRead('item') },
+	})
+	export class Item {
+		resource = def.oneHasOne(Resource, 'item')
+	}
+
+	@acl.allow(ownerRole, {
+		read: true,
+		when: { owner: acl.canRead('resources') },
+	})
+	export class Resource {
+		item = def.oneHasOneInverse(Item, 'resource')
+		owner = def.manyHasOne(Person, 'resources')
+	}
+
+	@acl.allow(ownerRole, {
+		read: true,
+		when: { personId: personIdVariable },
+	})
+	export class Person {
+		personId = def.uuidColumn().notNull()
+		resources = def.oneHasMany(Resource, 'owner')
+	}
+}
+
+
+test('owner predicate with isNull', async () => {
+	const schema = createSchema(RowPredicateSubset)
+
+	const permissions = new PermissionFactory().create(schema, ['owner'])
+
+	await execute({
+		schema: schema.model,
+		permissions: permissions,
+		variables: {
+			owner__personId: { eq: testUuid(0) },
+		},
+		query: GQL`
+        query {
+          listItem(filter: {resource: {id: {isNull: true}}}) {
+          	id
+          }
+        }`,
+		executes: [
+			{
+				sql: SQL`select "root_"."id" as "root_id"  from "public"."item" as "root_" 
+    left join  "public"."resource" as "root_resource" on  "root_"."resource_id" = "root_resource"."id" 
+    left join  "public"."person" as "root_resource_owner" on  "root_resource"."owner_id" = "root_resource_owner"."id"  
+	where "root_resource"."id" is null and "root_resource_owner"."person_id" = ? and "root_resource_owner"."person_id" = ?`,
+				response: {
+					rows: [],
+				},
+			},
+		],
+		return: {
+			data: {
+				listItem: [],
+			},
+		},
+	})
+})
+
+

package/tests/cases/integration/graphQlRequests/query/acl/rowPredicateSubset.test.ts

@@ -37,7 +37,7 @@ namespace RowPredicateSubset {
 test('row level predicate includes main predicate', async () => {
 	const schema = createSchema(RowPredicateSubset)
 
-	const permissions = new PermissionFactory(schema.model).create(schema.acl, ['reader'])
+	const permissions = new PermissionFactory().create(schema, ['reader'])
 
 	await execute({
 		schema: schema.model,

package/tests/cases/integration/graphQlRequests/query/sorting/orderBy.test.ts

@@ -0,0 +1,67 @@
+import { test } from 'vitest'
+import { execute } from '../../../../../src/test'
+import { SchemaBuilder } from '@contember/schema-definition'
+import { Model } from '@contember/schema'
+import { GQL, SQL } from '../../../../../src/tags'
+import { testUuid } from '../../../../../src/testUuid'
+
+test('Entity - explicit order by, default asc', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Post', entity => entity.column('title', column => column.type(Model.ColumnType.String)).orderBy('title'))
+			.buildSchema(),
+		query: GQL`
+        query {
+          getPost(by: {id: "${testUuid(1)}"}, filter: {title: {eq: "Foo"}}) {
+            id
+          }
+        }`,
+		executes: [
+			{
+				sql: SQL`select "root_"."id" as "root_id"
+                     from "public"."post" as "root_"
+                     where "root_"."id" = ? and "root_"."title" = ?  order by "root_"."title" asc, "root_"."id" asc`,
+				response: { rows: [{ root_id: testUuid(1) }] },
+				parameters: [testUuid(1), 'Foo'],
+			},
+		],
+		return: {
+			data: {
+				getPost: {
+					id: testUuid(1),
+				},
+			},
+		},
+	})
+})
+
+
+test('Entity - explicit order by desc', async () => {
+	await execute({
+		schema: new SchemaBuilder()
+			.entity('Post', entity => entity.column('title', column => column.type(Model.ColumnType.String)).orderBy('title', Model.OrderDirection.desc))
+			.buildSchema(),
+		query: GQL`
+        query {
+          getPost(by: {id: "${testUuid(1)}"}, filter: {title: {eq: "Foo"}}) {
+            id
+          }
+        }`,
+		executes: [
+			{
+				sql: SQL`select "root_"."id" as "root_id"
+                     from "public"."post" as "root_"
+                     where "root_"."id" = ? and "root_"."title" = ?  order by "root_"."title" desc, "root_"."id" asc`,
+				response: { rows: [{ root_id: testUuid(1) }] },
+				parameters: [testUuid(1), 'Foo'],
+			},
+		],
+		return: {
+			data: {
+				getPost: {
+					id: testUuid(1),
+				},
+			},
+		},
+	})
+})

package/tests/cases/integration/graphQlRequests/update/acl/aclUpdate.test.ts

@@ -45,16 +45,10 @@ test('update name', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: text as "name",
-                 "root_"."id"
-               from "public"."author" as "root_"
-               where "root_"."id" = ? and "root_"."name" in (?, ?)) update "public"."author"
-              set "name" = "newData_"."name" from "newData_"
-              where "author"."id" = "newData_"."id" and "newData_"."name" in (?, ?)`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."author" as "root_"  where "root_"."id" = ? and "root_"."name" in (?, ?)) 
+						update  "public"."author" set  "name" =  "newData_"."name"   from "newData_"  where "author"."id" = "newData_"."id" and "newData_"."name" in (?, ?)  returning "name_old__"`,
 					parameters: ['John', testUuid(1), 'John', 'Jack', 'John', 'Jack'],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'John' }] },
 				},
 			]),
 		],
@@ -108,16 +102,10 @@ test('update name - denied', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: text as "name",
-                 "root_"."id"
-               from "public"."author" as "root_"
-               where false) update "public"."author"
-              set "name" = "newData_"."name" from "newData_"
-              where "author"."id" = "newData_"."id" and false`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."author" as "root_"  where false) 
+							update  "public"."author" set  "name" =  "newData_"."name"   from "newData_"  where "author"."id" = "newData_"."id" and false  returning "name_old__"`,
 					parameters: ['John'],
-					response: 0,
+					response: { rows: [] },
 				},
 			]),
 		],

package/tests/cases/integration/graphQlRequests/update/additionalFilter.test.ts

@@ -30,11 +30,10 @@ test('applies a filter', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newdata_" as
-								(select ? :: text as "name", "root_"."id" from "public"."author" as "root_" where "root_"."id" = ? and "root_"."name" = ?)
-								update "public"."author" set "name" = "newdata_"."name" from "newdata_" where "author"."id" = "newdata_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."author" as "root_"  where "root_"."id" = ? and "root_"."name" = ?) 
+							update  "public"."author" set  "name" =  "newData_"."name"   from "newData_"  where "author"."id" = "newData_"."id"  returning "name_old__"`,
 					parameters: ['John', testUuid(1), 'Jack'],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'Jack' }] },
 				},
 				{
 					sql: SQL`select "root_"."id" as "root_id"

package/tests/cases/integration/graphQlRequests/update/basic/columnUpdate.test.ts

@@ -29,15 +29,10 @@ test('update name', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as (select
-                  ? :: text as "name",
-                  "root_"."id"
-                from "public"."author" as "root_"
-                where "root_"."id" = ?) update "public"."author"
-              set "name" = "newData_"."name" from "newData_"
-              where "author"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."author" as "root_"  where "root_"."id" = ?) 
+							update  "public"."author" set  "name" =  "newData_"."name"   from "newData_"  where "author"."id" = "newData_"."id"  returning "name_old__"`,
 					parameters: ['John', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'John' }] },
 				},
 				{
 					sql: SQL`select "root_"."id" as "root_id"

package/tests/cases/integration/graphQlRequests/update/manyHasManyInverse/update.test.ts

@@ -28,16 +28,10 @@ test('update', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: text as "title",
-                 "root_"."id"
-               from "public"."post" as "root_"
-               where "root_"."id" = ?) update "public"."post"
-              set "title" = "newData_"."title" from "newData_"
-             where "post"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "title", "root_"."title" as "title_old__", "root_"."id"  from "public"."post" as "root_"  where "root_"."id" = ?) 
+							update  "public"."post" set  "title" =  "newData_"."title"   from "newData_"  where "post"."id" = "newData_"."id"  returning "title_old__"`,
 					parameters: ['Lorem', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ title_old__: 'Foo bar' }] },
 				},
 				{
 					sql: SQL`insert into "public"."post_categories" ("post_id", "category_id")

package/tests/cases/integration/graphQlRequests/update/manyHasManyInverse/upsert.test.ts

@@ -28,16 +28,10 @@ test('upsert - exists', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: text as "title",
-                 "root_"."id"
-               from "public"."post" as "root_"
-               where "root_"."id" = ?) update "public"."post"
-              set "title" = "newData_"."title" from "newData_"
-             where "post"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "title", "root_"."title" as "title_old__", "root_"."id"  from "public"."post" as "root_"  where "root_"."id" = ?) 
+						update  "public"."post" set  "title" =  "newData_"."title"   from "newData_"  where "post"."id" = "newData_"."id"  returning "title_old__"`,
 					parameters: ['Lorem', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ title_old__: 'Foo' }] },
 				},
 				{
 					sql: SQL`insert into "public"."post_categories" ("post_id", "category_id")

package/tests/cases/integration/graphQlRequests/update/manyHasManyOwning/update.test.ts

@@ -28,16 +28,10 @@ test('update', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: text as "name",
-                 "root_"."id"
-               from "public"."category" as "root_"
-               where "root_"."id" = ?) update "public"."category"
-              set "name" = "newData_"."name" from "newData_"
-              where "category"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."category" as "root_"  where "root_"."id" = ?) 
+							update  "public"."category" set  "name" =  "newData_"."name"   from "newData_"  where "category"."id" = "newData_"."id"  returning "name_old__"`,
 					parameters: ['Lorem', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'Foo' }] },
 				},
 				{
 					sql: SQL`insert into "public"."post_categories" ("post_id", "category_id")

package/tests/cases/integration/graphQlRequests/update/manyHasManyOwning/upsert.test.ts

@@ -28,16 +28,10 @@ test('upsert - exists', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: text as "name",
-                 "root_"."id"
-               from "public"."category" as "root_"
-               where "root_"."id" = ?) update "public"."category"
-              set "name" = "newData_"."name" from "newData_"
-              where "category"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id"  from "public"."category" as "root_"  where "root_"."id" = ?) 
+						update  "public"."category" set  "name" =  "newData_"."name"   from "newData_"  where "category"."id" = "newData_"."id"  returning "name_old__"`,
 					parameters: ['Lorem', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'Foo' }] },
 				},
 				{
 					sql: SQL`insert into "public"."post_categories" ("post_id", "category_id")

package/tests/cases/integration/graphQlRequests/update/manyHasOne/connect.test.ts

@@ -28,17 +28,10 @@ test('connect', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: uuid as "author_id",
-                 "root_"."id",
-                 "root_"."title"
-               from "public"."post" as "root_"
-               where "root_"."id" = ?) update "public"."post"
-              set "author_id" = "newData_"."author_id" from "newData_"
-              where "post"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "author_id", "root_"."author_id" as "author_id_old__", "root_"."id", "root_"."title"  from "public"."post" as "root_"  where "root_"."id" = ?) 
+							update  "public"."post" set  "author_id" =  "newData_"."author_id"   from "newData_"  where "post"."id" = "newData_"."id"  returning "author_id_old__"`,
 					parameters: [testUuid(1), testUuid(2)],
-					response: { rowCount: 1 },
+					response: { rows: [{ author_id_old__: testUuid(99) }] },
 				},
 			]),
 		],