@contember/engine-content-api 1.2.0-alpha.8 → 1.2.0-beta.1

package/src/schema/mutations/CreateEntityInputFieldVisitor.ts

@@ -15,7 +15,7 @@ export class CreateEntityInputFieldVisitor implements
 		private readonly createEntityRelationInputProvider: CreateEntityRelationInputProvider,
 	) {}
 
-	public visitColumn(entity: Model.Entity, column: Model.AnyColumn): GraphQLInputFieldConfig | undefined {
+	public visitColumn({ entity, column }: Model.ColumnContext): GraphQLInputFieldConfig | undefined {
 		if (entity.primary === column.name && !this.authorizator.isCustomPrimaryAllowed(entity.name)) {
 			return undefined
 		}
@@ -28,10 +28,7 @@ export class CreateEntityInputFieldVisitor implements
 		}
 	}
 
-	public visitHasOne(
-		entity: Model.Entity,
-		relation: Model.Relation & Model.NullableRelation,
-	): GraphQLInputFieldConfig | undefined {
+	public visitHasOne({ entity, relation }: Model.AnyHasOneRelationContext): GraphQLInputFieldConfig | undefined {
 		const type = this.createEntityRelationInputProvider.getCreateEntityRelationInput(entity.name, relation.name)
 		if (type === undefined) {
 			return undefined
@@ -41,7 +38,7 @@ export class CreateEntityInputFieldVisitor implements
 		}
 	}
 
-	public visitHasMany(entity: Model.Entity, relation: Model.Relation): GraphQLInputFieldConfig | undefined {
+	public visitHasMany({ entity, relation }: Model.AnyHasManyRelationContext): GraphQLInputFieldConfig | undefined {
 		const type = this.createEntityRelationInputProvider.getCreateEntityRelationInput(entity.name, relation.name)
 		if (type === undefined) {
 			return undefined

package/src/schema/mutations/CreateEntityRelationAllowedOperationsVisitor.ts

@@ -12,32 +12,23 @@ export class CreateEntityRelationAllowedOperationsVisitor implements
 		throw new ImplementationException('CreateEntityRelationAllowedOperationsVisitor: Not applicable for a column')
 	}
 
-	public visitManyHasManyInverse({}, {}, targetEntity: Model.Entity, targetRelation: Model.ManyHasManyOwningRelation) {
+	public visitManyHasManyInverse({ targetEntity, targetRelation }: Model.ManyHasManyInverseContext) {
 		return this.getAllowedOperations(targetEntity, targetEntity, targetRelation)
 	}
 
-	public visitManyHasManyOwning(
-		entity: Model.Entity,
-		relation: Model.ManyHasManyOwningRelation,
-		targetEntity: Model.Entity,
-	) {
+	public visitManyHasManyOwning({ entity, targetEntity, relation }: Model.ManyHasManyOwningContext) {
 		return this.getAllowedOperations(targetEntity, entity, relation)
 	}
 
-	public visitOneHasMany({}, {}, targetEntity: Model.Entity, targetRelation: Model.ManyHasOneRelation) {
+	public visitOneHasMany({ targetEntity, targetRelation }: Model.OneHasManyContext) {
 		return this.getAllowedOperations(targetEntity, targetEntity, targetRelation)
 	}
 
-	public visitManyHasOne(entity: Model.Entity, relation: Model.ManyHasOneRelation, targetEntity: Model.Entity) {
+	public visitManyHasOne({ targetEntity, entity, relation }: Model.ManyHasOneContext) {
 		return this.getAllowedOperations(targetEntity, entity, relation)
 	}
 
-	public visitOneHasOneInverse(
-		{},
-		relation: Model.OneHasOneInverseRelation,
-		targetEntity: Model.Entity,
-		targetRelation: Model.OneHasOneOwningRelation,
-	) {
+	public visitOneHasOneInverse({ targetEntity, targetRelation, relation }: Model.OneHasOneInverseContext) {
 		const operations = this.getAllowedOperations(targetEntity, targetEntity, targetRelation)
 		if (relation.nullable || targetRelation.nullable) {
 			return operations
@@ -45,12 +36,7 @@ export class CreateEntityRelationAllowedOperationsVisitor implements
 		return operations.filter(it => it === Input.CreateRelationOperation.create)
 	}
 
-	public visitOneHasOneOwning(
-		entity: Model.Entity,
-		relation: Model.OneHasOneOwningRelation,
-		targetEntity: Model.Entity,
-		targetRelation: Model.OneHasOneInverseRelation | null,
-	) {
+	public visitOneHasOneOwning({ targetEntity, entity, relation, targetRelation }: Model.OneHasOneOwningContext) {
 		const operations = this.getAllowedOperations(targetEntity, entity, relation)
 		if (!targetRelation || targetRelation.nullable || relation.nullable) {
 			return operations

package/src/schema/mutations/CreateEntityRelationInputFieldVisitor.ts

@@ -1,10 +1,9 @@
-import { GraphQLInputObjectType, GraphQLString } from 'graphql'
+import { GraphQLInputFieldConfigMap, GraphQLInputObjectType, GraphQLString } from 'graphql'
 import { Input, Model } from '@contember/schema'
 import { GqlTypeName } from '../utils'
 import { WhereTypeProvider } from '../WhereTypeProvider'
 import { Accessor, Interface } from '../../utils'
 import { EntityInputProvider, EntityInputType } from './EntityInputProvider'
-import { GraphQLInputFieldConfigMap } from 'graphql/type/definition'
 import { CreateEntityRelationAllowedOperationsVisitor } from './CreateEntityRelationAllowedOperationsVisitor'
 import { acceptFieldVisitor } from '@contember/schema-utils'
 import { ImplementationException } from '../../exception'
@@ -26,29 +25,16 @@ export class CreateEntityRelationInputFieldVisitor implements
 		throw new ImplementationException('CreateEntityRelationInputFieldVisitor: Not applicable for a column')
 	}
 
-	public visitHasOne(
-		entity: Model.Entity,
-		relation: Model.Relation & Model.NullableRelation,
-		targetEntity: Model.Entity,
-		targetRelation: Model.Relation | null,
-	): GraphQLInputObjectType | undefined {
-		return this.createInputObject(entity, relation, targetEntity, targetRelation, false)
+	public visitHasOne(context: Model.ManyHasOneContext): GraphQLInputObjectType | undefined {
+		return this.createInputObject(context, false)
 	}
 
-	public visitHasMany(
-		entity: Model.Entity,
-		relation: Model.Relation,
-		targetEntity: Model.Entity,
-		targetRelation: Model.Relation | null,
-	): GraphQLInputObjectType | undefined {
-		return this.createInputObject(entity, relation, targetEntity, targetRelation, true)
+	public visitHasMany(context: Model.OneHasManyContext): GraphQLInputObjectType | undefined {
+		return this.createInputObject(context, true)
 	}
 
 	public createInputObject(
-		entity: Model.Entity,
-		relation: Model.Relation,
-		targetEntity: Model.Entity,
-		targetRelation: Model.Relation | null,
+		{ entity, relation, targetEntity, targetRelation }: Model.AnyRelationContext,
 		withAliasField: boolean,
 	): GraphQLInputObjectType | undefined {
 		const targetName = targetRelation ? targetRelation.name : undefined

package/src/schema/mutations/UpdateEntityInputFieldVisitor.ts

@@ -14,7 +14,7 @@ export class UpdateEntityInputFieldVisitor implements
 		private readonly updateEntityRelationInputProvider: UpdateEntityRelationInputProvider,
 	) {}
 
-	public visitColumn(entity: Model.Entity, column: Model.AnyColumn): GraphQLInputFieldConfig | undefined {
+	public visitColumn({ entity, column }: Model.ColumnContext) {
 		if (entity.primary === column.name) {
 			return undefined
 		}
@@ -27,10 +27,7 @@ export class UpdateEntityInputFieldVisitor implements
 		}
 	}
 
-	public visitHasOne(
-		entity: Model.Entity,
-		relation: Model.Relation & Model.NullableRelation,
-	): GraphQLInputFieldConfig | undefined {
+	public visitHasOne({ entity, relation }: Model.AnyHasOneRelationContext) {
 		const type = this.updateEntityRelationInputProvider.getUpdateEntityRelationInput(entity.name, relation.name)
 		if (type === undefined) {
 			return undefined
@@ -40,7 +37,7 @@ export class UpdateEntityInputFieldVisitor implements
 		}
 	}
 
-	public visitHasMany(entity: Model.Entity, relation: Model.Relation): GraphQLInputFieldConfig | undefined {
+	public visitHasMany({ entity, relation }: Model.AnyHasManyRelationContext) {
 		const type = this.updateEntityRelationInputProvider.getUpdateEntityRelationInput(entity.name, relation.name)
 		if (type === undefined) {
 			return undefined

package/src/schema/mutations/UpdateEntityRelationAllowedOperationsVisitor.ts

@@ -11,23 +11,19 @@ export class UpdateEntityRelationAllowedOperationsVisitor implements
 		throw new Error('UpdateEntityRelationAllowedOperationsVisitor: Not applicable for a column')
 	}
 
-	public visitManyHasManyInverse({}, {}, targetEntity: Model.Entity, targetRelation: Model.ManyHasManyOwningRelation) {
+	public visitManyHasManyInverse({ targetEntity, targetRelation }: Model.ManyHasManyInverseContext) {
 		return this.getAllowedOperations(targetEntity, targetEntity, targetRelation)
 	}
 
-	public visitManyHasManyOwning(
-		entity: Model.Entity,
-		relation: Model.ManyHasManyOwningRelation,
-		targetEntity: Model.Entity,
-	) {
+	public visitManyHasManyOwning({ entity, targetEntity, relation }: Model.ManyHasManyOwningContext) {
 		return this.getAllowedOperations(targetEntity, entity, relation)
 	}
 
-	public visitOneHasMany({}, {}, targetEntity: Model.Entity, targetRelation: Model.ManyHasOneRelation) {
+	public visitOneHasMany({ targetRelation, targetEntity }: Model.OneHasManyContext) {
 		return this.getAllowedOperations(targetEntity, targetEntity, targetRelation)
 	}
 
-	public visitManyHasOne(entity: Model.Entity, relation: Model.ManyHasOneRelation, targetEntity: Model.Entity) {
+	public visitManyHasOne({ targetEntity, relation, entity }: Model.ManyHasOneContext) {
 		const operations = this.getAllowedOperations(targetEntity, entity, relation)
 		if (relation.nullable) {
 			return operations
@@ -39,12 +35,7 @@ export class UpdateEntityRelationAllowedOperationsVisitor implements
 		return operations.filter(it => !forbiddenOperations.includes(it))
 	}
 
-	public visitOneHasOneInverse(
-		{},
-		relation: Model.OneHasOneInverseRelation,
-		targetEntity: Model.Entity,
-		targetRelation: Model.OneHasOneOwningRelation,
-	) {
+	public visitOneHasOneInverse({ relation, targetEntity, targetRelation }: Model.OneHasOneInverseContext) {
 		const operations = this.getAllowedOperations(targetEntity, targetEntity, targetRelation)
 		if (relation.nullable || targetRelation.nullable) {
 			return operations
@@ -52,12 +43,7 @@ export class UpdateEntityRelationAllowedOperationsVisitor implements
 		return operations.filter(it => it === Input.UpdateRelationOperation.update)
 	}
 
-	public visitOneHasOneOwning(
-		entity: Model.Entity,
-		relation: Model.OneHasOneOwningRelation,
-		targetEntity: Model.Entity,
-		targetRelation: Model.OneHasOneInverseRelation | null,
-	) {
+	public visitOneHasOneOwning({ targetEntity, entity, relation, targetRelation }: Model.OneHasOneOwningContext) {
 		const operations = this.getAllowedOperations(targetEntity, entity, relation)
 		if (relation.nullable || !targetRelation || targetRelation.nullable) {
 			return operations

package/src/schema/mutations/UpdateEntityRelationInputFieldVisitor.ts

@@ -1,10 +1,15 @@
-import { GraphQLBoolean, GraphQLInputObjectType, GraphQLString } from 'graphql'
+import {
+	GraphQLBoolean,
+	GraphQLInputFieldConfig,
+	GraphQLInputFieldConfigMap,
+	GraphQLInputObjectType,
+	GraphQLString,
+} from 'graphql'
 import { Acl, Input, Model } from '@contember/schema'
 import { GqlTypeName } from '../utils'
 import { WhereTypeProvider } from '../WhereTypeProvider'
 import { Accessor, filterObject } from '../../utils'
 import { EntityInputProvider, EntityInputType } from './EntityInputProvider'
-import { GraphQLInputFieldConfig, GraphQLInputFieldConfigMap } from 'graphql/type/definition'
 import { acceptFieldVisitor } from '@contember/schema-utils'
 import { UpdateEntityRelationAllowedOperationsVisitor } from './UpdateEntityRelationAllowedOperationsVisitor'
 import { Authorizator } from '../../acl'
@@ -27,12 +32,7 @@ export class UpdateEntityRelationInputFieldVisitor implements
 		throw new Error('UpdateEntityRelationInputFieldVisitor: Not applicable for a column')
 	}
 
-	public visitHasOne(
-		entity: Model.Entity,
-		relation: Model.Relation & Model.NullableRelation,
-		targetEntity: Model.Entity,
-		targetRelation: Model.Relation | null,
-	): GraphQLInputObjectType | undefined {
+	public visitHasOne({ targetRelation, targetEntity, relation, entity }: Model.AnyHasOneRelationContext) {
 		const withoutRelation = targetRelation ? targetRelation.name : undefined
 
 		const whereInput = this.createWhereInput(targetEntity)
@@ -84,12 +84,7 @@ export class UpdateEntityRelationInputFieldVisitor implements
 		})
 	}
 
-	public visitHasMany(
-		entity: Model.Entity,
-		relation: Model.Relation,
-		targetEntity: Model.Entity,
-		targetRelation: Model.Relation | null,
-	): GraphQLInputObjectType | undefined {
+	public visitHasMany({ entity, relation, targetEntity, targetRelation }: Model.AnyHasManyRelationContext) {
 		const withoutRelation = targetRelation ? targetRelation.name : undefined
 
 		const whereInput = this.createWhereInput(targetEntity)

package/src/schema/utils.ts

@@ -1,5 +1,5 @@
 import { capitalizeFirstLetter } from '../utils'
-import { GraphQLFieldResolver } from 'graphql/type/definition'
+import { GraphQLFieldResolver } from 'graphql'
 
 export const GqlTypeName = (strings: TemplateStringsArray, ...values: string[]) => {
 	return strings.reduce((combined, string, i) => {

package/src/tsconfig.json

@@ -9,22 +9,22 @@
 			"path": "../../database/src"
 		},
 		{
-			"path": "../../engine-common/src"
+			"path": "../../dic/src"
 		},
 		{
-			"path": "../../schema/src"
+			"path": "../../graphql-utils/src"
 		},
 		{
-			"path": "../../schema-definition/src"
+			"path": "../../logger/src"
 		},
 		{
-			"path": "../../schema-utils/src"
+			"path": "../../schema/src"
 		},
 		{
-			"path": "../../dic/src"
+			"path": "../../schema-definition/src"
 		},
 		{
-			"path": "../../graphql-utils/src"
+			"path": "../../schema-utils/src"
 		}
 	]
 }

package/src/utils/object.ts

@@ -9,18 +9,18 @@ function filterObject<Input extends {}, Result extends { [Key in keyof Input]: I
 	object: Input,
 	callback: TypeGuard<Input, Result> | Filter<Input>,
 ): Result {
-	return (Object.entries(object) as any)
-		.filter(<K extends keyof Input>(it: [K, Input[K]]): it is [K, Result[K]] =>
-			(callback as any)(it[0] as K, it[1] as Input[K], object),
-		)
-		.reduce((result: Result, [key, value]: [string, any]) => ({ ...(result as any), [key]: value }), {} as Result)
+	return Object.fromEntries(Object.entries(object)
+		.filter(([key, value]) => (callback as any)(key, value, object)),
+	) as Result
 }
 
 function mapObject<Input, Result>(
 	input: { [key: string]: Input },
 	callback: (value: Input, key: string) => Result,
 ): { [key: string]: Result } {
-	return Object.keys(input).reduce((acc, key) => ({ ...acc, [key]: callback(input[key], key) }), {})
+	return Object.fromEntries(
+		Object.entries(input).map(([key, value]) => [key, callback(value, key)]),
+	)
 }
 
 export { filterObject, mapObject }

package/src/utils/uniqueWhereFields.ts

@@ -8,10 +8,10 @@ export const getFieldsForUniqueWhere = (schema: Model.Schema, entity: Model.Enti
 			visitColumn: () => undefined,
 			visitManyHasManyInverse: () => undefined,
 			visitManyHasManyOwning: () => undefined,
-			visitOneHasMany: ({}, relation) => [relation.name],
+			visitOneHasMany: ({ relation }) => [relation.name],
 			visitManyHasOne: () => undefined,
-			visitOneHasOneInverse: ({}, relation) => [relation.name],
-			visitOneHasOneOwning: ({}, relation) => [relation.name],
+			visitOneHasOneInverse: ({ relation }) => [relation.name],
+			visitOneHasOneOwning: ({ relation }) => [relation.name],
 		}),
 	).filter((it): it is [string] => !!it)
 

package/tests/cases/bugs/bug102.test.ts

@@ -48,12 +48,12 @@ test('Filter by has many with additional join', async () => {
 		executes: [
 			{
 				sql: SQL`
-select "root_"."id" as "root_id", "root_"."short_name" as "root_shortName", "root_"."id" as "root_id"
-from "public"."person" as "root_"
-where exists (select 1
-  from "public"."person_locale" as "sub_"
-    left join "public"."language" as "sub_locale" on "sub_"."locale_id" = "sub_locale"."id"
-  where "root_"."id" = "sub_"."person_id" and "sub_locale"."slug" = ? and not("sub_"."url_slug" is null))`,
+					select "root_"."id" as "root_id", "root_"."short_name" as "root_shortName", "root_"."id" as "root_id"
+					from "public"."person" as "root_"
+					where exists (select 1
+						from "public"."person_locale" as "root_locales"
+						left join  "public"."language" as "root_locales_locale" on  "root_locales"."locale_id" = "root_locales_locale"."id"
+						where "root_"."id" = "root_locales"."person_id" and "root_locales_locale"."slug" = ? and not("root_locales"."url_slug" is null))`,
 				response: { rows: [{ root_id: testUuid(1), root_shortName: 'John' }] },
 				parameters: ['cs'],
 			},

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

@@ -50,12 +50,12 @@ test('delete post with acl', async () => {
 						],
 					},
 				},
+				{
+					sql: SQL`select "root_"."id" from "public"."post" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
 				...sqlDeferred([
-					{
-						sql: SQL`select "root_"."id" from "public"."post" as "root_" where "root_"."id" = ?`,
-						parameters: [testUuid(1)],
-						response: { rows: [{ id: testUuid(1) }] },
-					},
 					{
 						sql: SQL`delete from "public"."post"
             where "id" in (select "root_"."id"

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

@@ -34,12 +34,12 @@ test('delete post with additional filter', async () => {
 						],
 					},
 				},
+				{
+					sql: SQL`select "root_"."id" from "public"."post" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
 				...sqlDeferred([
-					{
-						sql: SQL`select "root_"."id" from "public"."post" as "root_" where "root_"."id" = ?`,
-						parameters: [testUuid(1)],
-						response: { rows: [{ id: testUuid(1) }] },
-					},
 					{
 						sql: SQL`delete from "public"."post"
             where "id" in (select "root_"."id"

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

@@ -39,12 +39,12 @@ test('delete author with posts and locales cascade delete', async () => {
 						],
 					},
 				},
+				{
+					sql: SQL`select "root_"."id" from "public"."author" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
 				...sqlDeferred([
-					{
-						sql: SQL`select "root_"."id" from "public"."author" as "root_" where "root_"."id" = ?`,
-						parameters: [testUuid(1)],
-						response: { rows: [{ id: testUuid(1) }] },
-					},
 					{
 						sql: SQL`delete from "public"."author"
             where "id" in (select "root_"."id"

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

@@ -57,12 +57,12 @@ test('delete post by id', async () => {
 						],
 					},
 				},
+				{
+					sql: SQL`select "root_"."id" from "public"."post" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
 				...sqlDeferred([
-					{
-						sql: SQL`select "root_"."id" from "public"."post" as "root_" where "root_"."id" = ?`,
-						parameters: [testUuid(1)],
-						response: { rows: [{ id: testUuid(1) }] },
-					},
 					{
 						sql: SQL`delete from "public"."post"
             where "id" in (select "root_"."id"

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

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

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

@@ -36,12 +36,12 @@ test('delete author and set null on posts', async () => {
 						],
 					},
 				},
+				{
+					sql: SQL`select "root_"."id" from "public"."author" as "root_" where "root_"."id" = ?`,
+					parameters: [testUuid(1)],
+					response: { rows: [{ id: testUuid(1) }] },
+				},
 				...sqlDeferred([
-					{
-						sql: SQL`select "root_"."id" from "public"."author" as "root_" where "root_"."id" = ?`,
-						parameters: [testUuid(1)],
-						response: { rows: [{ id: testUuid(1) }] },
-					},
 					{
 						sql: SQL`delete from "public"."author"
             where "id" in (select "root_"."id"

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

@@ -41,16 +41,18 @@ test('different predicate on row and field level', async () => {
 		executes: [
 			{
 				sql: SQL`
-					select "root_"."id" as "root_id",
-						case when "root_"."username" = ? then "root_"."username" else null end as "root_username"
-					from "public"."author" as "root_"
-					where not("root_"."username" is null)
+					select
+					    "root_"."id" as "root_id",
+					    "root_"."username" = ? as "root___predicate_authorPredicate",
+					    "root_"."username" as "root_username"
+					from "public"."author" as "root_" where not("root_"."username" is null)
 				`,
 				parameters: ['johndoe'],
 				response: {
 					rows: [
 						{
 							root_id: testUuid(1),
+							root___predicate_authorPredicate: true,
 							root_username: 'johndoe',
 						},
 					],
@@ -71,3 +73,51 @@ test('different predicate on row and field level', async () => {
 })
 
 
+
+test('different predicate on row and field level - false', async () => {
+	await execute({
+		schema: schema,
+		permissions: permissions,
+		variables: {},
+		query: GQL`
+        query {
+          listAuthor {
+            id
+            username
+          }
+        }`,
+		executes: [
+			{
+				sql: SQL`
+					select
+					    "root_"."id" as "root_id",
+					    "root_"."username" = ? as "root___predicate_authorPredicate",
+					    "root_"."username" as "root_username"
+					from "public"."author" as "root_" where not("root_"."username" is null)
+				`,
+				parameters: ['johndoe'],
+				response: {
+					rows: [
+						{
+							root_id: testUuid(1),
+							root___predicate_authorPredicate: false,
+							root_username: 'johndoe',
+						},
+					],
+				},
+			},
+		],
+		return: {
+			data: {
+				listAuthor: [
+					{
+						id: testUuid(1),
+						username: null,
+					},
+				],
+			},
+		},
+	})
+})
+
+

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

@@ -63,26 +63,23 @@ test('querying id and title', async () => {
         }`,
 		executes: [
 			{
-				sql: SQL`select
-                         "root_"."id" as "root_id",
-                         case when "root_"."locale" in (?) then "root_"."title" else null end as "root_title",
-                         "root_"."locale" in (?) as "root__meta_title_readable",
-                         false as "root__meta_title_updatable"
-                       from "public"."post_locale" as "root_"`,
-				parameters: ['cs', 'cs'],
+				sql: SQL`SELECT
+							 "root_"."id" AS "root_id",
+							 "root_"."locale" IN (?) AS "root___predicate_localePredicate",
+							 "root_"."title" AS "root_title"
+						 FROM "public"."post_locale" AS "root_"`,
+				parameters: ['cs'],
 				response: {
 					rows: [
 						{
 							root_id: testUuid(1),
 							root_title: null,
-							root__meta_title_readable: false,
-							root__meta_title_updatable: false,
+							root___predicate_localePredicate: false,
 						},
 						{
 							root_id: testUuid(2),
 							root_title: 'bar',
-							root__meta_title_readable: true,
-							root__meta_title_updatable: false,
+							root___predicate_localePredicate: true,
 						},
 					],
 				},
@@ -134,8 +131,9 @@ test('querying with extra where', async () => {
 		executes: [
 			{
 				sql: SQL`select
-                         "root_"."id" as "root_id",
-                         case when "root_"."locale" in (?) then "root_"."title" else null end as "root_title"
+							 "root_"."id" as "root_id",
+							 "root_"."locale" in (?) as "root___predicate_localePredicate",
+							 "root_"."title" as "root_title"
                        from "public"."post_locale" as "root_"
                        where "root_"."title" = ? and "root_"."locale" in (?)`,
 				parameters: ['cs', 'foo', 'cs'],
@@ -144,7 +142,7 @@ test('querying with extra where', async () => {
 						{
 							root_id: testUuid(1),
 							root_title: 'foo',
-							root_title__readable: true,
+							root___predicate_localePredicate: true,
 						},
 					],
 				},
@@ -217,10 +215,11 @@ test('not defined acl variable', async () => {
         }`,
 		executes: [
 			{
-				sql: SQL`select
-                         "root_"."id" as "root_id",
-                         case when false then "root_"."title" else null end as "root_title"
-                       from "public"."post_locale" as "root_"`,
+				sql: SQL`
+					select "root_"."id" as "root_id",
+					       false as "root___predicate_localePredicate",
+					       "root_"."title" as "root_title"
+					from "public"."post_locale" as "root_"`,
 				parameters: [],
 				response: {
 					rows: [],
@@ -270,23 +269,25 @@ test('querying on nested field', async () => {
 				},
 			},
 			{
-				sql: SQL`select
-                         "root_"."post_id" as "__grouping_key",
-                         "root_"."id" as "root_id",
-                         case when "root_"."locale" in (?) then "root_"."title" else null end as "root_title"
-                       from "public"."post_locale" as "root_"
-                       where "root_"."post_id" in (?, ?)`,
+				sql: SQL`
+					select "root_"."post_id" as "__grouping_key",
+					       "root_"."id" as "root_id",
+					       "root_"."locale" in (?) as "root___predicate_localePredicate",
+					       "root_"."title" as "root_title"
+					from "public"."post_locale" as "root_" where "root_"."post_id" in (?, ?)`,
 				parameters: ['cs', testUuid(1), testUuid(2)],
 				response: {
 					rows: [
 						{
 							__grouping_key: testUuid(1),
 							root_id: testUuid(3),
-							root_title: null,
+							root___predicate_localePredicate: false,
+							root_title: 'foo',
 						},
 						{
 							__grouping_key: testUuid(2),
 							root_id: testUuid(4),
+							root___predicate_localePredicate: true,
 							root_title: 'bar',
 						},
 					],