From dbe47ba5bae88709e499173908bca51e32669e32 Mon Sep 17 00:00:00 2001 From: Sibil Sarjam Soren Date: Tue, 17 Nov 2026 18:12:04 +0530 Subject: [PATCH] fix(orm): keep null on optional Boolean fields on MySQL and SQLite The MySQL and SQLite dialects turned every Boolean input into 1 or 0, so null became 0. Writing null to a Boolean? field stored false, and an equals: null filter matched the false rows instead of the null ones. Keep null as null, like the Decimal case already does. Fixes #2918 --- .../orm/src/client/crud/dialects/mysql.ts | 2 +- .../orm/src/client/crud/dialects/sqlite.ts | 2 +- tests/regression/test/issue-2918.test.ts | 42 +++++++++++++++++++ 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 tests/regression/test/issue-2918.test.ts diff --git a/packages/orm/src/client/crud/dialects/mysql.ts b/packages/orm/src/client/crud/dialects/mysql.ts index 3b06c4589..9b2a8a8bd 100644 --- a/packages/orm/src/client/crud/dialects/mysql.ts +++ b/packages/orm/src/client/crud/dialects/mysql.ts @@ -96,7 +96,7 @@ export class MySqlCrudDialect extends LateralJoinDiale } else { switch (type) { case 'Boolean': - return value ? 1 : 0; + return value !== null ? (value ? 1 : 0) : value; case 'DateTime': // MySQL DATETIME format: 'YYYY-MM-DD HH:MM:SS.mmm' if (value instanceof Date) { diff --git a/packages/orm/src/client/crud/dialects/sqlite.ts b/packages/orm/src/client/crud/dialects/sqlite.ts index f7e321cc8..afbe23569 100644 --- a/packages/orm/src/client/crud/dialects/sqlite.ts +++ b/packages/orm/src/client/crud/dialects/sqlite.ts @@ -103,7 +103,7 @@ export class SqliteCrudDialect extends BaseCrudDialect } else { switch (type) { case 'Boolean': - return value ? 1 : 0; + return value !== null ? (value ? 1 : 0) : value; case 'DateTime': return value instanceof Date ? value.toISOString() diff --git a/tests/regression/test/issue-2918.test.ts b/tests/regression/test/issue-2918.test.ts new file mode 100644 index 000000000..1881ee412 --- /dev/null +++ b/tests/regression/test/issue-2918.test.ts @@ -0,0 +1,42 @@ +import { createTestClient } from '@zenstackhq/testtools'; +import { describe, expect, it } from 'vitest'; + +// https://github.com/zenstackhq/zenstack/issues/2918 +describe('Regression for issue 2918', () => { + const schema = ` +model Item { + id Int @id @default(autoincrement()) + flag Boolean? +} + `; + + it('stores null in an optional Boolean field instead of false', async () => { + const db = await createTestClient(schema); + + const item = await db.item.create({ data: { flag: true } }); + await expect(db.item.update({ where: { id: item.id }, data: { flag: null } })).resolves.toMatchObject({ + flag: null, + }); + await expect(db.item.create({ data: { flag: null } })).resolves.toMatchObject({ flag: null }); + await db.item.createMany({ data: [{ flag: null }] }); + await db.item.create({ data: { flag: true } }); + await db.item.updateMany({ where: { flag: true }, data: { flag: null } }); + + // the column itself is NULL, not 0 + await expect(db.item.count({ where: { flag: null } })).resolves.toBe(4); + await expect(db.item.count({ where: { flag: false } })).resolves.toBe(0); + }); + + it('matches null rows with an equals: null filter', async () => { + const db = await createTestClient(schema); + + await db.item.createMany({ data: [{ flag: true }, { flag: false }] }); + // omitting the field leaves the column NULL + const empty = await db.item.create({ data: {} }); + + await expect(db.item.findMany({ where: { flag: { equals: null } } })).resolves.toEqual([ + { id: empty.id, flag: null }, + ]); + await expect(db.item.count({ where: { flag: { not: { equals: null } } } })).resolves.toBe(2); + }); +});