Skip to content
Merged
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
24 changes: 24 additions & 0 deletions e2e/adapter/test/adapter-factory/basic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3314,6 +3314,30 @@ export const getNormalTestSuiteTests = (
expect(neIds).toContain(targetImage.id);
expect(neIds).toContain(otherImage.id);
},

"update - should return updated record when where condition uses null value":
async () => {
const withNull = await adapter.create<User>({
model: "user",
data: { ...(await generate("user")), image: null },
forceAllowId: true,
});

// Update WHERE image IS NULL AND id = withNull.id
const result = await adapter.update<User>({
model: "user",
where: [
{ field: "id", value: withNull.id },
{ field: "image", operator: "eq", value: null },
],
update: { name: "null-where-updated" },
});

// On MySQL the re-fetch after UPDATE must use IS NULL, not = NULL
expect(result).toBeDefined();
expect(result!.id).toBe(withNull.id);
expect(result!.name).toBe("null-where-updated");
},
};
};

Expand Down
9 changes: 7 additions & 2 deletions packages/kysely-adapter/src/kysely-adapter.ts
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,17 @@ export const kyselyAdapter = (
return res;
}

const value = values[field] || where[0]?.value;
const value =
values[field] !== undefined ? values[field] : where[0]?.value;
res = await db
.selectFrom(model)
.selectAll()
.orderBy(getFieldName({ model, field }), "desc")
.where(getFieldName({ model, field }), "=", value)
.where(
getFieldName({ model, field }),
value === null ? "is" : "=",
value,
)
.limit(1)
.executeTakeFirst();
return res;
Expand Down
Loading