@better-auth/drizzle-adapter 1.7.0-beta.4 → 1.7.0-beta.6

package/dist/index.mjs

@@ -38,6 +38,36 @@ function insensitiveNe(column, value) {
 }
 //#endregion
 //#region src/drizzle-adapter.ts
+/**
+* Derive the number of affected rows from a Drizzle write result.
+*
+* Drizzle's drivers report affected rows under different shapes: postgres-js
+* exposes `rowCount`, mysql2 reports `affectedRows`/`rowsAffected` (sometimes as
+* the first element of a result-header array), and better-sqlite3 uses
+* `changes`. This normalizes those so write methods that depend on affected
+* rows honor the adapter contract instead of leaking the raw driver result.
+*/
+function getAffectedRowCount(result, operation, context) {
+	let count = 0;
+	if (result && typeof result === "object" && "rowCount" in result) count = result.rowCount;
+	else if (Array.isArray(result)) count = result.length > 0 && hasDriverRowCount(result[0]) ? readDriverRowCount(result[0]) : result.length;
+	else if (hasDriverRowCount(result)) count = readDriverRowCount(result);
+	if (typeof count !== "number" || !Number.isFinite(count)) {
+		logger.error(`[Drizzle Adapter] The result of the ${operation} operation is not a finite number. This is likely a bug in the adapter. Please report this issue to the Better Auth team.`, {
+			result,
+			...context
+		});
+		throw new BetterAuthError(`Drizzle adapter ${operation} returned an invalid affected row count`);
+	}
+	return count;
+}
+function hasDriverRowCount(result) {
+	return !!result && typeof result === "object" && ("affectedRows" in result || "rowsAffected" in result || "changes" in result);
+}
+function readDriverRowCount(result) {
+	const r = result;
+	return r.affectedRows ?? r.rowsAffected ?? r.changes;
+}
 const drizzleAdapter = (db, config) => {
 	let lazyOptions = null;
 	let mysqlNoIdWarned = false;
@@ -431,7 +461,10 @@ const drizzleAdapter = (db, config) => {
 			async updateMany({ model, where, update: values }) {
 				const schemaModel = getSchema(model);
 				const clause = convertWhereClause(where, model);
-				return await db.update(schemaModel).set(values).where(...clause);
+				return getAffectedRowCount(await db.update(schemaModel).set(values).where(...clause), "updateMany", {
+					model,
+					where
+				});
 			},
 			async delete({ model, where }) {
 				const schemaModel = getSchema(model);
@@ -441,17 +474,10 @@ const drizzleAdapter = (db, config) => {
 			async deleteMany({ model, where }) {
 				const schemaModel = getSchema(model);
 				const clause = convertWhereClause(where, model);
-				const res = await db.delete(schemaModel).where(...clause);
-				let count = 0;
-				if (res && "rowCount" in res) count = res.rowCount;
-				else if (Array.isArray(res)) count = res.length;
-				else if (res && ("affectedRows" in res || "rowsAffected" in res || "changes" in res)) count = res.affectedRows ?? res.rowsAffected ?? res.changes;
-				if (typeof count !== "number") logger.error("[Drizzle Adapter] The result of the deleteMany operation is not a number. This is likely a bug in the adapter. Please report this issue to the Better Auth team.", {
-					res,
+				return getAffectedRowCount(await db.delete(schemaModel).where(...clause), "deleteMany", {
 					model,
 					where
 				});
-				return count;
 			},
 			async consumeOne({ model, where }) {
 				const schemaModel = getSchema(model);
@@ -467,8 +493,10 @@ const drizzleAdapter = (db, config) => {
 						if (!target) return null;
 						const targetId = target[idField] ?? target.id;
 						if (targetId === void 0 || targetId === null || !idColumn) return null;
-						const delRes = await tx.delete(schemaModel).where(eq(idColumn, targetId)).execute();
-						return ((delRes && (delRes.rowsAffected ?? delRes.affectedRows ?? delRes.changes)) ?? 0) > 0 ? target : null;
+						return getAffectedRowCount(await tx.delete(schemaModel).where(eq(idColumn, targetId)).execute(), "consumeOne", {
+							model,
+							where
+						}) > 0 ? target : null;
 					};
 					return inTransaction ? claimFromTransaction(db) : db.transaction(claimFromTransaction);
 				}
@@ -476,6 +504,47 @@ const drizzleAdapter = (db, config) => {
 				const targetIds = db.select({ id: idColumn }).from(schemaModel).where(...clause).limit(1);
 				return (await db.delete(schemaModel).where(inArray(idColumn, targetIds)).returning())[0] ?? null;
 			},
+			async incrementOne({ model, where, increment, set }) {
+				const schemaModel = getSchema(model);
+				const clause = convertWhereClause(where, model);
+				const idField = getFieldName({
+					model,
+					field: "id"
+				});
+				const idColumn = schemaModel[idField];
+				const assignments = {};
+				for (const [field, delta] of Object.entries(increment)) {
+					const columnName = getFieldName({
+						model,
+						field
+					});
+					const column = schemaModel[columnName];
+					if (!column) throw new BetterAuthError(`The field "${field}" does not exist in the schema for the model "${model}". Please update your schema.`);
+					assignments[columnName] = sql`${column} + ${sql.param(delta)}`;
+				}
+				if (set) for (const [field, value] of Object.entries(set)) {
+					const columnName = getFieldName({
+						model,
+						field
+					});
+					if (!schemaModel[columnName]) throw new BetterAuthError(`The field "${field}" does not exist in the schema for the model "${model}". Please update your schema.`);
+					assignments[columnName] = value;
+				}
+				if (config.provider === "mysql") {
+					const mutateInTransaction = async (tx) => {
+						const target = (await tx.select().from(schemaModel).where(...clause).for("update").limit(1))[0];
+						if (!target) return null;
+						const targetId = target[idField] ?? target.id;
+						if (targetId === void 0 || targetId === null || !idColumn) return null;
+						await tx.update(schemaModel).set(assignments).where(eq(idColumn, targetId)).execute();
+						return (await tx.select().from(schemaModel).where(eq(idColumn, targetId)).limit(1).execute())[0] ?? null;
+					};
+					return inTransaction ? mutateInTransaction(db) : db.transaction(mutateInTransaction);
+				}
+				if (!idColumn) return null;
+				const targetIds = db.select({ id: idColumn }).from(schemaModel).where(...clause).limit(1);
+				return (await db.update(schemaModel).set(assignments).where(inArray(idColumn, targetIds)).returning())[0] ?? null;
+			},
 			options: config
 		};
 	};

package/package.json

@@ -1,6 +1,9 @@
 {
   "name": "@better-auth/drizzle-adapter",
-  "version": "1.7.0-beta.4",
+  "version": "1.7.0-beta.6",
+  "bugs": {
+    "url": "https://github.com/better-auth/better-auth/issues"
+  },
   "description": "Drizzle adapter for Better Auth",
   "type": "module",
   "license": "MIT",
@@ -35,9 +38,9 @@
     }
   },
   "peerDependencies": {
-    "@better-auth/utils": "0.4.1",
+    "@better-auth/utils": "0.4.2",
     "drizzle-orm": "^0.45.2",
-    "@better-auth/core": "^1.7.0-beta.4"
+    "@better-auth/core": "^1.7.0-beta.6"
   },
   "peerDependenciesMeta": {
     "drizzle-orm": {
@@ -45,11 +48,11 @@
     }
   },
   "devDependencies": {
-    "@better-auth/utils": "0.4.1",
+    "@better-auth/utils": "0.4.2",
     "drizzle-orm": "^0.45.2",
     "tsdown": "0.21.1",
     "typescript": "^5.9.3",
-    "@better-auth/core": "1.7.0-beta.4"
+    "@better-auth/core": "1.7.0-beta.6"
   },
   "scripts": {
     "build": "tsdown",