Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/orm/src/client/crud/dialects/mysql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ export class MySqlCrudDialect<Schema extends SchemaDef> 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) {
Expand Down
2 changes: 1 addition & 1 deletion packages/orm/src/client/crud/dialects/sqlite.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ export class SqliteCrudDialect<Schema extends SchemaDef> 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()
Expand Down
42 changes: 42 additions & 0 deletions tests/regression/test/issue-2918.test.ts
Original file line number Diff line number Diff line change
@@ -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);
});
});