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

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

@@ -2,7 +2,7 @@ import { test } from 'vitest'
 import { execute, sqlTransaction } from '../../../../../src/test'
 import { GQL, SQL } from '../../../../../src/tags'
 import { testUuid } from '../../../../../src/testUuid'
-import { siteSettingSchema } from './schema'
+import { siteSettingSchema, siteSettingSchemaWithOrphanRemoval } from './schema'
 
 test('connect - same owner', async () => {
 	await execute({
@@ -47,6 +47,7 @@ test('connect - same owner', async () => {
 		},
 	})
 })
+
 test('connect - no owner', async () => {
 	await execute({
 		schema: siteSettingSchema,
@@ -80,17 +81,10 @@ test('connect - no owner', async () => {
 					},
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: uuid as "setting_id",
-                 "root_"."id",
-                 "root_"."name"
-               from "public"."site" as "root_"
-               where "root_"."id" = ?) update "public"."site"
-              set "setting_id" = "newData_"."setting_id" from "newData_"
-              where "site"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "root_"."id", "root_"."name"  from "public"."site" as "root_"  where "root_"."id" = ?) 
+						update  "public"."site" set  "setting_id" =  "newData_"."setting_id"   from "newData_"  where "site"."id" = "newData_"."id"  returning "setting_id_old__"`,
 					parameters: [testUuid(1), testUuid(2)],
-					response: { rowCount: 1 },
+					response: { rows: [{}] },
 				},
 			]),
 		],
@@ -103,6 +97,7 @@ test('connect - no owner', async () => {
 		},
 	})
 })
+
 test('connect - different owner', async () => {
 	await execute({
 		schema: siteSettingSchema,
@@ -136,29 +131,93 @@ test('connect - different owner', async () => {
 					},
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: uuid as "setting_id",
-                 "root_"."id",
-                 "root_"."name"
-               from "public"."site" as "root_"
-               where "root_"."id" = ?) update "public"."site"
-              set "setting_id" = "newData_"."setting_id" from "newData_"
-              where "site"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "root_"."id", "root_"."name"  from "public"."site" as "root_"  where "root_"."id" = ?) 
+							update  "public"."site" set  "setting_id" =  "newData_"."setting_id"   from "newData_"  where "site"."id" = "newData_"."id"  returning "setting_id_old__"`,
 					parameters: [null, testUuid(3)],
-					response: { rowCount: 1 },
+					response: { rows: [{}] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: uuid as "setting_id",
-                 "root_"."id",
-                 "root_"."name"
-               from "public"."site" as "root_"
-               where "root_"."id" = ?) update "public"."site"
-              set "setting_id" = "newData_"."setting_id" from "newData_"
-              where "site"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "root_"."id", "root_"."name"  from "public"."site" as "root_"  where "root_"."id" = ?) 
+						update  "public"."site" set  "setting_id" =  "newData_"."setting_id"   from "newData_"  where "site"."id" = "newData_"."id"  returning "setting_id_old__"`,
 					parameters: [testUuid(1), testUuid(2)],
+					response: { rows: [{}] },
+				},
+			]),
+		],
+		return: {
+			data: {
+				updateSite: {
+					ok: true,
+				},
+			},
+		},
+	})
+})
+
+test('connect - orphan removal', async () => {
+	const settingId = testUuid(1)
+	const siteId = testUuid(2)
+	const settingId2 = testUuid(3)
+	await execute({
+		schema: siteSettingSchemaWithOrphanRemoval,
+		query: GQL`mutation {
+        updateSite(
+            by: {id: "${siteId}"},
+            data: {setting: {connect: {id: "${settingId}"}}}
+          ) {
+          ok
+        }
+      }`,
+		executes: [
+			...sqlTransaction([
+				// the owner
+				{
+					sql: SQL`select "root_"."id" from "public"."site" as "root_" where "root_"."id" = ?`,
+					parameters: [siteId],
+					response: { rows: [{ id: siteId }] },
+				},
+				// new inverse
+				{
+					sql: SQL`select "root_"."id" from "public"."site_setting" as "root_" where "root_"."id" = ?`,
+					parameters: [settingId],
+					response: { rows: [{ id: settingId }] },
+				},
+				// current inverse
+				{
+					sql: 'select "root_"."setting_id"  from "public"."site" as "root_"   where "root_"."id" = ?',
+					parameters: [siteId],
+					response: { rows: [{ setting_id: settingId2 }] },
+				},
+				// owner of new inverse
+				{
+					sql: 'select "root_"."id"  from "public"."site" as "root_"   where "root_"."setting_id" = ?',
+					parameters: [settingId],
+					response: { rows: [] },
+				},
+				{
+					sql: `with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "root_"."id", "root_"."name"  from "public"."site" as "root_"  where "root_"."id" = ?) 
+						update  "public"."site" set  "setting_id" =  "newData_"."setting_id"   from "newData_"  where "site"."id" = "newData_"."id"  returning "setting_id_old__"`,
+					parameters: [settingId, siteId],
+					response: { rows: [{ settng_id_old__: testUuid(99) }] },
+				},
+				{
+					sql: 'select "root_"."id"  from "public"."site_setting" as "root_"   where "root_"."id" = ?',
+					parameters: [settingId2],
+					response: { rows: [{ id: settingId2 }] },
+				},
+				{
+					sql: 'select "root_"."id" as "id", true as "allowed" from "public"."site_setting" as "root_" where "root_"."id" = ?',
+					parameters: [settingId2],
+					response: { rows: [{ id: settingId2, allowed: true }] },
+				},
+				{
+					sql: 'select "root_"."id" as "id", "root_"."setting_id" as "ref" from "public"."site" as "root_" where "setting_id" in (?)',
+					parameters: [settingId2],
+					response: { rows: [] },
+				},
+				{
+					sql: 'DELETE FROM "public"."site_setting" WHERE "id" IN (?)',
+					parameters: [settingId2],
 					response: { rowCount: 1 },
 				},
 			]),

package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/connectOrCreate.test.ts

@@ -0,0 +1,51 @@
+import { test } from 'vitest'
+import { execute, sqlTransaction } from '../../../../../src/test'
+import { GQL, SQL } from '../../../../../src/tags'
+import { testUuid } from '../../../../../src/testUuid'
+import { siteSettingSchema } from './schema'
+
+test('connect or create', async () => {
+	await execute({
+		schema: siteSettingSchema,
+		query: GQL`mutation {
+        updateSite(
+            by: {id: "${testUuid(2)}"},
+            data: {setting: {connectOrCreate: {connect: {url: "xyz"}, create: {url: "abcd"}}}}
+          ) {
+          ok
+        }
+      }`,
+		executes: [
+			...sqlTransaction([
+				{
+					sql: SQL`select "root_"."id" from "public"."site" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(2)],
+					response: { rows: [{ id: testUuid(2) }] },
+				},
+				{
+					sql: SQL`select "root_"."id" from "public"."site_setting" as "root_" where "root_"."url" = ?`,
+					parameters: ['xyz'],
+					response: { rows: [{ id: testUuid(3) }] },
+				},
+				{
+					sql: SQL`select "root_"."id" from "public"."site" as "root_" where "root_"."setting_id" = ?`,
+					parameters: [testUuid(3)],
+					response: { rows: [] },
+				},
+				{
+					sql: `with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "root_"."id", "root_"."name"  from "public"."site" as "root_"  where "root_"."id" = ?) 
+						update  "public"."site" set  "setting_id" =  "newData_"."setting_id"   from "newData_"  where "site"."id" = "newData_"."id"  returning "setting_id_old__"`,
+					parameters: [testUuid(3), testUuid(2)],
+					response: { rows: [{ setting_id_old__: testUuid(99) }] },
+				},
+			]),
+		],
+		return: {
+			data: {
+				updateSite: {
+					ok: true,
+				},
+			},
+		},
+	})
+})

package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/create.test.ts

@@ -2,7 +2,7 @@ import { test } from 'vitest'
 import { execute, sqlTransaction } from '../../../../../src/test'
 import { GQL, SQL } from '../../../../../src/tags'
 import { testUuid } from '../../../../../src/testUuid'
-import { siteSettingSchema } from './schema'
+import { siteSettingSchema, siteSettingSchemaWithOrphanRemoval } from './schema'
 
 test('create', async () => {
 	await execute({
@@ -43,17 +43,10 @@ test('create', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: uuid as "setting_id",
-                 "root_"."id",
-                 "root_"."name"
-               from "public"."site" as "root_"
-               where "root_"."id" = ?) update "public"."site"
-              set "setting_id" = "newData_"."setting_id" from "newData_"
-              where "site"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "root_"."id", "root_"."name"  from "public"."site" as "root_"  where "root_"."id" = ?) 
+							update  "public"."site" set  "setting_id" =  "newData_"."setting_id"   from "newData_"  where "site"."id" = "newData_"."id"  returning "setting_id_old__"`,
 					parameters: [testUuid(1), testUuid(2)],
-					response: { rowCount: 1 },
+					response: { rows: [{ setting_id_old__: testUuid(99) }] },
 				},
 			]),
 		],
@@ -67,3 +60,76 @@ test('create', async () => {
 	})
 })
 
+test('create - orphan removal', async () => {
+	const siteId = testUuid(2)
+	const currentSettingId = testUuid(3)
+	await execute({
+		schema: siteSettingSchemaWithOrphanRemoval,
+		query: GQL`mutation {
+        updateSite(
+            by: {id: "${siteId}"},
+            data: {setting: {create: {url: "http://mangoweb.cz"}}}
+          ) {
+          ok
+        }
+      }`,
+		executes: [
+			...sqlTransaction([
+				{
+					sql: SQL`select "root_"."id" from "public"."site" as "root_" where "root_"."id" = ?`,
+					parameters: [siteId],
+					response: { rows: [{ id: siteId }] },
+				},
+				// get current inverse side
+				{
+					sql: 'select "root_"."setting_id"  from "public"."site" as "root_"   where "root_"."id" = ?',
+					parameters: [siteId],
+					response: { rows: [{ setting_id: currentSettingId }] },
+				},
+				{
+					sql: SQL`with "root_" as
+							(select ? :: uuid as "id", ? :: text as "url")
+							insert into "public"."site_setting" ("id", "url")
+							select "root_"."id", "root_"."url"
+              from "root_"
+							returning "id"`,
+					parameters: [testUuid(1), 'http://mangoweb.cz'],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
+				{
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "root_"."id", "root_"."name"  from "public"."site" as "root_"  where "root_"."id" = ?) 
+						update  "public"."site" set  "setting_id" =  "newData_"."setting_id"   from "newData_"  where "site"."id" = "newData_"."id"  returning "setting_id_old__"`,
+					parameters: [testUuid(1), siteId],
+					response: { rows: [{ setting_id_old__: testUuid(99) }] },
+				},
+				{
+					sql: 'select "root_"."id"  from "public"."site_setting" as "root_"   where "root_"."id" = ?',
+					parameters: [currentSettingId],
+					response: { rows: [{ id: currentSettingId }] },
+				},
+				{
+					sql: 'select "root_"."id" as "id", true as "allowed" from "public"."site_setting" as "root_" where "root_"."id" = ?',
+					parameters: [currentSettingId],
+					response: { rows: [{ id: currentSettingId, allowed: true }] },
+				},
+				{
+					sql: 'select "root_"."id" as "id", "root_"."setting_id" as "ref" from "public"."site" as "root_" where "setting_id" in (?)',
+					parameters: [currentSettingId],
+					response: { rows: [] },
+				},
+				{
+					sql: 'DELETE FROM "public"."site_setting" WHERE "id" IN (?)',
+					parameters: [currentSettingId],
+					response: { rowCount: 1 },
+				},
+			]),
+		],
+		return: {
+			data: {
+				updateSite: {
+					ok: true,
+				},
+			},
+		},
+	})
+})

package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/delete.test.ts

@@ -1,5 +1,5 @@
 import { test } from 'vitest'
-import { execute, sqlDeferred, sqlTransaction } from '../../../../../src/test'
+import { execute, failedTransaction, sqlTransaction } from '../../../../../src/test'
 import { GQL, SQL } from '../../../../../src/tags'
 import { testUuid } from '../../../../../src/testUuid'
 import { siteSettingSchema } from './schema'
@@ -31,31 +31,21 @@ test('delete', async () => {
 						rows: [{ setting_id: testUuid(1) }],
 					},
 				},
-				...sqlDeferred([
-					{
-						sql: SQL`delete from "public"."site_setting"
-              where "id" in (select "root_"."id"
-                             from "public"."site_setting" as "root_"
-                             where "root_"."id" = ?)
-              returning "id"`,
-						parameters: [testUuid(1)],
-						response: { rows: [{ id: testUuid(1) }] },
-					},
-					{
-						sql: SQL`
-								with "newdata_" as
-								(select ? :: uuid as "setting_id", "root_"."id", "root_"."name"
-									from "public"."site" as "root_"
-									where "root_"."setting_id" in (?))
-								update "public"."site"
-								set "setting_id" = "newdata_"."setting_id" from "newdata_"
-								where "site"."id" = "newdata_"."id"`,
-						parameters: [null, testUuid(1)],
-						response: {
-							rowCount: 1,
-						},
-					},
-				]),
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."site_setting" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", "root_"."setting_id" as "ref", true as "allowed" from "public"."site" as "root_" where "setting_id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(2), ref: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`delete from "public"."site_setting" where "id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
 			]),
 		],
 		return: {
@@ -68,3 +58,56 @@ test('delete', async () => {
 	})
 })
 
+
+test('delete denied', async () => {
+	await execute({
+		schema: siteSettingSchema,
+		query: GQL`mutation {
+        updateSite(
+            by: {id: "${testUuid(2)}"},
+            data: {setting: {delete: true}}
+          ) {
+          ok
+          errorMessage
+        }
+      }`,
+		executes: [
+			...failedTransaction([
+				{
+					sql: SQL`select "root_"."id" from "public"."site" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(2)],
+					response: { rows: [{ id: testUuid(2) }] },
+				},
+				{
+					sql: SQL`select "root_"."setting_id"
+                       from "public"."site" as "root_"
+                       where "root_"."id" = ?`,
+					parameters: [testUuid(2)],
+					response: {
+						rows: [{ setting_id: testUuid(1) }],
+					},
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."site_setting" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", "root_"."setting_id" as "ref", true as "allowed" from "public"."site" as "root_" where "setting_id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(2), ref: testUuid(1), allowed: false }] },
+				},
+			]),
+		],
+		return: {
+			data: {
+				updateSite: {
+					ok: false,
+					errorMessage: 'Execution has failed:\n'
+					+ 'setting: ForeignKeyConstraintViolation (Cannot delete 123e4567-e89b-12d3-a456-000000000001 row(s) of entity SiteSetting, because it is still referenced from 123e4567-e89b-12d3-a456-000000000002 row(s) of entity Site in relation setting. OnDelete behaviour of this relation is set to "set null". This is possibly caused by ACL denial.)',
+				},
+			},
+		},
+	})
+})
+

package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/disconnect.test.ts

@@ -23,17 +23,10 @@ test('disconnect', async () => {
 					response: { rows: [{ id: testUuid(2) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: uuid as "setting_id",
-                 "root_"."id",
-                 "root_"."name"
-               from "public"."site" as "root_"
-               where "root_"."id" = ?) update "public"."site"
-              set "setting_id" = "newData_"."setting_id" from "newData_"
-              where "site"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "root_"."id", "root_"."name"  from "public"."site" as "root_"  where "root_"."id" = ?) 
+						update  "public"."site" set  "setting_id" =  "newData_"."setting_id"   from "newData_"  where "site"."id" = "newData_"."id"  returning "setting_id_old__"`,
 					parameters: [null, testUuid(2)],
-					response: { rowCount: 1 },
+					response: { rows: [{ setting_id_old__: testUuid(99) }] },
 				},
 			]),
 		],

package/tests/cases/integration/graphQlRequests/update/oneHasOneOwning/schema.ts

@@ -8,8 +8,21 @@ export const siteSettingSchema = new SchemaBuilder()
 			.oneHasOne('setting', r =>
 				r
 					.inversedBy('site')
-					.target('SiteSetting', e => e.column('url', c => c.type(Model.ColumnType.String)))
+					.target('SiteSetting', e => e.column('url', c => c.type(Model.ColumnType.String).unique()))
 					.onDelete(Model.OnDelete.setNull),
 			),
 	)
 	.buildSchema()
+
+export const siteSettingSchemaWithOrphanRemoval = new SchemaBuilder()
+	.entity('Site', entity =>
+		entity
+			.column('name', c => c.type(Model.ColumnType.String))
+			.oneHasOne('setting', r =>
+				r
+					.inversedBy('site')
+					.target('SiteSetting', e => e.column('url', c => c.type(Model.ColumnType.String)))
+					.removeOrphan(),
+			),
+	)
+	.buildSchema()

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

@@ -37,16 +37,10 @@ test('update', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: text as "url",
-                 "root_"."id"
-               from "public"."site_setting" as "root_"
-               where "root_"."id" = ?) update "public"."site_setting"
-              set "url" = "newData_"."url" from "newData_"
-              where "site_setting"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "url", "root_"."url" as "url_old__", "root_"."id"  from "public"."site_setting" as "root_"  where "root_"."id" = ?) 
+							update  "public"."site_setting" set  "url" =  "newData_"."url"   from "newData_"  where "site_setting"."id" = "newData_"."id"  returning "url_old__"`,
 					parameters: ['http://mangoweb.cz', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ url_old__: 'https://google.com' }] },
 				},
 			]),
 		],

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

@@ -37,16 +37,10 @@ test('upsert - exists', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: text as "url",
-                 "root_"."id"
-               from "public"."site_setting" as "root_"
-               where "root_"."id" = ?) update "public"."site_setting"
-              set "url" = "newData_"."url" from "newData_"
-              where "site_setting"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "url", "root_"."url" as "url_old__", "root_"."id"  from "public"."site_setting" as "root_"  where "root_"."id" = ?) 
+						update  "public"."site_setting" set  "url" =  "newData_"."url"   from "newData_"  where "site_setting"."id" = "newData_"."id"  returning "url_old__"`,
 					parameters: ['http://mangoweb.cz', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ url_old__: 'xxx' }] },
 				},
 			]),
 		],
@@ -97,17 +91,10 @@ test('upsert - not exists', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: uuid as "setting_id",
-                 "root_"."id",
-                 "root_"."name"
-               from "public"."site" as "root_"
-               where "root_"."id" = ?) update "public"."site"
-              set "setting_id" = "newData_"."setting_id" from "newData_"
-              where "site"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "setting_id", "root_"."setting_id" as "setting_id_old__", "root_"."id", "root_"."name"  from "public"."site" as "root_"  where "root_"."id" = ?) 
+						update  "public"."site" set  "setting_id" =  "newData_"."setting_id"   from "newData_"  where "site"."id" = "newData_"."id"  returning "setting_id_old__"`,
 					parameters: [testUuid(1), testUuid(2)],
-					response: { rowCount: 1 },
+					response: { rows: [{ setting_id_old__: null }] },
 				},
 			]),
 		],

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

@@ -31,11 +31,10 @@ test('query portal', async () => {
 					parameters: [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: ['Hello', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ title_old__: 'Hi' }] },
 				},
 			]),
 			{
@@ -90,11 +89,10 @@ test('transaction with query portal', async () => {
 					parameters: [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: ['Hello', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ title_old__: 'Hi' }] },
 				},
 				{
 					sql: SQL`select "root_"."id" as "root_id"

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

@@ -41,15 +41,10 @@ test('executes in a transaction', 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__: 'Jack' }] },
 				},
 				{
 					sql: SQL`select "root_"."id" as "root_id"
@@ -66,15 +61,10 @@ test('executes in a transaction', async () => {
 					response: { rows: [{ id: testUuid(2) }] },
 				},
 				{
-					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: ['Jack', testUuid(2)],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'Jack' }] },
 				},
 				{
 					sql: SQL`select "root_"."id" as "root_id"
@@ -146,15 +136,10 @@ test('executes fails a transaction', 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__: 'Jack' }] },
 				},
 				{
 					sql: SQL`select "root_"."id" as "root_id"

package/tests/cases/integration/graphQlRequests/upsert/basicUpsert.test.ts

@@ -88,14 +88,10 @@ test('upsert author (exists)', async () => {
 					response: { rows: [{ id: testUuid(2) }] },
 				},
 				{
-					sql: SQL`
-						with "newData_" as
-    					(select ? :: text as "name", "root_"."id", "root_"."slug"  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", "root_"."slug"  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 Doe', testUuid(2)],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'Foo' }] },
 				},
 				{
 					sql: SQL`select "root_"."id" as "root_id"  from "public"."author" as "root_"  where "root_"."slug" = ?`,