@better-auth/drizzle-adapter 1.6.10 → 1.6.12

package/dist/index.mjs

@@ -40,7 +40,12 @@ function insensitiveNe(column, value) {
 //#region src/drizzle-adapter.ts
 const drizzleAdapter = (db, config) => {
 	let lazyOptions = null;
-	const createCustomAdapter = (db) => ({ getFieldName, getDefaultFieldName, options }) => {
+	let mysqlNoIdWarned = false;
+	const createCustomAdapter = (db, inTransaction = false) => ({ getFieldName, getDefaultFieldName, getDefaultModelName, options, schema: baSchema }) => {
+		if (config.provider === "mysql" && options.advanced?.database?.generateId === false && !mysqlNoIdWarned) {
+			mysqlNoIdWarned = true;
+			logger.warn("[Drizzle Adapter] MySQL does not support INSERT...RETURNING. With generateId set to false, the adapter uses best-effort fallback strategies (unique columns, full-field match) to retrieve inserted rows. For reliable behavior, use Better Auth's default ID generation, a custom generateId function, or generateId: \"serial\" for auto-increment.");
+		}
 		function getSchema(model) {
 			const schema = config.schema || db._.fullSchema;
 			if (!schema) throw new BetterAuthError("Drizzle adapter failed to initialize. Schema not found. Please provide a schema object in the adapter options object.");
@@ -62,15 +67,44 @@ const drizzleAdapter = (db, config) => {
 					return w;
 				}), model);
 				return (await db.select().from(schemaModel).where(...clause))[0];
-			} else if (builderVal && builderVal[0]?.id?.value) {
-				let tId = builderVal[0]?.id?.value;
-				if (!tId) tId = (await db.select({ id: sql`LAST_INSERT_ID()` }).from(schemaModel).orderBy(desc(schemaModel.id)).limit(1))[0].id;
-				return (await db.select().from(schemaModel).where(eq(schemaModel.id, tId)).limit(1).execute())[0];
-			} else if (data.id) return (await db.select().from(schemaModel).where(eq(schemaModel.id, data.id)).limit(1).execute())[0];
-			else {
-				if (!("id" in schemaModel)) throw new BetterAuthError(`The model "${model}" does not have an "id" field. Please use the "id" field as your primary key.`);
-				return (await db.select().from(schemaModel).orderBy(desc(schemaModel.id)).limit(1).execute())[0];
 			}
+			const fetchInserted = async (tx) => {
+				const builderId = builderVal?.[0]?.id?.value;
+				if (builderId) return (await tx.select().from(schemaModel).where(eq(schemaModel.id, builderId)).limit(1).execute())[0] ?? null;
+				if (data.id) return (await tx.select().from(schemaModel).where(eq(schemaModel.id, data.id)).limit(1).execute())[0] ?? null;
+				if (options.advanced?.database?.generateId === "serial" && schemaModel.id) {
+					const lastId = (await tx.select({ id: sql`LAST_INSERT_ID()` }).from(schemaModel).limit(1).execute())[0]?.id;
+					if (lastId) return (await tx.select().from(schemaModel).where(eq(schemaModel.id, lastId)).limit(1).execute())[0] ?? null;
+				}
+				const modelSchema = baSchema[getDefaultModelName(model)]?.fields;
+				if (modelSchema) for (const [fieldKey, fieldAttr] of Object.entries(modelSchema)) {
+					if (!fieldAttr.unique) continue;
+					const dbFieldName = getFieldName({
+						model,
+						field: fieldKey
+					});
+					const val = data[dbFieldName];
+					if (val === void 0 || val === null) continue;
+					if (!schemaModel[dbFieldName]) continue;
+					const res = await tx.select().from(schemaModel).where(eq(schemaModel[dbFieldName], val)).limit(1).execute();
+					if (res[0]) return res[0];
+				}
+				const conditions = [];
+				for (const [key, val] of Object.entries(data)) {
+					if (val === void 0 || !schemaModel[key]) continue;
+					conditions.push(val === null ? isNull(schemaModel[key]) : eq(schemaModel[key], val));
+				}
+				if (conditions.length > 0) {
+					const combined = and(...conditions);
+					if (combined) {
+						const res = await tx.select().from(schemaModel).where(combined).limit(2).execute();
+						if (res.length === 1) return res[0];
+					}
+				}
+				logger.warn(`[Drizzle Adapter] Unable to safely identify the inserted "${model}" row on MySQL. Enable Better Auth ID generation or use generateId: "serial" for reliable behavior.`);
+				return null;
+			};
+			return inTransaction ? fetchInserted(db) : db.transaction(fetchInserted);
 		};
 		function convertWhereClause(where, model) {
 			const schemaModel = getSchema(model);
@@ -204,10 +238,10 @@ const drizzleAdapter = (db, config) => {
 				if (isInsensitive && typeof w.value === "string") return insensitiveEq(schemaModel[field], w.value);
 				return eq(schemaModel[field], w.value);
 			}));
-			const clause = [];
-			if (andGroup.length) clause.push(andClause);
-			if (orGroup.length) clause.push(orClause);
-			return clause;
+			if (andGroup.length && orGroup.length) return [and(andClause, orClause)];
+			if (andGroup.length) return [andClause];
+			if (orGroup.length) return [orClause];
+			return [];
 		}
 		function checkMissingFields(schema, model, values) {
 			if (!schema) throw new BetterAuthError("Drizzle adapter failed to initialize. Drizzle Schema not found. Please provide a schema object in the adapter options object.");
@@ -419,6 +453,29 @@ const drizzleAdapter = (db, config) => {
 				});
 				return count;
 			},
+			async consumeOne({ model, where }) {
+				const schemaModel = getSchema(model);
+				const clause = convertWhereClause(where, model);
+				const idField = getFieldName({
+					model,
+					field: "id"
+				});
+				const idColumn = schemaModel[idField];
+				if (config.provider === "mysql") {
+					const claimFromTransaction = 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;
+						const delRes = await tx.delete(schemaModel).where(eq(idColumn, targetId)).execute();
+						return ((delRes && (delRes.rowsAffected ?? delRes.affectedRows ?? delRes.changes)) ?? 0) > 0 ? target : null;
+					};
+					return inTransaction ? claimFromTransaction(db) : db.transaction(claimFromTransaction);
+				}
+				if (!idColumn) return null;
+				const targetIds = db.select({ id: idColumn }).from(schemaModel).where(...clause).limit(1);
+				return (await db.delete(schemaModel).where(inArray(idColumn, targetIds)).returning())[0] ?? null;
+			},
 			options: config
 		};
 	};
@@ -441,8 +498,11 @@ const drizzleAdapter = (db, config) => {
 			},
 			transaction: config.transaction ?? false ? (cb) => db.transaction((tx) => {
 				return cb(createAdapterFactory({
-					config: adapterOptions.config,
-					adapter: createCustomAdapter(tx)
+					config: {
+						...adapterOptions.config,
+						transaction: false
+					},
+					adapter: createCustomAdapter(tx, true)
 				})(lazyOptions));
 			}) : false
 		},

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/drizzle-adapter",
-  "version": "1.6.10",
+  "version": "1.6.12",
   "description": "Drizzle adapter for Better Auth",
   "type": "module",
   "license": "MIT",
@@ -35,9 +35,9 @@
     }
   },
   "peerDependencies": {
-    "@better-auth/utils": "0.4.0",
+    "@better-auth/utils": "0.4.1",
     "drizzle-orm": "^0.45.2",
-    "@better-auth/core": "^1.6.10"
+    "@better-auth/core": "^1.6.12"
   },
   "peerDependenciesMeta": {
     "drizzle-orm": {
@@ -45,11 +45,11 @@
     }
   },
   "devDependencies": {
-    "@better-auth/utils": "0.4.0",
+    "@better-auth/utils": "0.4.1",
     "drizzle-orm": "^0.45.2",
     "tsdown": "0.21.1",
     "typescript": "^5.9.3",
-    "@better-auth/core": "1.6.10"
+    "@better-auth/core": "1.6.12"
   },
   "scripts": {
     "build": "tsdown",