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

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/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 { postWithAuthor, postWithNullableAuthor } from './schema'
@@ -36,31 +36,21 @@ test('delete', async () => {
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(1) }] },
 				},
-				...sqlDeferred([
-					{
-						sql: SQL`delete from "public"."author"
-              where "id" in (select "root_"."id"
-                             from "public"."author" as "root_"
-                             where "root_"."id" = ?)
-              returning "id"`,
-						parameters: [testUuid(1)],
-						response: { rows: [{ id: testUuid(1) }] },
-					},
-					{
-						sql: SQL`
-								with "newdata_" as
-								(select ? :: uuid as "author_id", "root_"."id"
-									from "public"."post" as "root_"
-									where "root_"."author_id" in (?))
-								update "public"."post" set "author_id" = "newdata_"."author_id"
-								from "newdata_"
-								where "post"."id" = "newdata_"."id"`,
-						parameters: [null, testUuid(1)],
-						response: {
-							rowCount: 1,
-						},
-					},
-				]),
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."author" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref", true as "allowed" from "public"."post" as "root_" where "author_id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(2), ref: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`delete from "public"."author" where "id" in (?)`,
+					parameters: [testUuid(1)],
+					response: {  },
+				},
 			]),
 		],
 		return: {
@@ -72,6 +62,7 @@ test('delete', async () => {
 		},
 	})
 })
+
 test('delete with cascade', async () => {
 	await execute({
 		schema: postWithAuthor,
@@ -104,30 +95,21 @@ test('delete with cascade', async () => {
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(1) }] },
 				},
-				...sqlDeferred([
-					{
-						sql: SQL`delete from "public"."author"
-              where "id" in (select "root_"."id"
-                             from "public"."author" as "root_"
-                             where "root_"."id" = ?)
-              returning "id"`,
-						parameters: [testUuid(1)],
-						response: { rows: [{ id: testUuid(1) }] },
-					},
-					{
-						sql: SQL`
-								delete from "public"."post"
-								where "id" in
-									(select "root_"."id"
-									from "public"."post" as "root_"
-									where "root_"."author_id" in (?))
-								returning "id"`,
-						parameters: [testUuid(1)],
-						response: {
-							rows: [{ id: testUuid(2) }],
-						},
-					},
-				]),
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."author" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref", true as "allowed" from "public"."post" as "root_" where "author_id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(2), ref: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`delete from "public"."author" where "id" in (?)`,
+					parameters: [testUuid(1)],
+					response: {  },
+				},
 			]),
 		],
 		return: {
@@ -140,3 +122,57 @@ test('delete with cascade', async () => {
 	})
 })
 
+test('delete with cascade - denied', async () => {
+	await execute({
+		schema: postWithAuthor,
+		query: GQL`mutation {
+        updatePost(
+            by: {id: "${testUuid(2)}"},
+            data: {author: {delete: true}}
+          ) {
+          ok
+        }
+      }`,
+		executes: [
+			...failedTransaction([
+				{
+					sql: SQL`select "root_"."id" from "public"."post" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(2)],
+					response: { rows: [{ id: testUuid(2) }] },
+				},
+				{
+					sql: SQL`select "root_"."author_id"
+                       from "public"."post" as "root_"
+                       where "root_"."id" = ?`,
+					parameters: [testUuid(2)],
+					response: {
+						rows: [{ author_id: testUuid(1) }],
+					},
+				},
+				{
+					sql: SQL`select "root_"."id" from "public"."author" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."author" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref", true as "allowed" from "public"."post" as "root_" where "author_id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(2), ref: testUuid(1), allowed: false }] },
+				},
+			]),
+		],
+		return: {
+			data: {
+				updatePost: {
+					ok: false,
+				},
+			},
+		},
+	})
+})
+

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/combination.test.ts

@@ -1,5 +1,5 @@
 import { test } from 'vitest'
-import { execute, sqlDeferred, sqlTransaction } from '../../../../../src/test'
+import { execute, sqlTransaction } from '../../../../../src/test'
 import { GQL, SQL } from '../../../../../src/tags'
 import { testUuid } from '../../../../../src/testUuid'
 import { postWithLocale } from './schema'
@@ -27,17 +27,16 @@ test('delete and create', async () => {
 					parameters: ['cs', testUuid(2)],
 					response: { rows: [{ id: testUuid(9) }] },
 				},
-				...sqlDeferred([
-					{
-						sql: SQL`delete from "public"."post_locale"
-              where "id" in (select "root_"."id"
-                             from "public"."post_locale" as "root_"
-                             where "root_"."id" = ?)
-              returning "id"`,
-						parameters: [testUuid(9)],
-						response: { rows: [{ id: testUuid(9) }] },
-					},
-				]),
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."post_locale" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(9)],
+					response: { rows: [{ id: testUuid(9), allowed: true }] },
+				},
+				{
+					sql: SQL`delete from "public"."post_locale" where "id" in (?)`,
+					parameters: [testUuid(9)],
+					response: { rows: [{ id: testUuid(9) }] },
+				},
 				{
 					sql: SQL`with "root_" as
 							(select ? :: uuid as "id", ? :: text as "title", ? :: text as "locale", ? :: uuid as "post_id")

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/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 { postWithLocale } from './schema'
@@ -27,17 +27,16 @@ test('delete', async () => {
 					parameters: ['cs', testUuid(2)],
 					response: { rows: [{ id: testUuid(1) }] },
 				},
-				...sqlDeferred([
-					{
-						sql: SQL`delete from "public"."post_locale"
-              where "id" in (select "root_"."id"
-                             from "public"."post_locale" as "root_"
-                             where "root_"."id" = ?)
-              returning "id"`,
-						parameters: [testUuid(1)],
-						response: { rows: [{ id: testUuid(1) }] },
-					},
-				]),
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."post_locale" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: true }] },
+				},
+				{
+					sql: SQL`delete from "public"."post_locale" where "id" in (?)`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
 			]),
 		],
 		return: {
@@ -50,3 +49,43 @@ test('delete', async () => {
 	})
 })
 
+
+test('delete - denied', async () => {
+	await execute({
+		schema: postWithLocale,
+		query: GQL`mutation {
+        updatePost(
+            by: {id: "${testUuid(2)}"},
+            data: {locales: [{delete: {locale: "cs"}}]}
+          ) {
+          ok
+        }
+      }`,
+		executes: [
+			...failedTransaction([
+				{
+					sql: SQL`select "root_"."id" from "public"."post" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(2)],
+					response: { rows: [{ id: testUuid(2) }] },
+				},
+				{
+					sql: SQL`select "root_"."id" from "public"."post_locale" as "root_" where "root_"."locale" = ? and "root_"."post_id" = ?`,
+					parameters: ['cs', testUuid(2)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
+				{
+					sql: SQL`select "root_"."id" as "id", true as "allowed" from "public"."post_locale" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1), allowed: false }] },
+				},
+			]),
+		],
+		return: {
+			data: {
+				updatePost: {
+					ok: false,
+				},
+			},
+		},
+	})
+})

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