@contember/engine-content-api 1.2.0-alpha.18 → 1.2.0-alpha.19

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

@@ -22,11 +22,13 @@ test('Post by category name (where many has many owning)', async () => {
         }`,
 		executes: [
 			{
-				sql: SQL`select "root_"."id" as "root_id"
-                     from "public"."post" as "root_"
-                     where exists (select 1
-                                            from "public"."post_categories" as "junction_" inner join "public"."category" as "sub_" on "junction_"."category_id" = "sub_"."id"
-                                            where "root_"."id" = "junction_"."post_id"  and "sub_"."name" = ?)`,
+				sql: SQL`
+					select "root_"."id" as "root_id"
+					from "public"."post" as "root_"
+					where exists (select 1
+						from "public"."post_categories" as "root_categories_junction_"
+						inner join  "public"."category" as "root_categories" on  "root_categories_junction_"."category_id" = "root_categories"."id"
+						where "root_"."id" = "root_categories_junction_"."post_id" and "root_categories"."name" = ?)`,
 				parameters: ['Stuff'],
 				response: {
 					rows: [
@@ -73,10 +75,11 @@ test('Post by category ids (where many has many owning)', async () => {
 		executes: [
 			{
 				sql: SQL`select "root_"."id" as "root_id"
-                     from "public"."post" as "root_"
-                     where exists (select 1
-                                            from "public"."post_categories" as "junction_"
-                                            where "root_"."id" = "junction_"."post_id" and "junction_"."category_id" in (?, ?))`,
+						from "public"."post" as "root_"
+						where exists (select 1
+						              from "public"."post_categories" as "root_categories_junction_"
+						              where "root_"."id" = "root_categories_junction_"."post_id" and "root_categories_junction_"."category_id" in (?, ?))
+				`,
 				parameters: [testUuid(10), testUuid(11)],
 				response: {
 					rows: [
@@ -131,12 +134,11 @@ test('Post by category tag name (where multiple many has many owning)', async ()
 			{
 				sql: SQL`
 					select "root_"."id" as "root_id"  from "public"."post" as "root_"
-					where exists (select 1
-						from "public"."post_categories" as "junction_"
-						inner join  "public"."category" as "sub_" on  "junction_"."category_id" = "sub_"."id"
-						left join  "public"."category_tags_but_with_very_very_very_long_name_so_it_reaches_postgresql_alias_length_limit" as "sub_x_sub_tagsButWithVeryVeryVeryLongNameSoItReachesPostgresq_2" on  "sub_"."id" = "sub_x_sub_tagsButWithVeryVeryVeryLongNameSoItReachesPostgresq_2"."category_id"
-						left join  "public"."tag" as "sub_tagsButWithVeryVeryVeryLongNameSoItReachesPostgresqlAlias_1" on  "sub_x_sub_tagsButWithVeryVeryVeryLongNameSoItReachesPostgresq_2"."tag_id" = "sub_tagsButWithVeryVeryVeryLongNameSoItReachesPostgresqlAlias_1"."id"
-						where "root_"."id" = "junction_"."post_id" and "sub_tagsButWithVeryVeryVeryLongNameSoItReachesPostgresqlAlias_1"."name" = ?)`,
+					where exists (select 1  from "public"."post_categories" as "root_categories_junction_"
+					    inner join  "public"."category" as "root_categories" on  "root_categories_junction_"."category_id" = "root_categories"."id"
+					    left join  "public"."category_tags_but_with_very_very_very_long_name_so_it_reaches_postgresql_alias_length_limit" as "root_categoriesx_root_categoriestagsButWithVeryVeryVeryLongNa_3" on  "root_categories"."id" = "root_categoriesx_root_categoriestagsButWithVeryVeryVeryLongNa_3"."category_id"
+					    left join  "public"."tag" as "root_categoriestagsButWithVeryVeryVeryLongNameSoItReachesPost_1" on  "root_categoriesx_root_categoriestagsButWithVeryVeryVeryLongNa_3"."tag_id" = "root_categoriestagsButWithVeryVeryVeryLongNameSoItReachesPost_1"."id"
+					    where "root_"."id" = "root_categories_junction_"."post_id" and "root_categoriestagsButWithVeryVeryVeryLongNameSoItReachesPost_1"."name" = ?)`,
 				parameters: ['Stuff'],
 				response: {
 					rows: [

package/tests/cases/integration/graphQlRequests/query/filter/oneHasManyRelation.test.ts

@@ -23,11 +23,10 @@ test('Author by post title (where one has many)', async () => {
         }`,
 		executes: [
 			{
-				sql: SQL`select "root_"."id" as "root_id"
-                     from "public"."author" as "root_"
-                     where exists (select 1
-                                            from "public"."post" as "sub_"
-                                            where "root_"."id" = "sub_"."author_id" and "sub_"."title" = ?)`,
+				sql: SQL`select "root_"."id" as "root_id" from "public"."author" as "root_"
+                                 where exists (select 1
+                                               from "public"."post" as "root_posts"
+                                               where "root_"."id" = "root_posts"."author_id" and "root_posts"."title" = ?)`,
 				parameters: ['Hello'],
 				response: {
 					rows: [

package/tests/cases/integration/graphQlRequests/query/unique/oneHasManyUnique.test.ts

@@ -28,9 +28,11 @@ test('Post by post locale (one-has-many unique)', async () => {
         }`,
 		executes: [
 			{
-				sql: SQL`SELECT "root_"."id" AS "root_id"
-						         FROM "public"."post" AS "root_"
-						         WHERE EXISTS (SELECT 1 FROM "public"."post_locale" AS "sub_" WHERE "root_"."id" = "sub_"."post_id" AND "sub_"."id" = ?)`,
+				sql: SQL`select "root_"."id" as "root_id"
+						from "public"."post" as "root_"
+						where exists (select 1
+						              from "public"."post_locale" as "root_locales"
+						              where "root_"."id" = "root_locales"."post_id" and "root_locales"."id" = ?)`,
 				parameters: [testUuid(1)],
 				response: { rows: [{ root_id: testUuid(2) }] },
 			},

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

@@ -22,12 +22,12 @@ test('delete', async () => {
 					parameters: [testUuid(2)],
 					response: { rows: [{ id: testUuid(2) }] },
 				},
+				{
+					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/update/manyHasManyOwning/delete.test.ts

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

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

@@ -31,12 +31,12 @@ test('delete', async () => {
 						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) }] },
+				},
 				...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"
@@ -99,12 +99,12 @@ test('delete with cascade', async () => {
 						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) }] },
+				},
 				...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/update/oneHasMany/combination.test.ts

@@ -22,12 +22,12 @@ test('delete and create', async () => {
 					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(9) }] },
+				},
 				...sqlDeferred([
-					{
-						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(9) }] },
-					},
 					{
 						sql: SQL`delete from "public"."post_locale"
               where "id" in (select "root_"."id"

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

@@ -22,12 +22,12 @@ test('delete', async () => {
 					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) }] },
+				},
 				...sqlDeferred([
-					{
-						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`delete from "public"."post_locale"
               where "id" in (select "root_"."id"

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

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

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

@@ -1,7 +1,7 @@
 import { graphql, printSchema } from 'graphql'
 import { Acl, Model } from '@contember/schema'
-import * as path from 'path'
-
+import * as fs from 'node:fs/promises'
+import * as path from 'node:path'
 import {
 	AllowAllPermissionFactory,
 	SchemaBuilder,
@@ -10,7 +10,6 @@ import {
 } from '@contember/schema-definition'
 import { Authorizator, GraphQlSchemaBuilderFactory } from '../../../../src'
 import * as model from './model'
-import { promises as fs } from 'fs'
 import { assert, describe, it } from 'vitest'
 
 interface Test {

package/tests/cases/unit/whereBuilder.test.ts

@@ -17,6 +17,11 @@ namespace WhereBuilderModel {
 		title = def.stringColumn()
 		isPublic = def.boolColumn().notNull()
 		author = def.manyHasOne(Author, 'articles')
+		tags = def.manyHasMany(Tag)
+	}
+
+	export class Tag {
+		name = def.stringColumn()
 	}
 }
 
@@ -25,7 +30,7 @@ const createWhere = (schema: Schema, where: Input.Where) => {
 	const joinBuilder = new JoinBuilder(schema.model)
 	const conditionBuilder = new ConditionBuilder()
 	const whereOptimizer = new WhereOptimizer(schema.model, new ConditionOptimizer())
-	const whereBuilder = new WhereBuilder(schema.model, joinBuilder, conditionBuilder, pathFactory, whereOptimizer)
+	const whereBuilder = new WhereBuilder(schema.model, joinBuilder, conditionBuilder, pathFactory, whereOptimizer, schema.settings.useExistsInHasManyFilter === true)
 
 	const qb = SelectBuilder.create()
 		.from('author', 'root_')
@@ -48,7 +53,7 @@ describe('where builder', () => {
 		})
 		assert.equal(
 			where,
-			' where exists (select 1  from "__SCHEMA__"."article" as "sub_"  where "root_"."id" = "sub_"."author_id" and "sub_"."is_public" = ?) and exists (select 1  from "__SCHEMA__"."article" as "sub_"  where "root_"."id" = "sub_"."author_id" and "sub_"."title" = ?)',
+			' where exists (select 1  from "__SCHEMA__"."article" as "root_articles"  where "root_"."id" = "root_articles"."author_id" and "root_articles"."is_public" = ?) and exists (select 1  from "__SCHEMA__"."article" as "root_articles"  where "root_"."id" = "root_articles"."author_id" and "root_articles"."title" = ?)',
 		)
 	})
 
@@ -64,7 +69,7 @@ describe('where builder', () => {
 		})
 		assert.equal(
 			where,
-			' where exists (select 1  from "__SCHEMA__"."article" as "sub_"  where "root_"."id" = "sub_"."author_id" and "sub_"."is_public" = ? and "sub_"."title" = ?)',
+			' where exists (select 1  from "__SCHEMA__"."article" as "root_articles"  where "root_"."id" = "root_articles"."author_id" and "root_articles"."is_public" = ? and "root_articles"."title" = ?)',
 		)
 	})
 
@@ -78,7 +83,66 @@ describe('where builder', () => {
 		})
 		assert.equal(
 			where,
-			' where exists (select 1  from (select "root_"."id") as "sub2_" left join  "__SCHEMA__"."article" as "sub_" on  "sub2_"."id" = "sub_"."author_id"  where "sub_"."id" is null)',
+			' where exists (select 1  from (select "root_"."id") as "root_articles_tmp_" left join  "__SCHEMA__"."article" as "root_articles" on  "root_articles_tmp_"."id" = "root_articles"."author_id"  where "root_articles"."id" is null)',
+		)
+	})
+
+	it('where with nested has-many', () => {
+		const schema: Schema = { ...createSchema(WhereBuilderModel), settings: { useExistsInHasManyFilter: true } }
+		const where = createWhere(schema, {
+			articles: {
+				and: [
+					{ tags: { name: { eq: 'Hello' } } },
+					{ tags: { name: { eq: 'World' } } },
+				],
+			},
+		})
+		compareWhere(
+			where,
+			`where exists (select 1
+				from "__SCHEMA__"."article" as "root_articles"
+				where "root_"."id" = "root_articles"."author_id"
+					and exists (select 1
+						from "__SCHEMA__"."article_tags" as "root_articles_tags_junction_"
+						inner join  "__SCHEMA__"."tag" as "root_articles_tags" on  "root_articles_tags_junction_"."tag_id" = "root_articles_tags"."id"
+						where "root_articles"."id" = "root_articles_tags_junction_"."article_id" and "root_articles_tags"."name" = ?)
+					and exists (select 1
+						from "__SCHEMA__"."article_tags" as "root_articles_tags_junction_"
+						inner join  "__SCHEMA__"."tag" as "root_articles_tags" on  "root_articles_tags_junction_"."tag_id" = "root_articles_tags"."id"
+						where "root_articles"."id" = "root_articles_tags_junction_"."article_id" and "root_articles_tags"."name" = ?))`,
+		)
+	})
+
+
+	it('where without nested has-many', () => {
+		const schema: Schema = { ...createSchema(WhereBuilderModel) }
+		const where = createWhere(schema, {
+			articles: {
+				and: [
+					{ tags: { name: { eq: 'Hello' } } },
+					{ tags: { name: { eq: 'World' } } },
+				],
+			},
+		})
+		compareWhere(
+			where,
+			`where exists (select 1
+				from "__SCHEMA__"."article" as "root_articles"
+				left join "__SCHEMA__"."article_tags" as "root_articles_x_root_articles_tags" on "root_articles"."id" = "root_articles_x_root_articles_tags"."article_id"
+				left join "__SCHEMA__"."tag" as "root_articles_tags" on "root_articles_x_root_articles_tags"."tag_id" = "root_articles_tags"."id"
+				where "root_"."id" = "root_articles"."author_id" and "root_articles_tags"."name" = ? and "root_articles_tags"."name" = ?)`,
 		)
 	})
 })
+
+
+const compareWhere = (actual: string, expected: string) => {
+	const normalize = (s: string) => s.replaceAll(/\s+/g, ' ').trim()
+	try {
+		assert.equal(normalize(actual), normalize(expected))
+	} catch (e) {
+		console.log(normalize(actual))
+		console.log(normalize(expected))
+		throw e
+	}
+}

package/tests/src/test.ts

@@ -5,7 +5,7 @@ import { executeGraphQlTest } from './testGraphql'
 import { Client } from '@contember/database'
 import { createConnectionMock } from '@contember/database-tester'
 import { createUuidGenerator } from '@contember/engine-api-tester'
-import { getArgumentValues } from 'graphql/execution/values'
+import { getArgumentValues } from 'graphql'
 import { SQL } from './tags'
 
 export interface SqlQuery {

package/tests/src/testGraphql.ts

@@ -1,3 +1,4 @@
+import { NullLoggerHandler, withLogger, createLogger } from '@contember/logger'
 import { graphql, GraphQLSchema } from 'graphql'
 import { assert } from 'vitest'
 
@@ -10,11 +11,14 @@ export interface Test {
 }
 
 export const executeGraphQlTest = async (test: Test) => {
-	const rawResponse = await graphql({
-		schema: test.schema,
-		source: test.query,
-		contextValue: test.context,
-		variableValues: test.queryVariables,
+	const logger = createLogger(new NullLoggerHandler())
+	const rawResponse = await withLogger(logger, () => {
+		return graphql({
+			schema: test.schema,
+			source: test.query,
+			contextValue: test.context,
+			variableValues: test.queryVariables,
+		})
 	})
 	const response = JSON.parse(JSON.stringify(rawResponse))
 	if ('errors' in rawResponse) {