fix: adapter equality bug

e2e/adapter/test/adapter-factory/basic.ts

@@ -3174,6 +3174,146 @@ export const getNormalTestSuiteTests = (
 				expect(result!.email).toBe(user.email);
 				expect(result!.id).toBe(user.id);
 			},
+		"findMany - eq operator with null value (single condition) should use IS NULL":
+			async () => {
+				const withNull = await adapter.create<User>({
+					model: "user",
+					data: { ...(await generate("user")), image: null },
+					forceAllowId: true,
+				});
+				const withImage = await adapter.create<User>({
+					model: "user",
+					data: {
+						...(await generate("user")),
+						image: "https://example.com/avatar.png",
+					},
+					forceAllowId: true,
+				});
+
+				const nullResult = await adapter.findMany<User>({
+					model: "user",
+					where: [{ field: "image", operator: "eq", value: null }],
+				});
+				const nullIds = nullResult.map((u) => u.id);
+				expect(nullIds).toContain(withNull.id);
+				expect(nullIds).not.toContain(withImage.id);
+
+				const notNullResult = await adapter.findMany<User>({
+					model: "user",
+					where: [{ field: "image", operator: "ne", value: null }],
+				});
+				const notNullIds = notNullResult.map((u) => u.id);
+				expect(notNullIds).not.toContain(withNull.id);
+				expect(notNullIds).toContain(withImage.id);
+			},
+
+		"findMany - eq and ne operators with null value in AND group should use IS NULL / IS NOT NULL":
+			async () => {
+				const nullVerified = await adapter.create<User>({
+					model: "user",
+					data: {
+						...(await generate("user")),
+						image: null,
+						emailVerified: true,
+					},
+					forceAllowId: true,
+				});
+				const nullUnverified = await adapter.create<User>({
+					model: "user",
+					data: {
+						...(await generate("user")),
+						image: null,
+						emailVerified: false,
+					},
+					forceAllowId: true,
+				});
+				const imageVerified = await adapter.create<User>({
+					model: "user",
+					data: {
+						...(await generate("user")),
+						image: "https://example.com/avatar.png",
+						emailVerified: true,
+					},
+					forceAllowId: true,
+				});
+
+				// image IS NULL AND emailVerified = true → only nullVerified
+				const eqResult = await adapter.findMany<User>({
+					model: "user",
+					where: [
+						{ field: "image", operator: "eq", value: null, connector: "AND" },
+						{ field: "emailVerified", value: true, connector: "AND" },
+					],
+				});
+				const eqIds = eqResult.map((u) => u.id);
+				expect(eqIds).toContain(nullVerified.id);
+				expect(eqIds).not.toContain(nullUnverified.id);
+				expect(eqIds).not.toContain(imageVerified.id);
+
+				// image IS NOT NULL AND emailVerified = true → only imageVerified
+				const neResult = await adapter.findMany<User>({
+					model: "user",
+					where: [
+						{ field: "image", operator: "ne", value: null, connector: "AND" },
+						{ field: "emailVerified", value: true, connector: "AND" },
+					],
+				});
+				const neIds = neResult.map((u) => u.id);
+				expect(neIds).not.toContain(nullVerified.id);
+				expect(neIds).not.toContain(nullUnverified.id);
+				expect(neIds).toContain(imageVerified.id);
+			},
+
+		"findMany - eq and ne operators with null value in OR group should use IS NULL / IS NOT NULL":
+			async () => {
+				const withNull = await adapter.create<User>({
+					model: "user",
+					data: { ...(await generate("user")), image: null },
+					forceAllowId: true,
+				});
+				const targetImage = await adapter.create<User>({
+					model: "user",
+					data: {
+						...(await generate("user")),
+						image: "https://example.com/target.png",
+					},
+					forceAllowId: true,
+				});
+				const otherImage = await adapter.create<User>({
+					model: "user",
+					data: {
+						...(await generate("user")),
+						image: "https://example.com/other.png",
+					},
+					forceAllowId: true,
+				});
+
+				// image IS NULL OR email = targetImage.email → withNull + targetImage
+				const eqResult = await adapter.findMany<User>({
+					model: "user",
+					where: [
+						{ field: "image", operator: "eq", value: null, connector: "OR" },
+						{ field: "email", value: targetImage.email, connector: "OR" },
+					],
+				});
+				const eqIds = eqResult.map((u) => u.id);
+				expect(eqIds).toContain(withNull.id);
+				expect(eqIds).toContain(targetImage.id);
+				expect(eqIds).not.toContain(otherImage.id);
+
+				// image IS NOT NULL OR email = withNull.email → targetImage + otherImage + withNull (by email)
+				const neResult = await adapter.findMany<User>({
+					model: "user",
+					where: [
+						{ field: "image", operator: "ne", value: null, connector: "OR" },
+						{ field: "email", value: withNull.email, connector: "OR" },
+					],
+				});
+				const neIds = neResult.map((u) => u.id);
+				expect(neIds).toContain(withNull.id); // matched by email OR clause
+				expect(neIds).toContain(targetImage.id);
+				expect(neIds).toContain(otherImage.id);
+			},
 	};
 };
 

packages/btst/adapter-drizzle/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btst/adapter-drizzle",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Drizzle adapter for btst",
   "type": "module",
   "license": "MIT",

packages/btst/adapter-kysely/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btst/adapter-kysely",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Kysely adapter for btst",
   "type": "module",
   "license": "MIT",

packages/btst/adapter-memory/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btst/adapter-memory",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "In-memory adapter for btst",
   "type": "module",
   "license": "MIT",

packages/btst/adapter-mongodb/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btst/adapter-mongodb",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "MongoDB adapter for btst",
   "type": "module",
   "license": "MIT",

packages/btst/adapter-prisma/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btst/adapter-prisma",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Prisma adapter for btst",
   "type": "module",
   "license": "MIT",

packages/btst/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btst/cli",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "CLI for btst schema generation and migration",
   "type": "module",
   "license": "MIT",

packages/btst/db/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btst/db",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Core database utilities and schema definition for btst",
   "type": "module",
   "license": "MIT",

packages/btst/plugins/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@btst/plugins",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "Plugin utilities and common plugins for btst",
   "type": "module",
   "license": "MIT",

packages/drizzle-adapter/src/drizzle-adapter.ts

@@ -19,6 +19,8 @@ import {
 	gt,
 	gte,
 	inArray,
+	isNotNull,
+	isNull,
 	like,
 	lt,
 	lte,
@@ -215,7 +217,11 @@ export const drizzleAdapter = (db: DB, config: DrizzleAdapterConfig) => {
 					}
 
 					if (w.operator === "ne") {
-						return [ne(schemaModel[field], w.value)];
+						return [
+							w.value === null
+								? isNotNull(schemaModel[field])
+								: ne(schemaModel[field], w.value),
+						];
 					}
 
 					if (w.operator === "gt") {
@@ -226,7 +232,11 @@ export const drizzleAdapter = (db: DB, config: DrizzleAdapterConfig) => {
 						return [gte(schemaModel[field], w.value)];
 					}
 
-					return [eq(schemaModel[field], w.value)];
+					return [
+						w.value === null
+							? isNull(schemaModel[field])
+							: eq(schemaModel[field], w.value),
+					];
 				}
 				const andGroup = where.filter(
 					(w) => w.connector === "AND" || !w.connector,
@@ -274,9 +284,13 @@ export const drizzleAdapter = (db: DB, config: DrizzleAdapterConfig) => {
 							return gte(schemaModel[field], w.value);
 						}
 						if (w.operator === "ne") {
-							return ne(schemaModel[field], w.value);
+							return w.value === null
+								? isNotNull(schemaModel[field])
+								: ne(schemaModel[field], w.value);
 						}
-						return eq(schemaModel[field], w.value);
+						return w.value === null
+							? isNull(schemaModel[field])
+							: eq(schemaModel[field], w.value);
 					}),
 				);
 				const orClause = or(
@@ -320,9 +334,13 @@ export const drizzleAdapter = (db: DB, config: DrizzleAdapterConfig) => {
 							return gte(schemaModel[field], w.value);
 						}
 						if (w.operator === "ne") {
-							return ne(schemaModel[field], w.value);
+							return w.value === null
+								? isNotNull(schemaModel[field])
+								: ne(schemaModel[field], w.value);
 						}
-						return eq(schemaModel[field], w.value);
+						return w.value === null
+							? isNull(schemaModel[field])
+							: eq(schemaModel[field], w.value);
 					}),
 				);
 

packages/kysely-adapter/src/kysely-adapter.ts

@@ -187,11 +187,13 @@ export const kyselyAdapter = (
 						}
 
 						if (operator === "eq") {
-							return eb(f, "=", value);
+							return value === null ? eb(f, "is", null) : eb(f, "=", value);
 						}
 
 						if (operator === "ne") {
-							return eb(f, "<>", value);
+							return value === null
+								? eb(f, "is not", null)
+								: eb(f, "<>", value);
 						}
 
 						if (operator === "gt") {