@better-auth/drizzle-adapter 1.7.1 → 1.7.2

package/dist/index.mjs

@@ -1,8 +1,8 @@
-import { a as insensitiveNe, i as insensitiveInArray, n as insensitiveEq, o as insensitiveNotInArray, r as insensitiveIlike } from "./query-builders-D2eE7gbx.mjs";
+import { a as insensitiveNe, c as getOneToOneRelationKey, i as insensitiveInArray, n as insensitiveEq, o as insensitiveNotInArray, r as insensitiveIlike, s as buildRelationKeysByModel } from "./query-builders-CBLMSM7v.mjs";
 import { createAdapterFactory } from "@better-auth/core/db/adapter";
 import { logger } from "@better-auth/core/env";
 import { BetterAuthError } from "@better-auth/core/error";
-import { and, asc, count, desc, eq, gt, gte, inArray, isNotNull, isNull, like, lt, lte, ne, notInArray, or, sql } from "drizzle-orm";
+import { Column, and, asc, count, desc, eq, gt, gte, inArray, is, isNotNull, isNull, like, lt, lte, ne, notInArray, or, sql } from "drizzle-orm";
 //#region src/drizzle-adapter.ts
 /**
 * Derive the number of affected rows from a Drizzle write result.
@@ -48,6 +48,7 @@ function hasDriverRowCount(result) {
 const drizzleAdapter = (db, config) => {
 	let lazyOptions = null;
 	let mysqlNoIdWarned = false;
+	const relationKeysByModel = buildRelationKeysByModel(db._?.schema);
 	const createCustomAdapter = (db, inTransaction = false) => ({ getFieldName, getDefaultFieldName, getDefaultModelName, options, schema: baSchema }) => {
 		if (config.provider === "mysql" && options.advanced?.database?.generateId === false && !mysqlNoIdWarned) {
 			mysqlNoIdWarned = true;
@@ -115,15 +116,19 @@ const drizzleAdapter = (db, config) => {
 		};
 		function convertWhereClause(where, model) {
 			const schemaModel = getSchema(model);
+			const resolveFieldName = (where) => {
+				const field = getFieldName({
+					model,
+					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.`);
+				return field;
+			};
 			if (!where) return [];
 			if (where.length === 1) {
 				const w = where[0];
 				if (!w) return [];
-				const field = getFieldName({
-					model,
-					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.`);
+				const field = resolveFieldName(w);
 				const isInsensitive = (w.mode ?? "sensitive") === "insensitive" && (typeof w.value === "string" || Array.isArray(w.value) && w.value.every((v) => typeof v === "string"));
 				if (w.operator === "in") {
 					if (!Array.isArray(w.value)) throw new BetterAuthError(`The value for the field "${w.field}" must be an array when using the "in" operator.`);
@@ -163,10 +168,7 @@ const drizzleAdapter = (db, config) => {
 			const andGroup = where.filter((w) => w.connector === "AND" || !w.connector);
 			const orGroup = where.filter((w) => w.connector === "OR");
 			const andClause = and(...andGroup.map((w) => {
-				const field = getFieldName({
-					model,
-					field: w.field
-				});
+				const field = resolveFieldName(w);
 				const isInsensitive = (w.mode ?? "sensitive") === "insensitive" && (typeof w.value === "string" || Array.isArray(w.value) && w.value.every((v) => typeof v === "string"));
 				if (w.operator === "in") {
 					if (!Array.isArray(w.value)) throw new BetterAuthError(`The value for the field "${w.field}" must be an array when using the "in" operator.`);
@@ -204,11 +206,7 @@ const drizzleAdapter = (db, config) => {
 				return eq(schemaModel[field], w.value);
 			}));
 			const orClause = or(...orGroup.map((w) => {
-				const field = getFieldName({
-					model,
-					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.`);
+				const field = resolveFieldName(w);
 				const isInsensitive = (w.mode ?? "sensitive") === "insensitive" && (typeof w.value === "string" || Array.isArray(w.value) && w.value.every((v) => typeof v === "string"));
 				if (w.operator === "in") {
 					if (!Array.isArray(w.value)) throw new BetterAuthError(`The value for the field "${w.field}" must be an array when using the "in" operator.`);
@@ -295,6 +293,16 @@ const drizzleAdapter = (db, config) => {
 			}
 			return null;
 		}
+		function getJoinRelationKey(baseModel, joinModel, relationKeys, isUnique) {
+			if (isUnique) return getOneToOneRelationKey({
+				baseModel,
+				joinModel,
+				relationKeys,
+				schema: baSchema,
+				getDefaultModelName
+			});
+			return config.usePlural ? joinModel : `${joinModel}s`;
+		}
 		return {
 			async create({ model, data: values }) {
 				const schemaModel = getSchema(model);
@@ -311,15 +319,19 @@ const drizzleAdapter = (db, config) => {
 						logger.info("Falling back to regular query");
 					} else {
 						let includes;
-						const pluralJoinResults = [];
+						const renamedJoinResults = [];
+						const relationKeys = relationKeysByModel.get(queryModel);
 						includes = {};
 						const joinEntries = Object.entries(join);
-						for (const [model, joinAttr] of joinEntries) {
+						for (const [joinModel, joinAttr] of joinEntries) {
 							const limit = joinAttr.limit ?? options.advanced?.database?.defaultFindManyLimit ?? 100;
 							const isUnique = joinAttr.relation === "one-to-one";
-							const pluralSuffix = isUnique || config.usePlural ? "" : "s";
-							includes[`${model}${pluralSuffix}`] = isUnique ? true : { limit };
-							if (!isUnique) pluralJoinResults.push(`${model}${pluralSuffix}`);
+							const relationKey = getJoinRelationKey(model, joinModel, relationKeys, isUnique);
+							includes[relationKey] = isUnique ? true : { limit };
+							if (relationKey !== joinModel) renamedJoinResults.push({
+								key: relationKey,
+								target: joinModel
+							});
 						}
 						const res = await db.query[queryModel].findFirst({
 							where: clause[0],
@@ -332,10 +344,9 @@ const drizzleAdapter = (db, config) => {
 							}, {}) : void 0,
 							with: includes
 						});
-						if (res) for (const pluralJoinResult of pluralJoinResults) {
-							const singularKey = !config.usePlural ? pluralJoinResult.slice(0, -1) : pluralJoinResult;
-							res[singularKey] = res[pluralJoinResult];
-							if (pluralJoinResult !== singularKey) delete res[pluralJoinResult];
+						if (res) for (const { key, target } of renamedJoinResults) {
+							res[target] = res[key];
+							delete res[key];
 						}
 						return res;
 					}
@@ -364,15 +375,19 @@ const drizzleAdapter = (db, config) => {
 						logger.info("Falling back to regular query");
 					} else {
 						let includes;
-						const pluralJoinResults = [];
+						const renamedJoinResults = [];
+						const relationKeys = relationKeysByModel.get(queryModel);
 						includes = {};
 						const joinEntries = Object.entries(join);
-						for (const [model, joinAttr] of joinEntries) {
+						for (const [joinModel, joinAttr] of joinEntries) {
 							const isUnique = joinAttr.relation === "one-to-one";
 							const limit = joinAttr.limit ?? options.advanced?.database?.defaultFindManyLimit ?? 100;
-							const pluralSuffix = isUnique || config.usePlural ? "" : "s";
-							includes[`${model}${pluralSuffix}`] = isUnique ? true : { limit };
-							if (!isUnique) pluralJoinResults.push(`${model}${pluralSuffix}`);
+							const relationKey = getJoinRelationKey(model, joinModel, relationKeys, isUnique);
+							includes[relationKey] = isUnique ? true : { limit };
+							if (relationKey !== joinModel) renamedJoinResults.push({
+								key: relationKey,
+								target: joinModel
+							});
 						}
 						let orderBy = void 0;
 						if (sortBy?.field) orderBy = [sortFn(schemaModel[getFieldName({
@@ -393,11 +408,9 @@ const drizzleAdapter = (db, config) => {
 							offset: offset ?? 0,
 							orderBy
 						});
-						if (res) for (const item of res) for (const pluralJoinResult of pluralJoinResults) {
-							const singularKey = !config.usePlural ? pluralJoinResult.slice(0, -1) : pluralJoinResult;
-							if (singularKey === pluralJoinResult) continue;
-							item[singularKey] = item[pluralJoinResult];
-							delete item[pluralJoinResult];
+						if (res) for (const item of res) for (const { key, target } of renamedJoinResults) {
+							item[target] = item[key];
+							delete item[key];
 						}
 						return res;
 					}

package/dist/{query-builders-D2eE7gbx.mjs → query-builders-CBLMSM7v.mjs}

@@ -1,4 +1,30 @@
 import { ilike, sql } from "drizzle-orm";
+//#region src/join-relation-key.ts
+/**
+* Reads the relation registry used to build Drizzle relational queries.
+*
+* - Drizzle 0.x (Relations v1): `db._.schema`
+* - Drizzle 1.x (Relations v2): `db._.relations`
+*/
+function buildRelationKeysByModel(relationRegistry) {
+	const relationKeysByModel = /* @__PURE__ */ new Map();
+	for (const [model, tableMetadata] of Object.entries(relationRegistry ?? {})) {
+		if (!tableMetadata.relations) continue;
+		relationKeysByModel.set(model, new Set(Object.keys(tableMetadata.relations)));
+	}
+	return relationKeysByModel;
+}
+function getOneToOneRelationKey({ baseModel, joinModel, relationKeys, schema, getDefaultModelName }) {
+	const defaultBaseModelName = getDefaultModelName(baseModel);
+	const defaultJoinModelName = 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;
+	if (relationKeys.has(generatedRelationKey)) return generatedRelationKey;
+	if (relationKeys.has(joinModel)) return joinModel;
+	return generatedRelationKey;
+}
+//#endregion
 //#region src/query-builders.ts
 /**
 * Case-insensitive LIKE/ILIKE for pattern matching.
@@ -49,4 +75,4 @@ function insensitiveNe(column, value) {
 	return sql`LOWER(${column}) <> LOWER(${value})`;
 }
 //#endregion
-export { insensitiveNe as a, insensitiveInArray as i, insensitiveEq as n, insensitiveNotInArray as o, insensitiveIlike as r, escapedLike as t };
+export { insensitiveNe as a, getOneToOneRelationKey as c, insensitiveInArray as i, insensitiveEq as n, insensitiveNotInArray as o, insensitiveIlike as r, buildRelationKeysByModel as s, escapedLike as t };

package/dist/relations-v2/index.mjs

@@ -1,4 +1,4 @@
-import { a as insensitiveNe, i as insensitiveInArray, n as insensitiveEq, o as insensitiveNotInArray, t as escapedLike } from "../query-builders-D2eE7gbx.mjs";
+import { a as insensitiveNe, c as getOneToOneRelationKey, i as insensitiveInArray, n as insensitiveEq, o as insensitiveNotInArray, s as buildRelationKeysByModel, t as escapedLike } from "../query-builders-CBLMSM7v.mjs";
 import { createAdapterFactory } from "@better-auth/core/db/adapter";
 import { logger } from "@better-auth/core/env";
 import { BetterAuthError } from "@better-auth/core/error";
@@ -72,15 +72,14 @@ function applyWhereOperator(column, w, fieldLabel, provider) {
 const drizzleAdapter = (db, config) => {
 	let lazyOptions = null;
 	let mysqlNoIdWarned = false;
+	const relationKeysByModel = buildRelationKeysByModel(db._?.relations);
 	const createCustomAdapter = (db, inTransaction = false) => ({ getFieldName, 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.");
-			const schemaModel = schema[model];
+			const schemaModel = config.schema?.[model] ?? db._?.relations?.[model]?.table ?? db._?.fullSchema?.[model];
 			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;
 		}
@@ -109,14 +108,16 @@ const drizzleAdapter = (db, config) => {
 			}
 			return null;
 		}
-		/**
-		* Mirror the schema generator's relation-key naming. One-to-one keeps
-		* the singular model name. One-to-many is pluralized unless the model
-		* already ends in "s" or `usePlural` keeps the schema keys as-is.
-		*/
-		function getJoinRelationKey(model, isUnique) {
-			if (isUnique || config.usePlural || model.endsWith("s")) return model;
-			return `${model}s`;
+		function getJoinRelationKey(baseModel, joinModel, relationKeys, isUnique) {
+			if (isUnique) return getOneToOneRelationKey({
+				baseModel,
+				joinModel,
+				relationKeys,
+				schema: baSchema,
+				getDefaultModelName
+			});
+			if (config.usePlural || joinModel.endsWith("s")) return joinModel;
+			return `${joinModel}s`;
 		}
 		const withReturning = async (model, builder, data, where) => {
 			if (config.provider !== "mysql") return (await builder.returning())[0];
@@ -290,17 +291,18 @@ const drizzleAdapter = (db, config) => {
 						logger.info("Falling back to regular query");
 					} else {
 						let includes;
-						const pluralJoinResults = [];
+						const renamedJoinResults = [];
+						const relationKeys = relationKeysByModel.get(queryModel);
 						includes = {};
 						const joinEntries = Object.entries(join);
-						for (const [model, joinAttr] of joinEntries) {
+						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, isUnique);
+							const relationKey = getJoinRelationKey(model, joinModel, relationKeys, isUnique);
 							includes[relationKey] = isUnique ? true : { limit };
-							if (!isUnique) pluralJoinResults.push({
+							if (relationKey !== joinModel) renamedJoinResults.push({
 								key: relationKey,
-								target: model
+								target: joinModel
 							});
 						}
 						const clause = convertNewWhereClause(where, model);
@@ -315,8 +317,7 @@ const drizzleAdapter = (db, config) => {
 							}, {}) : void 0,
 							with: includes
 						});
-						if (res) for (const { key, target } of pluralJoinResults) {
-							if (key === target) continue;
+						if (res) for (const { key, target } of renamedJoinResults) {
 							res[target] = res[key];
 							delete res[key];
 						}
@@ -347,17 +348,18 @@ const drizzleAdapter = (db, config) => {
 						logger.info("Falling back to regular query");
 					} else {
 						let includes;
-						const pluralJoinResults = [];
+						const renamedJoinResults = [];
+						const relationKeys = relationKeysByModel.get(queryModel);
 						includes = {};
 						const joinEntries = Object.entries(join);
-						for (const [model, joinAttr] of joinEntries) {
+						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, isUnique);
+							const relationKey = getJoinRelationKey(model, joinModel, relationKeys, isUnique);
 							includes[relationKey] = isUnique ? true : { limit };
-							if (!isUnique) pluralJoinResults.push({
+							if (relationKey !== joinModel) renamedJoinResults.push({
 								key: relationKey,
-								target: model
+								target: joinModel
 							});
 						}
 						let orderBy = void 0;
@@ -379,8 +381,7 @@ const drizzleAdapter = (db, config) => {
 							offset: offset ?? 0,
 							orderBy
 						});
-						if (res) for (const item of res) for (const { key, target } of pluralJoinResults) {
-							if (key === target) continue;
+						if (res) for (const item of res) for (const { key, target } of renamedJoinResults) {
 							item[target] = item[key];
 							delete item[key];
 						}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/drizzle-adapter",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "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.1"
+    "@better-auth/core": "^1.7.2"
   },
   "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.1"
+    "@better-auth/core": "1.7.2"
   },
   "scripts": {
     "build": "tsdown",