@contember/engine-content-api 2.0.0-beta.4 → 2.0.0-beta.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contember/engine-content-api",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.6",
   "license": "Apache-2.0",
   "main": "./dist/production/index.js",
   "typings": "./dist/types/index.d.ts",
@@ -26,18 +26,18 @@
     "generate": "gql-gen --config graphql.codegen.yml"
   },
   "dependencies": {
-    "@contember/database": "2.0.0-beta.4",
-    "@contember/dic": "2.0.0-beta.4",
-    "@contember/graphql-utils": "2.0.0-beta.4",
-    "@contember/logger": "2.0.0-beta.4",
-    "@contember/schema": "2.0.0-beta.4",
-    "@contember/schema-definition": "2.0.0-beta.4",
-    "@contember/schema-utils": "2.0.0-beta.4",
+    "@contember/database": "2.0.0-beta.6",
+    "@contember/dic": "2.0.0-beta.6",
+    "@contember/graphql-utils": "2.0.0-beta.6",
+    "@contember/logger": "2.0.0-beta.6",
+    "@contember/schema": "2.0.0-beta.6",
+    "@contember/schema-definition": "2.0.0-beta.6",
+    "@contember/schema-utils": "2.0.0-beta.6",
     "fast-deep-equal": "^3.1.3"
   },
   "devDependencies": {
-    "@contember/database-tester": "2.0.0-beta.4",
-    "@contember/schema-definition": "2.0.0-beta.4",
+    "@contember/database-tester": "2.0.0-beta.6",
+    "@contember/schema-definition": "2.0.0-beta.6",
     "@types/node": "^20.16.11",
     "graphql": "^16.9.0",
     "pg": "^8.12.0"

package/src/mapper/delete/DeleteExecutor.ts

@@ -299,7 +299,7 @@ export class DeleteExecutor {
 			.from(entity.tableName, 'root_')
 			.select(['root_', entity.primaryColumn], 'id')
 			.select(['root_', relation.joiningColumn.columnName], 'ref')
-			.where(expr => expr.in(relation.joiningColumn.columnName, values))
+			.where(expr => expr.in(['root_', relation.joiningColumn.columnName], values))
 	}
 
 	private filterPlannedForDelete<R extends {id: Input.PrimaryValue}>(state: DeleteState, entity: Model.Entity, values: R[]): R[] {

package/tests/cases/integration/graphQlRequests/delete/cascadeDelete.test.ts

@@ -35,12 +35,12 @@ test('delete author with posts and locales cascade delete', async () => {
 					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 (?)`,
+					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref", true as "allowed" from "public"."post" as "root_" where "root_"."author_id" in (?)`,
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(2), allowed: true }] },
 				},
 				{
-					sql: SQL`select "root_"."id" as "id", "root_"."post_id" as "ref", true as "allowed" from "public"."post_locales" as "root_" where "post_id" in (?)`,
+					sql: SQL`select "root_"."id" as "id", "root_"."post_id" as "ref", true as "allowed" from "public"."post_locales" as "root_" where "root_"."post_id" in (?)`,
 					parameters: [testUuid(2)],
 					response: { rows: [{ id: testUuid(3), allowed: true }] },
 				},
@@ -90,7 +90,7 @@ test('delete author with posts (denied) ', async () => {
 					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 (?)`,
+					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref", true as "allowed" from "public"."post" as "root_" where "root_"."author_id" in (?)`,
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(2), ref: testUuid(1), allowed: false }] },
 				},

package/tests/cases/integration/graphQlRequests/delete/orphanRemoval.test.ts

@@ -53,7 +53,7 @@ test('delete post and orphaned content', async () => {
 					},
 				},
 				{
-					sql: SQL`select "root_"."id" as "id", "root_"."content_id" as "ref" from "public"."post" as "root_" where "content_id" in (?)`,
+					sql: SQL`select "root_"."id" as "id", "root_"."content_id" as "ref" from "public"."post" as "root_" where "root_"."content_id" in (?)`,
 					parameters: [testUuid(2)],
 					response: {
 						rows: [{ id: testUuid(1), ref: testUuid(2) }],

package/tests/cases/integration/graphQlRequests/delete/restrictOnDelete.test.ts

@@ -32,7 +32,7 @@ test('delete author and with restrict on posts', async () => {
 					response: { rows: [{ id: testUuid(1), allowed: true }] },
 				},
 				{
-					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref" from "public"."post" as "root_" where "author_id" in (?)`,
+					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref" from "public"."post" as "root_" where "root_"."author_id" in (?)`,
 					parameters: [testUuid(1)],
 					response: { rows: [] },
 				},
@@ -82,7 +82,7 @@ test('delete author with restrict on posts - declined', async () => {
 					response: { rows: [{ id: testUuid(1), allowed: true }] },
 				},
 				{
-					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref" from "public"."post" as "root_" where "author_id" in (?)`,
+					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref" from "public"."post" as "root_" where "root_"."author_id" in (?)`,
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(2), ref: testUuid(1) }] },
 				},

package/tests/cases/integration/graphQlRequests/delete/setNullOnDelete.test.ts

@@ -47,7 +47,7 @@ test('delete author and set null on posts', async () => {
 					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 (?)`,
+					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref", true as "allowed" from "public"."post" as "root_" where "root_"."author_id" in (?)`,
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(2), ref: testUuid(1), allowed: true }] },
 				},
@@ -99,7 +99,7 @@ test('delete author and set null on posts - declined', async () => {
 					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 (?)`,
+					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref", true as "allowed" from "public"."post" as "root_" where "root_"."author_id" in (?)`,
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(2), ref: testUuid(1), allowed: false }] },
 				},

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

@@ -42,7 +42,7 @@ test('delete', async () => {
 					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 (?)`,
+					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref", true as "allowed" from "public"."post" as "root_" where "root_"."author_id" in (?)`,
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(2), ref: testUuid(1), allowed: true }] },
 				},
@@ -101,7 +101,7 @@ test('delete with cascade', async () => {
 					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 (?)`,
+					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref", true as "allowed" from "public"."post" as "root_" where "root_"."author_id" in (?)`,
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(2), ref: testUuid(1), allowed: true }] },
 				},
@@ -160,7 +160,7 @@ test('delete with cascade - denied', async () => {
 					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 (?)`,
+					sql: SQL`select "root_"."id" as "id", "root_"."author_id" as "ref", true as "allowed" from "public"."post" as "root_" where "root_"."author_id" in (?)`,
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(2), ref: testUuid(1), allowed: false }] },
 				},

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

@@ -228,7 +228,7 @@ test('connect - different owner & orphan removal enabled', async () => {
 					response: { rows: [{ id: testUuid(4), allowed: true }] },
 				},
 				{
-					sql: 'select "root_"."id" as "id", "root_"."setting_id" as "ref" from "public"."site" as "root_" where "setting_id" in (?)',
+					sql: 'select "root_"."id" as "id", "root_"."setting_id" as "ref" from "public"."site" as "root_" where "root_"."setting_id" in (?)',
 					parameters: [testUuid(4)],
 					response: { rows: [] },
 				},

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

@@ -211,7 +211,7 @@ test('connect - orphan removal', async () => {
 					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 (?)',
+					sql: 'select "root_"."id" as "id", "root_"."setting_id" as "ref" from "public"."site" as "root_" where "root_"."setting_id" in (?)',
 					parameters: [settingId2],
 					response: { rows: [] },
 				},

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

@@ -113,7 +113,7 @@ test('create - orphan removal', async () => {
 					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 (?)',
+					sql: 'select "root_"."id" as "id", "root_"."setting_id" as "ref" from "public"."site" as "root_" where "root_"."setting_id" in (?)',
 					parameters: [currentSettingId],
 					response: { rows: [] },
 				},

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

@@ -37,7 +37,7 @@ test('delete', async () => {
 					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 (?)`,
+					sql: SQL`select "root_"."id" as "id", "root_"."setting_id" as "ref", true as "allowed" from "public"."site" as "root_" where "root_"."setting_id" in (?)`,
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(2), ref: testUuid(1), allowed: true }] },
 				},
@@ -93,7 +93,7 @@ test('delete denied', async () => {
 					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 (?)`,
+					sql: SQL`select "root_"."id" as "id", "root_"."setting_id" as "ref", true as "allowed" from "public"."site" as "root_" where "root_"."setting_id" in (?)`,
 					parameters: [testUuid(1)],
 					response: { rows: [{ id: testUuid(2), ref: testUuid(1), allowed: false }] },
 				},

package/tests/cases/integration/graphQlSchema/graphQlSchemaBuilder.test.ts

@@ -390,9 +390,8 @@ describe('GraphQL schema builder', () => {
 		})
 	})
 
-	it.only('no root ops', async () => {
+	it('no root ops', async () => {
 		const schema = createSchema(NoRootOperation)
-		console.log(schema.acl.roles.editor.entities.Image)
 
 		await testSchema({
 			schema: () => schema.model,