@better-auth/drizzle-adapter 1.7.5 → 1.7.7

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { a as insensitiveInArray, c as buildRelationKeysByModel, i as insensitiveIlike, l as getOneToOneRelationKey, o as insensitiveNe, r as insensitiveEq, s as insensitiveNotInArray, t as findDrizzleSchemaProblems } from "./schema-check-_Aj1MGau.mjs";
+import { a as insensitiveInArray, c as buildRelationKeysByModel, i as insensitiveIlike, l as getOneToOneRelationKey, o as insensitiveNe, r as insensitiveEq, s as insensitiveNotInArray, t as findDrizzleSchemaProblems } from "./schema-check-DFZjRat1.mjs";
 import { createAdapterFactory } from "@better-auth/core/db/adapter";
 import { checksSchema, createSchemaCheck, registerSchemaCheck } from "@better-auth/core/db/internal";
 import { logger } from "@better-auth/core/env";
@@ -63,10 +63,10 @@ const drizzleAdapter = (db, config) => {
 			if (!schemaModel) throw new BetterAuthError(`[# Drizzle Adapter]: The model "${model}" was not found in the schema object. Please pass the schema directly to the adapter options.`);
 			return schemaModel;
 		}
-		const withReturning = async (model, builder, data, where) => {
+		const withReturning = async (model, modelKey, builder, data, where) => {
 			if (config.provider !== "mysql") return (await builder.returning())[0];
 			await builder.execute();
-			const schemaModel = getSchema(model);
+			const table = getSchema(model);
 			const builderVal = builder.config?.values;
 			if (where?.length) {
 				const clause = convertWhereClause(where.map((w) => {
@@ -75,39 +75,39 @@ const drizzleAdapter = (db, config) => {
 						value: data[w.field]
 					};
 					return w;
-				}), model);
-				return (await db.select().from(schemaModel).where(...clause))[0];
+				}), model, modelKey);
+				return (await db.select().from(table).where(...clause))[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;
+				if (builderId) return (await tx.select().from(table).where(eq(table.id, builderId)).limit(1).execute())[0] ?? null;
+				if (data.id) return (await tx.select().from(table).where(eq(table.id, data.id)).limit(1).execute())[0] ?? null;
+				if (options.advanced?.database?.generateId === "serial" && table.id) {
+					const lastId = (await tx.select({ id: sql`LAST_INSERT_ID()` }).from(table).limit(1).execute())[0]?.id;
+					if (lastId) return (await tx.select().from(table).where(eq(table.id, lastId)).limit(1).execute())[0] ?? null;
 				}
-				const modelSchema = baSchema[getDefaultModelName(model)]?.fields;
+				const modelSchema = baSchema[modelKey]?.fields;
 				if (modelSchema) for (const [fieldKey, fieldAttr] of Object.entries(modelSchema)) {
 					if (!fieldAttr.unique) continue;
 					const dbFieldName = getFieldName({
-						model,
+						model: modelKey,
 						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 (!table[dbFieldName]) continue;
+					const res = await tx.select().from(table).where(eq(table[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 (val === void 0 || !table[key]) continue;
+					conditions.push(val === null ? isNull(table[key]) : eq(table[key], val));
 				}
 				if (conditions.length > 0) {
 					const combined = and(...conditions);
 					if (combined) {
-						const res = await tx.select().from(schemaModel).where(combined).limit(2).execute();
+						const res = await tx.select().from(table).where(combined).limit(2).execute();
 						if (res.length === 1) return res[0];
 					}
 				}
@@ -116,11 +116,11 @@ const drizzleAdapter = (db, config) => {
 			};
 			return inTransaction ? fetchInserted(db) : db.transaction(fetchInserted);
 		};
-		function convertWhereClause(where, model) {
+		function convertWhereClause(where, model, modelKey) {
 			const schemaModel = getSchema(model);
 			const resolveFieldName = (where) => {
 				const field = getFieldName({
-					model,
+					model: modelKey,
 					field: where.field
 				});
 				if (!is(schemaModel[field], Column)) throw new BetterAuthError(`The field "${where.field}" does not exist in the schema for the model "${model}". Please update your schema.`);
@@ -295,10 +295,12 @@ const drizzleAdapter = (db, config) => {
 			}
 			return null;
 		}
-		function getJoinRelationKey(baseModel, joinModel, relationKeys, isUnique) {
+		function getJoinRelationKey(baseModel, joinModel, baseModelKey, joinModelKey, relationKeys, isUnique) {
 			if (isUnique) return getOneToOneRelationKey({
 				baseModel,
 				joinModel,
+				baseModelKey,
+				joinModelKey,
 				relationKeys,
 				schema: baSchema,
 				getDefaultModelName
@@ -306,14 +308,14 @@ const drizzleAdapter = (db, config) => {
 			return config.usePlural ? joinModel : `${joinModel}s`;
 		}
 		return {
-			async create({ model, data: values }) {
-				const schemaModel = getSchema(model);
-				checkMissingFields(schemaModel, model, values);
-				return await withReturning(model, db.insert(schemaModel).values(values), values);
+			async create({ model, modelKey = model, data: values }) {
+				const table = getSchema(model);
+				checkMissingFields(table, modelKey, values);
+				return await withReturning(model, modelKey, db.insert(table).values(values), values);
 			},
-			async findOne({ model, where, select, join }) {
-				const schemaModel = getSchema(model);
-				const clause = convertWhereClause(where, model);
+			async findOne({ model, modelKey = model, where, select, join }) {
+				const table = getSchema(model);
+				const clause = convertWhereClause(where, model, modelKey);
 				if (join) {
 					const queryModel = getQueryModel(model);
 					if (!db.query || !queryModel) {
@@ -328,7 +330,7 @@ const drizzleAdapter = (db, config) => {
 						for (const [joinModel, joinAttr] of joinEntries) {
 							const limit = joinAttr.limit ?? options.advanced?.database?.defaultFindManyLimit ?? 100;
 							const isUnique = joinAttr.relation === "one-to-one";
-							const relationKey = getJoinRelationKey(model, joinModel, relationKeys, isUnique);
+							const relationKey = getJoinRelationKey(model, joinModel, modelKey, joinAttr.modelKey ?? joinModel, relationKeys, isUnique);
 							includes[relationKey] = isUnique ? true : { limit };
 							if (relationKey !== joinModel) renamedJoinResults.push({
 								key: relationKey,
@@ -339,7 +341,7 @@ const drizzleAdapter = (db, config) => {
 							where: clause[0],
 							columns: select?.length && select.length > 0 ? select.reduce((acc, field) => {
 								acc[getFieldName({
-									model,
+									model: modelKey,
 									field
 								})] = true;
 								return acc;
@@ -355,20 +357,20 @@ const drizzleAdapter = (db, config) => {
 				}
 				const res = await db.select(select?.length && select.length > 0 ? select.reduce((acc, field) => {
 					const fieldName = getFieldName({
-						model,
+						model: modelKey,
 						field
 					});
 					return {
 						...acc,
-						[fieldName]: schemaModel[fieldName]
+						[fieldName]: table[fieldName]
 					};
-				}, {}) : void 0).from(schemaModel).where(...clause);
+				}, {}) : void 0).from(table).where(...clause);
 				if (!res.length) return null;
 				return res[0];
 			},
-			async findMany({ model, where, sortBy, limit, select, offset, join }) {
-				const schemaModel = getSchema(model);
-				const clause = where ? convertWhereClause(where, model) : [];
+			async findMany({ model, modelKey = model, where, sortBy, limit, select, offset, join }) {
+				const table = getSchema(model);
+				const clause = where ? convertWhereClause(where, model, modelKey) : [];
 				const sortFn = sortBy?.direction === "desc" ? desc : asc;
 				if (join) {
 					const queryModel = getQueryModel(model);
@@ -384,7 +386,7 @@ const drizzleAdapter = (db, config) => {
 						for (const [joinModel, joinAttr] of joinEntries) {
 							const isUnique = joinAttr.relation === "one-to-one";
 							const limit = joinAttr.limit ?? options.advanced?.database?.defaultFindManyLimit ?? 100;
-							const relationKey = getJoinRelationKey(model, joinModel, relationKeys, isUnique);
+							const relationKey = getJoinRelationKey(model, joinModel, modelKey, joinAttr.modelKey ?? joinModel, relationKeys, isUnique);
 							includes[relationKey] = isUnique ? true : { limit };
 							if (relationKey !== joinModel) renamedJoinResults.push({
 								key: relationKey,
@@ -392,8 +394,8 @@ const drizzleAdapter = (db, config) => {
 							});
 						}
 						let orderBy = void 0;
-						if (sortBy?.field) orderBy = [sortFn(schemaModel[getFieldName({
-							model,
+						if (sortBy?.field) orderBy = [sortFn(table[getFieldName({
+							model: modelKey,
 							field: sortBy?.field
 						})])];
 						const res = await db.query[queryModel].findMany({
@@ -401,7 +403,7 @@ const drizzleAdapter = (db, config) => {
 							with: includes,
 							columns: select?.length && select.length > 0 ? select.reduce((acc, field) => {
 								acc[getFieldName({
-									model,
+									model: modelKey,
 									field
 								})] = true;
 								return acc;
@@ -419,70 +421,70 @@ const drizzleAdapter = (db, config) => {
 				}
 				let builder = db.select(select?.length && select.length > 0 ? select.reduce((acc, field) => {
 					const fieldName = getFieldName({
-						model,
+						model: modelKey,
 						field
 					});
 					return {
 						...acc,
-						[fieldName]: schemaModel[fieldName]
+						[fieldName]: table[fieldName]
 					};
-				}, {}) : void 0).from(schemaModel);
+				}, {}) : void 0).from(table);
 				const effectiveLimit = limit;
 				const effectiveOffset = offset;
 				if (typeof effectiveLimit !== "undefined") builder = builder.limit(effectiveLimit);
 				if (typeof effectiveOffset !== "undefined") builder = builder.offset(effectiveOffset);
-				if (sortBy?.field) builder = builder.orderBy(sortFn(schemaModel[getFieldName({
-					model,
+				if (sortBy?.field) builder = builder.orderBy(sortFn(table[getFieldName({
+					model: modelKey,
 					field: sortBy?.field
 				})]));
 				return await builder.where(...clause);
 			},
-			async count({ model, where }) {
-				const schemaModel = getSchema(model);
-				const clause = where ? convertWhereClause(where, model) : [];
-				return (await db.select({ count: count() }).from(schemaModel).where(...clause))[0].count;
+			async count({ model, modelKey = model, where }) {
+				const table = getSchema(model);
+				const clause = where ? convertWhereClause(where, model, modelKey) : [];
+				return (await db.select({ count: count() }).from(table).where(...clause))[0].count;
 			},
-			async update({ model, where, update: values }) {
-				const schemaModel = getSchema(model);
-				const clause = convertWhereClause(where, model);
-				return await withReturning(model, db.update(schemaModel).set(values).where(...clause), values, where);
+			async update({ model, modelKey = model, where, update: values }) {
+				const table = getSchema(model);
+				const clause = convertWhereClause(where, model, modelKey);
+				return await withReturning(model, modelKey, db.update(table).set(values).where(...clause), values, where);
 			},
-			async updateMany({ model, where, update: values }) {
-				const schemaModel = getSchema(model);
-				const clause = convertWhereClause(where, model);
-				return getAffectedRowCount(await db.update(schemaModel).set(values).where(...clause), "updateMany", {
+			async updateMany({ model, modelKey = model, where, update: values }) {
+				const table = getSchema(model);
+				const clause = convertWhereClause(where, model, modelKey);
+				return getAffectedRowCount(await db.update(table).set(values).where(...clause), "updateMany", {
 					model,
 					where
 				});
 			},
-			async delete({ model, where }) {
-				const schemaModel = getSchema(model);
-				const clause = convertWhereClause(where, model);
-				return await db.delete(schemaModel).where(...clause);
+			async delete({ model, modelKey = model, where }) {
+				const table = getSchema(model);
+				const clause = convertWhereClause(where, model, modelKey);
+				return await db.delete(table).where(...clause);
 			},
-			async deleteMany({ model, where }) {
-				const schemaModel = getSchema(model);
-				const clause = convertWhereClause(where, model);
-				return getAffectedRowCount(await db.delete(schemaModel).where(...clause), "deleteMany", {
+			async deleteMany({ model, modelKey = model, where }) {
+				const table = getSchema(model);
+				const clause = convertWhereClause(where, model, modelKey);
+				return getAffectedRowCount(await db.delete(table).where(...clause), "deleteMany", {
 					model,
 					where
 				});
 			},
-			async consumeOne({ model, where }) {
-				const schemaModel = getSchema(model);
-				const clause = convertWhereClause(where, model);
+			async consumeOne({ model, modelKey = model, where }) {
+				const table = getSchema(model);
+				const clause = convertWhereClause(where, model, modelKey);
 				const idField = getFieldName({
-					model,
+					model: modelKey,
 					field: "id"
 				});
-				const idColumn = schemaModel[idField];
+				const idColumn = table[idField];
 				if (config.provider === "mysql") {
 					const claimFromTransaction = async (tx) => {
-						const target = (await tx.select().from(schemaModel).where(...clause).for("update").limit(1))[0];
+						const target = (await tx.select().from(table).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;
-						return getAffectedRowCount(await tx.delete(schemaModel).where(eq(idColumn, targetId)).execute(), "consumeOne", {
+						return getAffectedRowCount(await tx.delete(table).where(eq(idColumn, targetId)).execute(), "consumeOne", {
 							model,
 							where
 						}) > 0 ? target : null;
@@ -490,49 +492,49 @@ const drizzleAdapter = (db, config) => {
 					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;
+				const targetIds = db.select({ id: idColumn }).from(table).where(...clause).limit(1);
+				return (await db.delete(table).where(inArray(idColumn, targetIds)).returning())[0] ?? null;
 			},
-			async incrementOne({ model, where, increment, set }) {
-				const schemaModel = getSchema(model);
-				const clause = convertWhereClause(where, model);
+			async incrementOne({ model, modelKey = model, where, increment, set }) {
+				const table = getSchema(model);
+				const clause = convertWhereClause(where, model, modelKey);
 				const idField = getFieldName({
-					model,
+					model: modelKey,
 					field: "id"
 				});
-				const idColumn = schemaModel[idField];
+				const idColumn = table[idField];
 				const assignments = {};
 				for (const [field, delta] of Object.entries(increment)) {
 					const columnName = getFieldName({
-						model,
+						model: modelKey,
 						field
 					});
-					const column = schemaModel[columnName];
+					const column = table[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,
+						model: modelKey,
 						field
 					});
-					if (!schemaModel[columnName]) throw new BetterAuthError(`The field "${field}" does not exist in the schema for the model "${model}". Please update your schema.`);
+					if (!table[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];
+						const target = (await tx.select().from(table).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;
+						await tx.update(table).set(assignments).where(eq(idColumn, targetId)).execute();
+						return (await tx.select().from(table).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;
+				const targetIds = db.select({ id: idColumn }).from(table).where(...clause).limit(1);
+				return (await db.update(table).set(assignments).where(and(...clause, inArray(idColumn, targetIds))).returning())[0] ?? null;
 			},
 			options: config
 		};
@@ -570,7 +572,7 @@ const drizzleAdapter = (db, config) => {
 	return (options) => {
 		lazyOptions = options;
 		const instance = adapter(options);
-		if (checksSchema(options)) registerSchemaCheck(instance, createSchemaCheck(async () => findDrizzleSchemaProblems(config.schema ?? db._?.fullSchema ?? {}, options, config.usePlural), "drizzle"));
+		registerSchemaCheck(instance, createSchemaCheck(() => findDrizzleSchemaProblems(config.schema ?? db._?.fullSchema ?? {}, options, config.usePlural), "drizzle"), { runtimeEnabled: checksSchema(options) });
 		return instance;
 	};
 };

package/dist/relations-v2/index.mjs

@@ -1,4 +1,4 @@
-import { a as insensitiveInArray, c as buildRelationKeysByModel, l as getOneToOneRelationKey, n as escapedLike, o as insensitiveNe, r as insensitiveEq, s as insensitiveNotInArray, t as findDrizzleSchemaProblems } from "../schema-check-_Aj1MGau.mjs";
+import { a as insensitiveInArray, c as buildRelationKeysByModel, l as getOneToOneRelationKey, n as escapedLike, o as insensitiveNe, r as insensitiveEq, s as insensitiveNotInArray, t as findDrizzleSchemaProblems } from "../schema-check-DFZjRat1.mjs";
 import { createAdapterFactory } from "@better-auth/core/db/adapter";
 import { checksSchema, createSchemaCheck, registerSchemaCheck } from "@better-auth/core/db/internal";
 import { logger } from "@better-auth/core/env";
@@ -110,10 +110,12 @@ const drizzleAdapter = (db, config) => {
 			}
 			return null;
 		}
-		function getJoinRelationKey(baseModel, joinModel, relationKeys, isUnique) {
+		function getJoinRelationKey(baseModel, joinModel, baseModelKey, joinModelKey, relationKeys, isUnique) {
 			if (isUnique) return getOneToOneRelationKey({
 				baseModel,
 				joinModel,
+				baseModelKey,
+				joinModelKey,
 				relationKeys,
 				schema: baSchema,
 				getDefaultModelName
@@ -121,7 +123,7 @@ const drizzleAdapter = (db, config) => {
 			if (config.usePlural || joinModel.endsWith("s")) return joinModel;
 			return `${joinModel}s`;
 		}
-		const withReturning = async (model, builder, data, where) => {
+		const withReturning = async (model, modelKey, builder, data, where) => {
 			if (config.provider !== "mysql") return (await builder.returning())[0];
 			const isSerialInsert = where === void 0 && options.advanced?.database?.generateId === "serial";
 			const insertResult = isSerialInsert ? await builder.$returningId().execute() : await builder.execute();
@@ -134,7 +136,7 @@ const drizzleAdapter = (db, config) => {
 						value: data[w.field]
 					};
 					return w;
-				}), model);
+				}), model, modelKey);
 				return (await db.select().from(schemaModel).where(...clause))[0];
 			}
 			const fetchInserted = async (tx) => {
@@ -143,11 +145,11 @@ const drizzleAdapter = (db, config) => {
 				if (data.id) return (await tx.select().from(schemaModel).where(eq(schemaModel.id, data.id)).limit(1).execute())[0] ?? null;
 				const insertId = isSerialInsert ? insertResult?.[0]?.id : void 0;
 				if (insertId && schemaModel.id) return (await tx.select().from(schemaModel).where(eq(schemaModel.id, insertId)).limit(1).execute())[0] ?? null;
-				const modelSchema = baSchema[getDefaultModelName(model)]?.fields;
+				const modelSchema = baSchema[modelKey]?.fields;
 				if (modelSchema) for (const [fieldKey, fieldAttr] of Object.entries(modelSchema)) {
 					if (!fieldAttr.unique) continue;
 					const dbFieldName = getFieldName({
-						model,
+						model: modelKey,
 						field: fieldKey
 					});
 					const val = data[dbFieldName];
@@ -173,10 +175,10 @@ const drizzleAdapter = (db, config) => {
 			};
 			return inTransaction ? fetchInserted(db) : db.transaction(fetchInserted);
 		};
-		function resolveColumn(model, w) {
+		function resolveColumn(model, modelKey, w) {
 			const schemaModel = getSchema(model);
 			const field = getFieldName({
-				model,
+				model: modelKey,
 				field: w.field
 			});
 			if (!schemaModel[field]) throw new BetterAuthError(`The field "${w.field}" does not exist in the schema for the model "${model}". Please update your schema.`);
@@ -185,32 +187,32 @@ const drizzleAdapter = (db, config) => {
 				field
 			};
 		}
-		function convertWhereClause(where, model) {
+		function convertWhereClause(where, model, modelKey) {
 			if (!where) return [];
 			if (where.length === 1) {
 				const w = where[0];
 				if (!w) return [];
-				const { column } = resolveColumn(model, w);
+				const { column } = resolveColumn(model, modelKey, w);
 				return [applyWhereOperator(column, w, w.field, config.provider)];
 			}
 			const andGroup = where.filter((w) => w.connector === "AND" || !w.connector);
 			const orGroup = where.filter((w) => w.connector === "OR");
 			const combined = and(and(...andGroup.map((w) => {
-				const { column } = resolveColumn(model, w);
+				const { column } = resolveColumn(model, modelKey, w);
 				return applyWhereOperator(column, w, w.field, config.provider);
 			})), or(...orGroup.map((w) => {
-				const { column } = resolveColumn(model, w);
+				const { column } = resolveColumn(model, modelKey, w);
 				return applyWhereOperator(column, w, w.field, config.provider);
 			})));
 			return combined ? [combined] : [];
 		}
-		function convertNewWhereClause(where, model) {
+		function convertNewWhereClause(where, model, modelKey) {
 			const schemaModel = getSchema(model);
 			if (!where || where.length === 0) return {};
 			const rawCondition = (w, field) => ({ RAW: (table) => applyWhereOperator(table[field], w, w.field, config.provider) });
 			const convertWhereToColumn = (w) => {
 				const field = getFieldName({
-					model,
+					model: modelKey,
 					field: w.field
 				});
 				if (!schemaModel[field]) throw new BetterAuthError(`The field "${w.field}" does not exist in the schema for the model "${model}". Please update your schema.`);
@@ -278,14 +280,14 @@ const drizzleAdapter = (db, config) => {
 			for (const key in values) if (!schema[key]) throw new BetterAuthError(`The field "${key}" does not exist in the "${model}" Drizzle schema. Please update your drizzle schema or re-generate using "npx auth@latest generate".`);
 		}
 		return {
-			async create({ model, data: values }) {
-				const schemaModel = getSchema(model);
-				checkMissingFields(schemaModel, model, values);
-				return await withReturning(model, db.insert(schemaModel).values(values), values);
+			async create({ model, modelKey = model, data: values }) {
+				const table = getSchema(model);
+				checkMissingFields(table, modelKey, values);
+				return await withReturning(model, modelKey, db.insert(table).values(values), values);
 			},
-			async findOne({ model, where, select, join }) {
-				const schemaModel = getSchema(model);
-				const clause = convertWhereClause(where, model);
+			async findOne({ model, modelKey = model, where, select, join }) {
+				const table = getSchema(model);
+				const clause = convertWhereClause(where, model, modelKey);
 				if (join) {
 					const queryModel = getQueryModel(model);
 					if (!db.query || !queryModel) {
@@ -300,19 +302,19 @@ const drizzleAdapter = (db, config) => {
 						for (const [joinModel, joinAttr] of joinEntries) {
 							const limit = joinAttr.limit ?? options.advanced?.database?.defaultFindManyLimit ?? 100;
 							const isUnique = joinAttr.relation === "one-to-one";
-							const relationKey = getJoinRelationKey(model, joinModel, relationKeys, isUnique);
+							const relationKey = getJoinRelationKey(model, joinModel, modelKey, joinAttr.modelKey ?? joinModel, relationKeys, isUnique);
 							includes[relationKey] = isUnique ? true : { limit };
 							if (relationKey !== joinModel) renamedJoinResults.push({
 								key: relationKey,
 								target: joinModel
 							});
 						}
-						const clause = convertNewWhereClause(where, model);
+						const clause = convertNewWhereClause(where, model, modelKey);
 						const res = await db.query[queryModel].findFirst({
 							where: clause,
 							columns: select?.length && select.length > 0 ? select.reduce((acc, field) => {
 								acc[getFieldName({
-									model,
+									model: modelKey,
 									field
 								})] = true;
 								return acc;
@@ -328,20 +330,20 @@ const drizzleAdapter = (db, config) => {
 				}
 				const res = await db.select(select?.length && select.length > 0 ? select.reduce((acc, field) => {
 					const fieldName = getFieldName({
-						model,
+						model: modelKey,
 						field
 					});
 					return {
 						...acc,
-						[fieldName]: schemaModel[fieldName]
+						[fieldName]: table[fieldName]
 					};
-				}, {}) : void 0).from(schemaModel).where(...clause);
+				}, {}) : void 0).from(table).where(...clause);
 				if (!res.length) return null;
 				return res[0];
 			},
-			async findMany({ model, where, sortBy, limit, select, offset, join }) {
-				const schemaModel = getSchema(model);
-				const clause = where ? convertWhereClause(where, model) : [];
+			async findMany({ model, modelKey = model, where, sortBy, limit, select, offset, join }) {
+				const table = getSchema(model);
+				const clause = where ? convertWhereClause(where, model, modelKey) : [];
 				const sortFn = sortBy?.direction === "desc" ? desc : asc;
 				if (join) {
 					const queryModel = getQueryModel(model);
@@ -357,7 +359,7 @@ const drizzleAdapter = (db, config) => {
 						for (const [joinModel, joinAttr] of joinEntries) {
 							const isUnique = joinAttr.relation === "one-to-one";
 							const limit = joinAttr.limit ?? options.advanced?.database?.defaultFindManyLimit ?? 100;
-							const relationKey = getJoinRelationKey(model, joinModel, relationKeys, isUnique);
+							const relationKey = getJoinRelationKey(model, joinModel, modelKey, joinAttr.modelKey ?? joinModel, relationKeys, isUnique);
 							includes[relationKey] = isUnique ? true : { limit };
 							if (relationKey !== joinModel) renamedJoinResults.push({
 								key: relationKey,
@@ -366,15 +368,15 @@ const drizzleAdapter = (db, config) => {
 						}
 						let orderBy = void 0;
 						if (sortBy?.field) orderBy = { [getFieldName({
-							model,
+							model: modelKey,
 							field: sortBy.field
 						})]: sortBy.direction === "desc" ? "desc" : "asc" };
 						const res = await db.query[queryModel].findMany({
-							where: where ? convertNewWhereClause(where, model) : void 0,
+							where: where ? convertNewWhereClause(where, model, modelKey) : void 0,
 							with: includes,
 							columns: select?.length && select.length > 0 ? select.reduce((acc, field) => {
 								acc[getFieldName({
-									model,
+									model: modelKey,
 									field
 								})] = true;
 								return acc;
@@ -392,70 +394,70 @@ const drizzleAdapter = (db, config) => {
 				}
 				let builder = db.select(select?.length && select.length > 0 ? select.reduce((acc, field) => {
 					const fieldName = getFieldName({
-						model,
+						model: modelKey,
 						field
 					});
 					return {
 						...acc,
-						[fieldName]: schemaModel[fieldName]
+						[fieldName]: table[fieldName]
 					};
-				}, {}) : void 0).from(schemaModel);
+				}, {}) : void 0).from(table);
 				const effectiveLimit = limit;
 				const effectiveOffset = offset;
 				if (typeof effectiveLimit !== "undefined") builder = builder.limit(effectiveLimit);
 				if (typeof effectiveOffset !== "undefined") builder = builder.offset(effectiveOffset);
-				if (sortBy?.field) builder = builder.orderBy(sortFn(schemaModel[getFieldName({
-					model,
+				if (sortBy?.field) builder = builder.orderBy(sortFn(table[getFieldName({
+					model: modelKey,
 					field: sortBy?.field
 				})]));
 				return await builder.where(...clause);
 			},
-			async count({ model, where }) {
-				const schemaModel = getSchema(model);
-				const clause = where ? convertWhereClause(where, model) : [];
-				return (await db.select({ count: count() }).from(schemaModel).where(...clause))[0].count;
+			async count({ model, modelKey = model, where }) {
+				const table = getSchema(model);
+				const clause = where ? convertWhereClause(where, model, modelKey) : [];
+				return (await db.select({ count: count() }).from(table).where(...clause))[0].count;
 			},
-			async update({ model, where, update: values }) {
-				const schemaModel = getSchema(model);
-				const clause = convertWhereClause(where, model);
-				return await withReturning(model, db.update(schemaModel).set(values).where(...clause), values, where);
+			async update({ model, modelKey = model, where, update: values }) {
+				const table = getSchema(model);
+				const clause = convertWhereClause(where, model, modelKey);
+				return await withReturning(model, modelKey, db.update(table).set(values).where(...clause), values, where);
 			},
-			async updateMany({ model, where, update: values }) {
-				const schemaModel = getSchema(model);
-				const clause = convertWhereClause(where, model);
-				return getAffectedRowCount(await db.update(schemaModel).set(values).where(...clause), "updateMany", {
+			async updateMany({ model, modelKey = model, where, update: values }) {
+				const table = getSchema(model);
+				const clause = convertWhereClause(where, model, modelKey);
+				return getAffectedRowCount(await db.update(table).set(values).where(...clause), "updateMany", {
 					model,
 					where
 				});
 			},
-			async delete({ model, where }) {
-				const schemaModel = getSchema(model);
-				const clause = convertWhereClause(where, model);
-				return await db.delete(schemaModel).where(...clause);
+			async delete({ model, modelKey = model, where }) {
+				const table = getSchema(model);
+				const clause = convertWhereClause(where, model, modelKey);
+				return await db.delete(table).where(...clause);
 			},
-			async deleteMany({ model, where }) {
-				const schemaModel = getSchema(model);
-				const clause = convertWhereClause(where, model);
-				return getAffectedRowCount(await db.delete(schemaModel).where(...clause), "deleteMany", {
+			async deleteMany({ model, modelKey = model, where }) {
+				const table = getSchema(model);
+				const clause = convertWhereClause(where, model, modelKey);
+				return getAffectedRowCount(await db.delete(table).where(...clause), "deleteMany", {
 					model,
 					where
 				});
 			},
-			async consumeOne({ model, where }) {
-				const schemaModel = getSchema(model);
-				const clause = convertWhereClause(where, model);
+			async consumeOne({ model, modelKey = model, where }) {
+				const table = getSchema(model);
+				const clause = convertWhereClause(where, model, modelKey);
 				const idField = getFieldName({
-					model,
+					model: modelKey,
 					field: "id"
 				});
-				const idColumn = schemaModel[idField];
+				const idColumn = table[idField];
 				if (config.provider === "mysql") {
 					const claimFromTransaction = async (tx) => {
-						const target = (await tx.select().from(schemaModel).where(...clause).for("update").limit(1))[0];
+						const target = (await tx.select().from(table).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;
-						return getAffectedRowCount(await tx.delete(schemaModel).where(eq(idColumn, targetId)).execute(), "consumeOne", {
+						return getAffectedRowCount(await tx.delete(table).where(eq(idColumn, targetId)).execute(), "consumeOne", {
 							model,
 							where
 						}) > 0 ? target : null;
@@ -463,49 +465,49 @@ const drizzleAdapter = (db, config) => {
 					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;
+				const targetIds = db.select({ id: idColumn }).from(table).where(...clause).limit(1);
+				return (await db.delete(table).where(inArray(idColumn, targetIds)).returning())[0] ?? null;
 			},
-			async incrementOne({ model, where, increment, set }) {
-				const schemaModel = getSchema(model);
-				const clause = convertWhereClause(where, model);
+			async incrementOne({ model, modelKey = model, where, increment, set }) {
+				const table = getSchema(model);
+				const clause = convertWhereClause(where, model, modelKey);
 				const idField = getFieldName({
-					model,
+					model: modelKey,
 					field: "id"
 				});
-				const idColumn = schemaModel[idField];
+				const idColumn = table[idField];
 				const assignments = {};
 				for (const [field, delta] of Object.entries(increment)) {
 					const columnName = getFieldName({
-						model,
+						model: modelKey,
 						field
 					});
-					const column = schemaModel[columnName];
+					const column = table[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,
+						model: modelKey,
 						field
 					});
-					if (!schemaModel[columnName]) throw new BetterAuthError(`The field "${field}" does not exist in the schema for the model "${model}". Please update your schema.`);
+					if (!table[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];
+						const target = (await tx.select().from(table).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;
+						await tx.update(table).set(assignments).where(eq(idColumn, targetId)).execute();
+						return (await tx.select().from(table).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;
+				const targetIds = db.select({ id: idColumn }).from(table).where(...clause).limit(1);
+				return (await db.update(table).set(assignments).where(and(...clause, inArray(idColumn, targetIds))).returning())[0] ?? null;
 			},
 			async createSchema(props) {
 				const { generateDrizzleSchema } = await import("../generate-drizzle-schema-iWvrXnu0.mjs");
@@ -547,14 +549,14 @@ const drizzleAdapter = (db, config) => {
 	return (options) => {
 		lazyOptions = options;
 		const instance = adapter(options);
-		if (checksSchema(options)) registerSchemaCheck(instance, createSchemaCheck(async () => {
+		registerSchemaCheck(instance, createSchemaCheck(() => {
 			const relations = db._?.relations ?? {};
 			return findDrizzleSchemaProblems({
 				...db._?.fullSchema,
 				...Object.fromEntries(Object.entries(relations).map(([name, relation]) => [name, relation.table])),
 				...config.schema
 			}, options, config.usePlural);
-		}, "drizzle"));
+		}, "drizzle"), { runtimeEnabled: checksSchema(options) });
 		return instance;
 	};
 };

package/dist/{schema-check-_Aj1MGau.mjs → schema-check-DFZjRat1.mjs}

@@ -15,9 +15,9 @@ function buildRelationKeysByModel(relationRegistry) {
 	}
 	return relationKeysByModel;
 }
-function getOneToOneRelationKey({ baseModel, joinModel, relationKeys, schema, getDefaultModelName }) {
-	const defaultBaseModelName = getDefaultModelName(baseModel);
-	const defaultJoinModelName = getDefaultModelName(joinModel);
+function getOneToOneRelationKey({ baseModel, joinModel, baseModelKey, joinModelKey, relationKeys, schema, getDefaultModelName }) {
+	const defaultBaseModelName = baseModelKey ?? getDefaultModelName(baseModel);
+	const defaultJoinModelName = joinModelKey ?? getDefaultModelName(joinModel);
 	const joinModelFields = schema[defaultJoinModelName]?.fields ?? {};
 	const generatedRelationKey = Object.values(joinModelFields).some((field) => field.references && getDefaultModelName(field.references.model) === defaultBaseModelName) ? joinModel : schema[defaultJoinModelName]?.modelName ?? defaultJoinModelName;
 	if (!relationKeys?.size) return joinModel;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/drizzle-adapter",
-  "version": "1.7.5",
+  "version": "1.7.7",
   "bugs": {
     "url": "https://github.com/better-auth/better-auth/issues"
   },
@@ -45,7 +45,7 @@
   "peerDependencies": {
     "@better-auth/utils": "0.4.2",
     "drizzle-orm": "^0.45.2 || >=1.0.0-rc.1 <2.0.0",
-    "@better-auth/core": "^1.7.5"
+    "@better-auth/core": "^1.7.7"
   },
   "peerDependenciesMeta": {
     "drizzle-orm": {
@@ -57,7 +57,7 @@
     "drizzle-orm": "^0.45.2",
     "tsdown": "0.21.10",
     "typescript": "^6.0.3",
-    "@better-auth/core": "1.7.5"
+    "@better-auth/core": "1.7.7"
   },
   "scripts": {
     "build": "tsdown",