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

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) }] },
 				},
 			]),
 		],

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

@@ -39,17 +39,10 @@ test('create', async () => {
 				},
 
 				{
-					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) }] },
 				},
 			]),
 		],

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

@@ -23,16 +23,10 @@ test('disconnect', async () => {
 					response: { rows: [{ id: testUuid(2) }] },
 				},
 				{
-					sql: SQL`with "newData_" as
-              (select
-                 ? :: uuid as "author_id",
-                 "root_"."id"
-               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"  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: [null, testUuid(2)],
-					response: { rowCount: 1 },
+					response: { rows: [{ author_id_old__: testUuid(99) }] },
 				},
 			]),
 		],

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

@@ -37,16 +37,10 @@ test('update', 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' }] },
 				},
 			]),
 		],

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

@@ -37,15 +37,10 @@ test('upsert - exists', 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: ['Jack', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'John' }] },
 				},
 			]),
 		],
@@ -97,17 +92,10 @@ test('upsert - not exists', 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__: null }] },
 				},
 			]),
 		],

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

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

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

@@ -28,15 +28,10 @@ test('disconnect', async () => {
 					response: { rows: [{ id: testUuid(1) }] },
 				},
 				{
-					sql: SQL`
-						with "newData_" as
-    					(select ? :: uuid as "post_id", "root_"."id", "root_"."title", "root_"."locale"  from "public"."post_locale" as "root_"  where "root_"."id" = ?)
-						update  "public"."post_locale"
-						set "post_id" =  "newData_"."post_id"
-						from "newData_"  where "post_locale"."id" = "newData_"."id"
-					`,
+					sql: SQL`with "newData_" as (select ? :: uuid as "post_id", "root_"."post_id" as "post_id_old__", "root_"."id", "root_"."title", "root_"."locale"  from "public"."post_locale" as "root_"  where "root_"."id" = ?) 
+							update  "public"."post_locale" set  "post_id" =  "newData_"."post_id"   from "newData_"  where "post_locale"."id" = "newData_"."id"  returning "post_id_old__"`,
 					parameters: [null, testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ post_id_old__: testUuid(99) }] },
 				},
 			]),
 		],

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

@@ -32,13 +32,10 @@ test('update (composed unique)', async () => {
 					},
 				},
 				{
-					sql: SQL`
-						with "newData_" as
-						(select ? :: text as "title", "root_"."id", "root_"."locale", "root_"."post_id"  from "public"."post_locale" as "root_"  where "root_"."id" = ?)
-						update  "public"."post_locale" set "title" =  "newData_"."title"
-						from "newData_"  where "post_locale"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "title", "root_"."title" as "title_old__", "root_"."id", "root_"."locale", "root_"."post_id"  from "public"."post_locale" as "root_"  where "root_"."id" = ?) 
+							update  "public"."post_locale" set  "title" =  "newData_"."title"   from "newData_"  where "post_locale"."id" = "newData_"."id"  returning "title_old__"`,
 					parameters: ['Hello', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ title_old__: 'Hi' }] },
 				},
 			]),
 		],

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

@@ -32,13 +32,10 @@ test('upsert - exists (composed unique)', async () => {
 					},
 				},
 				{
-					sql: SQL`
-						with "newData_" as
-						(select ? :: text as "title", "root_"."id", "root_"."locale", "root_"."post_id"  from "public"."post_locale" as "root_"  where "root_"."id" = ?)
-						update  "public"."post_locale" set "title" =  "newData_"."title"
-						from "newData_"  where "post_locale"."id" = "newData_"."id"`,
+					sql: SQL`with "newData_" as (select ? :: text as "title", "root_"."title" as "title_old__", "root_"."id", "root_"."locale", "root_"."post_id"  from "public"."post_locale" as "root_"  where "root_"."id" = ?) 
+						update  "public"."post_locale" set  "title" =  "newData_"."title"   from "newData_"  where "post_locale"."id" = "newData_"."id"  returning "title_old__"`,
 					parameters: ['Hello', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ title_old__: 'Foo' }] },
 				},
 			]),
 		],

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

@@ -84,17 +84,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(2), testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{}] },
 				},
 			]),
 		],
@@ -143,30 +136,16 @@ 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(2), testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{}] },
 				},
 			]),
 		],
@@ -219,17 +198,10 @@ test('connect - different owner & orphan removal enabled', async () => {
 				},
 				// set current owner to null
 				{
-					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: [{}] },
 				},
 				// current inverse of new owner
 				{
@@ -239,17 +211,10 @@ test('connect - different owner & orphan removal enabled', async () => {
 				},
 				// update inverse of new owner
 				{
-					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(2), testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{}] },
 				},
 				{
 					sql: 'select "root_"."id"  from "public"."site_setting" as "root_"   where "root_"."id" = ?',

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

@@ -49,17 +49,10 @@ test('create', 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, oldSiteId],
-					response: { rowCount: 1 },
+					response: { rows: [{ setting_id_old__: testUuid(99) }] },
 				},
 				{
 					sql: SQL`with "root_" as

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

@@ -34,17 +34,10 @@ test('disconnect', 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, siteId],
-					response: { rowCount: 1 },
+					response: { rows: [{ setting_id_old__: testUuid(99) }] },
 				},
 			]),
 		],

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

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

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

@@ -32,14 +32,10 @@ test('upsert - exists', async () => {
 					},
 				},
 				{
-					sql: SQL`
-						with "newData_" as
-						(select ? :: text as "name", "root_"."id", "root_"."setting_id"  from "public"."site" as "root_"  where "root_"."id" = ?)
-						update  "public"."site" set  "name" =  "newData_"."name"
-						from "newData_"  where "site"."id" = "newData_"."id"
-					`,
+					sql: SQL`with "newData_" as (select ? :: text as "name", "root_"."name" as "name_old__", "root_"."id", "root_"."setting_id"  from "public"."site" as "root_"  where "root_"."id" = ?) 
+							update  "public"."site" set  "name" =  "newData_"."name"   from "newData_"  where "site"."id" = "newData_"."id"  returning "name_old__"`,
 					parameters: ['Mangoweb', testUuid(1)],
-					response: { rowCount: 1 },
+					response: { rows: [{ name_old__: 'XX' }] },
 				},
 			]),
 		],

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

@@ -81,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: [{}] },
 				},
 			]),
 		],
@@ -138,30 +131,16 @@ 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: { rowCount: 1 },
+					response: { rows: [{}] },
 				},
 			]),
 		],
@@ -216,9 +195,10 @@ test('connect - orphan removal', async () => {
 					response: { rows: [] },
 				},
 				{
-					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: `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: { rowCount: 1 },
+					response: { rows: [{ settng_id_old__: testUuid(99) }] },
 				},
 				{
 					sql: 'select "root_"."id"  from "public"."site_setting" as "root_"   where "root_"."id" = ?',

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

@@ -33,10 +33,10 @@ test('connect or create', async () => {
 					response: { rows: [] },
 				},
 				{
-					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: `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: { rowCount: 1 },
+					response: { rows: [{ setting_id_old__: testUuid(99) }] },
 				},
 			]),
 		],