From 2895709f8995ec128148680fedd5165b1e4a2635 Mon Sep 17 00:00:00 2001 From: theluckystrike <51033404+theluckystrike@users.noreply.github.com> Date: Mon, 9 Nov 2026 02:27:34 +0100 Subject: [PATCH 1/2] fix(orm): compare typed JSON arrays by value in equals filters --- .../src/client/crud/dialects/base-dialect.ts | 7 +++- tests/regression/test/issue-2843.test.ts | 34 +++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 tests/regression/test/issue-2843.test.ts diff --git a/packages/orm/src/client/crud/dialects/base-dialect.ts b/packages/orm/src/client/crud/dialects/base-dialect.ts index 0160c9586..b9c6eecac 100644 --- a/packages/orm/src/client/crud/dialects/base-dialect.ts +++ b/packages/orm/src/client/crud/dialects/base-dialect.ts @@ -617,7 +617,12 @@ export abstract class BaseCrudDialect { switch (key) { case 'equals': { - clauses.push(this.eb(receiver, '=', buildArray(value))); + if (isTypeDef(this.schema, fieldDef.type) && !isPrimitiveTypeDef(this.schema, fieldDef.type)) { + // a typed JSON array is stored as a single JSON value, not a native list + clauses.push(this.buildJsonValueFilterClause(fieldRef, _value)); + } else { + clauses.push(this.eb(receiver, '=', buildArray(value))); + } break; } diff --git a/tests/regression/test/issue-2843.test.ts b/tests/regression/test/issue-2843.test.ts new file mode 100644 index 000000000..7b815757b --- /dev/null +++ b/tests/regression/test/issue-2843.test.ts @@ -0,0 +1,34 @@ +import { createTestClient } from '@zenstackhq/testtools'; +import { describe, expect, it } from 'vitest'; + +describe('Regression for issue #2843', () => { + const schema = ` + type Entry { + label String + } + + model Example { + id Int @id + entries Entry[] @json + } + `; + + it('filters a typed JSON array field with equals', async () => { + const db = await createTestClient(schema, { provider: 'postgresql' }); + + await db.example.create({ data: { id: 1, entries: [{ label: 'x' }] } }); + await db.example.create({ data: { id: 2, entries: [{ label: 'y' }, { label: 'x' }] } }); + await db.example.create({ data: { id: 3, entries: [] } }); + + await expect(db.example.findMany({ where: { entries: { equals: [{ label: 'x' }] } } })).resolves.toEqual([ + { id: 1, entries: [{ label: 'x' }] }, + ]); + await expect( + db.example.findMany({ where: { entries: { equals: [{ label: 'y' }, { label: 'x' }] } } }), + ).resolves.toEqual([{ id: 2, entries: [{ label: 'y' }, { label: 'x' }] }]); + await expect(db.example.findMany({ where: { entries: { equals: [] } } })).resolves.toEqual([ + { id: 3, entries: [] }, + ]); + await expect(db.example.findMany({ where: { entries: { equals: [{ label: 'z' }] } } })).resolves.toEqual([]); + }); +}); From c4d7b9ef3d95f8fca2ed4dff2b49f1050047ce7c Mon Sep 17 00:00:00 2001 From: Michael Lip <51033404+theluckystrike@users.noreply.github.com> Date: Thu, 12 Nov 2026 17:02:11 +0700 Subject: [PATCH 2/2] fix(orm): compare typed JSON arrays in order on MySQL Bi-directional JSON_CONTAINS ignores element order and duplicates, so a typed JSON array equals filter on MySQL matched reordered arrays. Use MySQL's native JSON comparison instead, and run the regression test on every provider with reordered and duplicate rows. --- .../orm/src/client/crud/dialects/base-dialect.ts | 9 ++++++++- packages/orm/src/client/crud/dialects/mysql.ts | 7 +++++++ tests/regression/test/issue-2843.test.ts | 15 +++++++++++++-- 3 files changed, 28 insertions(+), 3 deletions(-) diff --git a/packages/orm/src/client/crud/dialects/base-dialect.ts b/packages/orm/src/client/crud/dialects/base-dialect.ts index b9c6eecac..07bdad355 100644 --- a/packages/orm/src/client/crud/dialects/base-dialect.ts +++ b/packages/orm/src/client/crud/dialects/base-dialect.ts @@ -619,7 +619,7 @@ export abstract class BaseCrudDialect { case 'equals': { if (isTypeDef(this.schema, fieldDef.type) && !isPrimitiveTypeDef(this.schema, fieldDef.type)) { // a typed JSON array is stored as a single JSON value, not a native list - clauses.push(this.buildJsonValueFilterClause(fieldRef, _value)); + clauses.push(this.buildJsonArrayEqualityFilter(fieldRef, _value)); } else { clauses.push(this.eb(receiver, '=', buildArray(value))); } @@ -893,6 +893,13 @@ export abstract class BaseCrudDialect { } } + /** + * Builds an exact, element-order-sensitive equality filter for a typed JSON array field. + */ + protected buildJsonArrayEqualityFilter(lhs: Expression, rhs: unknown) { + return this.buildJsonValueFilterClause(lhs, rhs); + } + protected buildJsonEqualityFilter(lhs: Expression, rhs: unknown) { return this.buildValueFilter(lhs, 'Json', rhs); } diff --git a/packages/orm/src/client/crud/dialects/mysql.ts b/packages/orm/src/client/crud/dialects/mysql.ts index 3b06c4589..58e4085fb 100644 --- a/packages/orm/src/client/crud/dialects/mysql.ts +++ b/packages/orm/src/client/crud/dialects/mysql.ts @@ -304,6 +304,13 @@ export class MySqlCrudDialect extends LateralJoinDiale ]); } + protected override buildJsonArrayEqualityFilter(lhs: Expression, rhs: unknown) { + // bi-directional JSON_CONTAINS ignores element order and duplicates, use MySQL's native JSON + // comparison instead: arrays are equal only if they have the same length and equal values at + // each position, while objects are compared regardless of key order + return sql`${lhs} = CAST(${sql.val(JSON.stringify(rhs))} AS JSON)`; + } + protected override buildJsonPathSelection(receiver: Expression, path: string | undefined) { if (path) { return this.eb.fn('JSON_EXTRACT', [receiver, this.eb.val(path)]); diff --git a/tests/regression/test/issue-2843.test.ts b/tests/regression/test/issue-2843.test.ts index 7b815757b..e05808c09 100644 --- a/tests/regression/test/issue-2843.test.ts +++ b/tests/regression/test/issue-2843.test.ts @@ -1,4 +1,4 @@ -import { createTestClient } from '@zenstackhq/testtools'; +import { createTestClient, generateTsSchema } from '@zenstackhq/testtools'; import { describe, expect, it } from 'vitest'; describe('Regression for issue #2843', () => { @@ -14,11 +14,16 @@ describe('Regression for issue #2843', () => { `; it('filters a typed JSON array field with equals', async () => { - const db = await createTestClient(schema, { provider: 'postgresql' }); + // ZModel only accepts list fields for PostgreSQL, so generate the schema for PostgreSQL and run it + // against the configured test provider to also cover the other dialects' JSON array comparison + const { schema: schemaDef } = await generateTsSchema(schema, 'postgresql'); + const db: any = await createTestClient(schemaDef); await db.example.create({ data: { id: 1, entries: [{ label: 'x' }] } }); await db.example.create({ data: { id: 2, entries: [{ label: 'y' }, { label: 'x' }] } }); await db.example.create({ data: { id: 3, entries: [] } }); + await db.example.create({ data: { id: 4, entries: [{ label: 'x' }, { label: 'y' }] } }); + await db.example.create({ data: { id: 5, entries: [{ label: 'x' }, { label: 'x' }] } }); await expect(db.example.findMany({ where: { entries: { equals: [{ label: 'x' }] } } })).resolves.toEqual([ { id: 1, entries: [{ label: 'x' }] }, @@ -29,6 +34,12 @@ describe('Regression for issue #2843', () => { await expect(db.example.findMany({ where: { entries: { equals: [] } } })).resolves.toEqual([ { id: 3, entries: [] }, ]); + await expect( + db.example.findMany({ where: { entries: { equals: [{ label: 'x' }, { label: 'y' }] } } }), + ).resolves.toEqual([{ id: 4, entries: [{ label: 'x' }, { label: 'y' }] }]); + await expect( + db.example.findMany({ where: { entries: { equals: [{ label: 'x' }, { label: 'x' }] } } }), + ).resolves.toEqual([{ id: 5, entries: [{ label: 'x' }, { label: 'x' }] }]); await expect(db.example.findMany({ where: { entries: { equals: [{ label: 'z' }] } } })).resolves.toEqual([]); }); });