@better-auth/drizzle-adapter 1.7.0-rc.0 → 1.7.0-rc.2

package/dist/{generate-drizzle-schema-BdVT4xKv.mjs → generate-drizzle-schema-D5cxh_0D.mjs}

@@ -2,22 +2,42 @@ import { initGetFieldName, initGetModelName } from "@better-auth/core/db/adapter
 import { existsSync } from "node:fs";
 import path from "node:path";
 import { getAuthTables } from "@better-auth/core/db";
+import { getDatabaseFieldIndexName, getDatabaseIndexStringLength, resolveDatabaseSchemaIndexes } from "@better-auth/core/db/internal";
 //#region src/relations-v2/generate-drizzle-schema.ts
 function convertToSnakeCase(str, camelCase) {
 	if (camelCase) return str;
 	return str.replace(/([A-Z]+)([A-Z][a-z])/g, "$1_$2").replace(/([a-z\d])([A-Z])/g, "$1_$2").toLowerCase();
 }
+/**
+* Convert a schema namespace into a valid JavaScript identifier so it can be
+* used as the `const <name>Schema = pgSchema(...)` variable name.
+* e.g. "my-auth" -> "myAuth", "123schema" -> "_123schema".
+*/
+function toValidIdentifier(str) {
+	let result = str.replace(/[^a-zA-Z0-9]+([a-zA-Z0-9])/g, (_, char) => char.toUpperCase()).replace(/[^a-zA-Z0-9]/g, "").replace(/^[0-9]/, "_$&");
+	if (result.length > 0 && /[A-Z]/.test(result[0])) result = result[0].toLowerCase() + result.slice(1);
+	return result || "schema";
+}
 const generateDrizzleSchema = async ({ options, file, provider, adapterConfig, camelCase, tables: propsTables }) => {
 	const tables = propsTables ?? getAuthTables(options);
 	const filePath = file || "./auth-schema.ts";
 	const databaseType = provider;
+	const schemaName = adapterConfig?.schemaName;
 	if (!databaseType) throw new Error(`Database provider type is undefined during Drizzle schema generation. Please define a \`provider\` in the Drizzle adapter config. Read more at https://better-auth.com/docs/adapters/drizzle`);
 	const fileExist = existsSync(filePath);
 	let code = generateImport({
 		databaseType,
 		tables,
-		options
+		options,
+		schemaName
 	});
+	let schemaVarName;
+	if (databaseType === "pg" && schemaName) {
+		schemaVarName = `${toValidIdentifier(schemaName)}Schema`;
+		if (schemaVarName === "pgSchema") schemaVarName = "pgCustomSchema";
+		code += `\nconst ${schemaVarName} = pgSchema(${JSON.stringify(schemaName)});\n`;
+	}
+	const tableFunction = databaseType === "pg" && schemaName && schemaVarName ? `${schemaVarName}.table` : `${databaseType}Table`;
 	const getModelName = initGetModelName({
 		schema: tables,
 		usePlural: adapterConfig?.usePlural
@@ -30,11 +50,18 @@ const generateDrizzleSchema = async ({ options, file, provider, adapterConfig, c
 		schema: tables,
 		usePlural: adapterConfig?.usePlural
 	});
+	const resolvedIndexesByTable = resolveDatabaseSchemaIndexes(Object.keys(tables).filter((tableKey) => !tables[tableKey].disableMigrations).map((tableKey) => ({
+		fields: tables[tableKey].fields,
+		indexes: tables[tableKey].indexes,
+		tableName: getModelName(tableKey)
+	})));
 	for (const tableKey in tables) {
 		const table = tables[tableKey];
+		if (table.disableMigrations) continue;
 		const modelName = getModelName(tableKey);
 		const fields = table.fields;
-		function getType(name, field) {
+		const resolvedTableIndexes = resolvedIndexesByTable.get(modelName) ?? [];
+		function getType(name, field, tableIndexStringLength) {
 			if (!databaseType) throw new Error(`Database provider type is undefined during Drizzle schema generation. Please define a \`provider\` in the Drizzle adapter config. Read more at https://better-auth.com/docs/adapters/drizzle`);
 			name = convertToSnakeCase(name, camelCase);
 			if (field.references?.field === "id") {
@@ -60,7 +87,7 @@ const generateDrizzleSchema = async ({ options, file, provider, adapterConfig, c
 				string: {
 					sqlite: `text('${name}')`,
 					pg: `text('${name}')`,
-					mysql: field.unique ? `varchar('${name}', { length: 255 })` : field.references ? `varchar('${name}', { length: 36 })` : field.sortable ? `varchar('${name}', { length: 255 })` : field.index ? `varchar('${name}', { length: 255 })` : `text('${name}')`
+					mysql: tableIndexStringLength ? `varchar('${name}', { length: ${tableIndexStringLength} })` : field.unique ? `varchar('${name}', { length: 255 })` : field.references ? `varchar('${name}', { length: 36 })` : field.sortable ? `varchar('${name}', { length: 255 })` : field.index ? `varchar('${name}', { length: 255 })` : `text('${name}')`
 				},
 				boolean: {
 					sqlite: `integer('${name}', { mode: 'boolean' })`,
@@ -109,25 +136,35 @@ const generateDrizzleSchema = async ({ options, file, provider, adapterConfig, c
 		const assignIndexes = (indexes) => {
 			if (!indexes.length) return "";
 			const code = [`, (table) => [`];
-			for (const index of indexes) code.push(`  ${index.type}("${index.name}").on(table.${index.on}),`);
+			for (const index of indexes) code.push(`  ${index.type}(${JSON.stringify(index.name)}).on(${index.on.map((fieldName) => `table.${fieldName}`).join(", ")}),`);
 			code.push(`]`);
 			return code.join("\n");
 		};
-		const schema = `export const ${modelName} = ${databaseType}Table("${convertToSnakeCase(modelName, camelCase)}", {
+		for (const tableIndex of resolvedTableIndexes) indexes.push({
+			type: tableIndex.unique ? "uniqueIndex" : "index",
+			name: tableIndex.name,
+			on: tableIndex.columns
+		});
+		const schema = `export const ${modelName} = ${tableFunction}("${convertToSnakeCase(modelName, camelCase)}", {
 					id: ${id},
 					${Object.keys(fields).map((field) => {
 			const attr = fields[field];
 			const fieldName = attr.fieldName || field;
-			let type = getType(fieldName, attr);
+			let type = getType(fieldName, attr, databaseType === "mysql" ? getDatabaseIndexStringLength({
+				columnName: fieldName,
+				dialect: "mysql",
+				fields,
+				indexes: resolvedTableIndexes
+			}) : void 0);
 			if (attr.index && !attr.unique) indexes.push({
 				type: "index",
-				name: `${modelName}_${fieldName}_idx`,
-				on: fieldName
+				name: getDatabaseFieldIndexName(modelName, fieldName, false),
+				on: [fieldName]
 			});
 			else if (attr.index && attr.unique) indexes.push({
 				type: "uniqueIndex",
-				name: `${modelName}_${fieldName}_uidx`,
-				on: fieldName
+				name: getDatabaseFieldIndexName(modelName, fieldName, true),
+				on: [fieldName]
 			});
 			if (attr.defaultValue !== null && typeof attr.defaultValue !== "undefined") if (typeof attr.defaultValue === "function") {
 				if (attr.type === "date" && attr.defaultValue.toString().includes("new Date()")) if (databaseType === "sqlite") type += `.default(sql\`(cast(unixepoch('subsecond') * 1000 as integer))\`)`;
@@ -151,6 +188,7 @@ const generateDrizzleSchema = async ({ options, file, provider, adapterConfig, c
 	}
 	const schemaObjectKeys = [];
 	for (const tableKey in tables) {
+		if (tables[tableKey].disableMigrations) continue;
 		const modelName = getModelName(tableKey);
 		schemaObjectKeys.push(modelName);
 	}
@@ -158,11 +196,13 @@ const generateDrizzleSchema = async ({ options, file, provider, adapterConfig, c
 	const relationsMap = /* @__PURE__ */ new Map();
 	for (const tableKey in tables) {
 		const table = tables[tableKey];
+		if (table.disableMigrations) continue;
 		const modelName = getModelName(tableKey);
 		const modelRelations = [];
 		const foreignFields = Object.entries(table.fields).filter(([_, field]) => field.references);
 		for (const [fieldName, field] of foreignFields) {
 			const referencedModel = field.references.model;
+			if (tables[referencedModel]?.disableMigrations) continue;
 			const targetModelName = getModelName(referencedModel);
 			const fromField = getFieldName({
 				model: tableKey,
@@ -184,7 +224,7 @@ const generateDrizzleSchema = async ({ options, file, provider, adapterConfig, c
 				sourceModel: modelName
 			});
 		}
-		const otherModels = Object.entries(tables).filter(([modelName]) => modelName !== tableKey);
+		const otherModels = Object.entries(tables).filter(([modelName, otherTable]) => modelName !== tableKey && !otherTable.disableMigrations);
 		for (const [otherTableKey, otherTable] of otherModels) {
 			const foreignKeysPointingHere = Object.entries(otherTable.fields).filter(([_, field]) => field.references?.model === tableKey || field.references?.model === modelName);
 			if (foreignKeysPointingHere.length === 0) continue;
@@ -269,9 +309,11 @@ const generateDrizzleSchema = async ({ options, file, provider, adapterConfig, c
 		append: false
 	};
 };
-function generateImport({ databaseType, tables, options }) {
+function generateImport({ databaseType, tables, options, schemaName }) {
 	const rootImports = ["defineRelationsPart"];
 	const coreImports = [];
+	if (databaseType === "pg" && schemaName) coreImports.push("pgSchema");
+	if (!(databaseType === "pg" && schemaName)) coreImports.push(`${databaseType}Table`);
 	let hasBigint = false;
 	let hasJson = false;
 	for (const table of Object.values(tables)) {
@@ -283,7 +325,6 @@ function generateImport({ databaseType, tables, options }) {
 	}
 	const useNumberId = options.advanced?.database?.generateId === "serial";
 	const useUUIDs = options.advanced?.database?.generateId === "uuid";
-	coreImports.push(`${databaseType}Table`);
 	coreImports.push(databaseType === "mysql" ? "varchar, text" : databaseType === "pg" ? "text" : "text");
 	coreImports.push(hasBigint ? databaseType !== "sqlite" ? "bigint" : "" : "");
 	coreImports.push(databaseType !== "sqlite" ? "timestamp, boolean" : "");
@@ -301,8 +342,8 @@ function generateImport({ databaseType, tables, options }) {
 		if (databaseType === "mysql") coreImports.push("json");
 	}
 	if (databaseType === "sqlite" && Object.values(tables).some((table) => Object.values(table.fields).some((field) => field.type === "date" && field.defaultValue && typeof field.defaultValue === "function" && field.defaultValue.toString().includes("new Date()")))) rootImports.push("sql");
-	const hasIndexes = Object.values(tables).some((table) => Object.values(table.fields).some((field) => field.index && !field.unique));
-	const hasUniqueIndexes = Object.values(tables).some((table) => Object.values(table.fields).some((field) => field.unique && field.index));
+	const hasIndexes = Object.values(tables).some((table) => Object.values(table.fields).some((field) => field.index && !field.unique) || (table.indexes?.some((index) => !index.unique) ?? false));
+	const hasUniqueIndexes = Object.values(tables).some((table) => Object.values(table.fields).some((field) => field.unique && field.index) || (table.indexes?.some((index) => index.unique) ?? false));
 	if (hasIndexes) coreImports.push("index");
 	if (hasUniqueIndexes) coreImports.push("uniqueIndex");
 	return `${rootImports.length > 0 ? `import { ${rootImports.join(", ")} } from "drizzle-orm";\n` : ""}import { ${coreImports.map((x) => x.trim()).filter((x) => x !== "").join(", ")} } from "drizzle-orm/${databaseType}-core";\n`;

package/dist/index.d.mts

@@ -1,6 +1,5 @@
 import { DBAdapter, DBAdapterDebugLogOption } from "@better-auth/core/db/adapter";
 import { BetterAuthOptions } from "@better-auth/core";
-
 //#region src/drizzle-adapter.d.ts
 interface DB {
   [key: string]: any;
@@ -41,6 +40,22 @@ interface DrizzleAdapterConfig {
    * @default false
    */
   transaction?: boolean | undefined;
+  /**
+   * Database schema namespace, used during the Better Auth CLI to generate the schema.
+   *
+   * Only applies to PostgreSQL. It will generate something like this:
+   *
+   * ```ts
+   * const authSchema = pgSchema("auth");
+   *
+   * export const user = authSchema.table("user", {...});
+   * export const session = authSchema.table("session", {...});
+   * ```
+   *
+   * @example "auth"
+   * @default undefined
+   */
+  schemaName?: string | undefined;
 }
 declare const drizzleAdapter: (db: DB, config: DrizzleAdapterConfig) => (options: BetterAuthOptions) => DBAdapter<BetterAuthOptions>;
 //#endregion

package/dist/index.mjs

@@ -1,4 +1,4 @@
-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, i as insensitiveInArray, n as insensitiveEq, o as insensitiveNotInArray, r as insensitiveIlike } from "./query-builders-Btx2OekF.mjs";
 import { createAdapterFactory } from "@better-auth/core/db/adapter";
 import { logger } from "@better-auth/core/env";
 import { BetterAuthError } from "@better-auth/core/error";
@@ -7,15 +7,19 @@ import { and, asc, count, desc, eq, gt, gte, inArray, isNotNull, isNull, like, l
 /**
 * 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.
+* Drizzle returns the raw per-driver result for a non-returning write, so the
+* count lives under a different field per driver: node-postgres / neon expose
+* `rowCount`, postgres-js / bun-sql carry `count` on an Array subclass, mysql2
+* reports `affectedRows` (in a result-header array), planetscale and other
+* serverless drivers use `rowsAffected`, better-sqlite3 uses `changes`, and
+* Cloudflare D1 nests the count under `meta.changes`. This normalizes them 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 (result && typeof result === "object" && typeof result.count === "number") count = result.count;
 	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)) {
@@ -27,12 +31,19 @@ function getAffectedRowCount(result, operation, context) {
 	}
 	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;
+	if (!result || typeof result !== "object") return void 0;
+	const driverResult = result;
+	if ("affectedRows" in driverResult) return driverResult.affectedRows;
+	if ("rowsAffected" in driverResult) return driverResult.rowsAffected;
+	if ("changes" in driverResult) return driverResult.changes;
+	if ("meta" in driverResult) {
+		const meta = driverResult.meta;
+		if (meta && typeof meta === "object" && "changes" in meta) return meta.changes;
+	}
+}
+function hasDriverRowCount(result) {
+	return readDriverRowCount(result) !== void 0;
 }
 const drizzleAdapter = (db, config) => {
 	let lazyOptions = null;
@@ -267,6 +278,7 @@ const drizzleAdapter = (db, config) => {
 		*    corresponds to the same table object
 		*/
 		function getQueryModel(model) {
+			if (!db.query) return null;
 			if (db.query[model]) return model;
 			if (config.usePlural) {
 				const plural = `${model}s`;
@@ -287,12 +299,13 @@ const drizzleAdapter = (db, config) => {
 			async create({ model, data: values }) {
 				const schemaModel = getSchema(model);
 				checkMissingFields(schemaModel, model, values);
-				return await withReturning(model, db.insert(schemaModel).values(values), values);
+				const builder = db.insert(schemaModel).values(values);
+				return await withReturning(model, builder, values);
 			},
 			async findOne({ model, where, select, join }) {
 				const schemaModel = getSchema(model);
 				const clause = convertWhereClause(where, model);
-				if (options.experimental?.joins) {
+				if (join) {
 					const queryModel = getQueryModel(model);
 					if (!db.query || !queryModel) {
 						logger.error(`[# Drizzle Adapter]: The model "${model}" was not found in the query object. Please update your Drizzle schema to include relations or re-generate using "npx auth@latest generate".`);
@@ -300,16 +313,14 @@ const drizzleAdapter = (db, config) => {
 					} else {
 						let includes;
 						const pluralJoinResults = [];
-						if (join) {
-							includes = {};
-							const joinEntries = Object.entries(join);
-							for (const [model, 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}`);
-							}
+						includes = {};
+						const joinEntries = Object.entries(join);
+						for (const [model, 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 res = await db.query[queryModel].findFirst({
 							where: clause[0],
@@ -347,24 +358,22 @@ const drizzleAdapter = (db, config) => {
 				const schemaModel = getSchema(model);
 				const clause = where ? convertWhereClause(where, model) : [];
 				const sortFn = sortBy?.direction === "desc" ? desc : asc;
-				if (options.experimental?.joins) {
+				if (join) {
 					const queryModel = getQueryModel(model);
-					if (!queryModel) {
+					if (!db.query || !queryModel) {
 						logger.error(`[# Drizzle Adapter]: The model "${model}" was not found in the query object. Please update your Drizzle schema to include relations or re-generate using "npx auth@latest generate".`);
 						logger.info("Falling back to regular query");
 					} else {
 						let includes;
 						const pluralJoinResults = [];
-						if (join) {
-							includes = {};
-							const joinEntries = Object.entries(join);
-							for (const [model, 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}`);
-							}
+						includes = {};
+						const joinEntries = Object.entries(join);
+						for (const [model, 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}`);
 						}
 						let orderBy = void 0;
 						if (sortBy?.field) orderBy = [sortFn(schemaModel[getFieldName({
@@ -422,7 +431,8 @@ const drizzleAdapter = (db, config) => {
 			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);
+				const builder = db.update(schemaModel).set(values).where(...clause);
+				return await withReturning(model, builder, values, where);
 			},
 			async updateMany({ model, where, update: values }) {
 				const schemaModel = getSchema(model);

package/dist/relations-v2/index.d.mts

@@ -1,6 +1,5 @@
 import { DBAdapter, DBAdapterDebugLogOption } from "@better-auth/core/db/adapter";
 import { BetterAuthOptions } from "@better-auth/core";
-
 //#region src/relations-v2/index.d.ts
 interface DB {
   [key: string]: any;
@@ -41,6 +40,22 @@ interface DrizzleAdapterConfig {
    * @default false
    */
   transaction?: boolean | undefined;
+  /**
+   * Database schema namespace, used during the Better Auth CLI to generate the schema.
+   *
+   * Only applies to PostgreSQL. It will generate something like this:
+   *
+   * ```ts
+   * const authSchema = pgSchema("auth");
+   *
+   * export const user = authSchema.table("user", {...});
+   * export const session = authSchema.table("session", {...});
+   * ```
+   *
+   * @example "auth"
+   * @default undefined
+   */
+  schemaName?: string | undefined;
 }
 declare const drizzleAdapter: (db: DB, config: DrizzleAdapterConfig) => (options: BetterAuthOptions) => DBAdapter<BetterAuthOptions>;
 //#endregion

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, i as insensitiveInArray, n as insensitiveEq, o as insensitiveNotInArray, t as escapedLike } from "../query-builders-Btx2OekF.mjs";
 import { createAdapterFactory } from "@better-auth/core/db/adapter";
 import { logger } from "@better-auth/core/env";
 import { BetterAuthError } from "@better-auth/core/error";
@@ -278,12 +278,13 @@ const drizzleAdapter = (db, config) => {
 			async create({ model, data: values }) {
 				const schemaModel = getSchema(model);
 				checkMissingFields(schemaModel, model, values);
-				return await withReturning(model, db.insert(schemaModel).values(values), values);
+				const builder = db.insert(schemaModel).values(values);
+				return await withReturning(model, builder, values);
 			},
 			async findOne({ model, where, select, join }) {
 				const schemaModel = getSchema(model);
 				const clause = convertWhereClause(where, model);
-				if (options.experimental?.joins) {
+				if (join) {
 					const queryModel = getQueryModel(model);
 					if (!db.query || !queryModel) {
 						logger.error(`[# Drizzle Adapter]: The model "${model}" was not found in the query object. Please update your Drizzle schema to include relations or re-generate using "npx @better-auth/cli@latest generate".`);
@@ -291,19 +292,17 @@ const drizzleAdapter = (db, config) => {
 					} else {
 						let includes;
 						const pluralJoinResults = [];
-						if (join) {
-							includes = {};
-							const joinEntries = Object.entries(join);
-							for (const [model, joinAttr] of joinEntries) {
-								const limit = joinAttr.limit ?? options.advanced?.database?.defaultFindManyLimit ?? 100;
-								const isUnique = joinAttr.relation === "one-to-one";
-								const relationKey = getJoinRelationKey(model, isUnique);
-								includes[relationKey] = isUnique ? true : { limit };
-								if (!isUnique) pluralJoinResults.push({
-									key: relationKey,
-									target: model
-								});
-							}
+						includes = {};
+						const joinEntries = Object.entries(join);
+						for (const [model, joinAttr] of joinEntries) {
+							const limit = joinAttr.limit ?? options.advanced?.database?.defaultFindManyLimit ?? 100;
+							const isUnique = joinAttr.relation === "one-to-one";
+							const relationKey = getJoinRelationKey(model, isUnique);
+							includes[relationKey] = isUnique ? true : { limit };
+							if (!isUnique) pluralJoinResults.push({
+								key: relationKey,
+								target: model
+							});
 						}
 						const clause = convertNewWhereClause(where, model);
 						const res = await db.query[queryModel].findFirst({
@@ -342,7 +341,7 @@ const drizzleAdapter = (db, config) => {
 				const schemaModel = getSchema(model);
 				const clause = where ? convertWhereClause(where, model) : [];
 				const sortFn = sortBy?.direction === "desc" ? desc : asc;
-				if (options.experimental?.joins) {
+				if (join) {
 					const queryModel = getQueryModel(model);
 					if (!db.query || !queryModel) {
 						logger.error(`[# Drizzle Adapter]: The model "${model}" was not found in the query object. Please update your Drizzle schema to include relations or re-generate using "npx @better-auth/cli@latest generate".`);
@@ -350,19 +349,17 @@ const drizzleAdapter = (db, config) => {
 					} else {
 						let includes;
 						const pluralJoinResults = [];
-						if (join) {
-							includes = {};
-							const joinEntries = Object.entries(join);
-							for (const [model, joinAttr] of joinEntries) {
-								const isUnique = joinAttr.relation === "one-to-one";
-								const limit = joinAttr.limit ?? options.advanced?.database?.defaultFindManyLimit ?? 100;
-								const relationKey = getJoinRelationKey(model, isUnique);
-								includes[relationKey] = isUnique ? true : { limit };
-								if (!isUnique) pluralJoinResults.push({
-									key: relationKey,
-									target: model
-								});
-							}
+						includes = {};
+						const joinEntries = Object.entries(join);
+						for (const [model, joinAttr] of joinEntries) {
+							const isUnique = joinAttr.relation === "one-to-one";
+							const limit = joinAttr.limit ?? options.advanced?.database?.defaultFindManyLimit ?? 100;
+							const relationKey = getJoinRelationKey(model, isUnique);
+							includes[relationKey] = isUnique ? true : { limit };
+							if (!isUnique) pluralJoinResults.push({
+								key: relationKey,
+								target: model
+							});
 						}
 						let orderBy = void 0;
 						if (sortBy?.field) orderBy = { [getFieldName({
@@ -419,7 +416,8 @@ const drizzleAdapter = (db, config) => {
 			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);
+				const builder = db.update(schemaModel).set(values).where(...clause);
+				return await withReturning(model, builder, values, where);
 			},
 			async updateMany({ model, where, update: values }) {
 				const schemaModel = getSchema(model);
@@ -509,7 +507,7 @@ const drizzleAdapter = (db, config) => {
 				return (await db.update(schemaModel).set(assignments).where(inArray(idColumn, targetIds)).returning())[0] ?? null;
 			},
 			async createSchema(props) {
-				const { generateDrizzleSchema } = await import("../generate-drizzle-schema-BdVT4xKv.mjs");
+				const { generateDrizzleSchema } = await import("../generate-drizzle-schema-D5cxh_0D.mjs");
 				return await generateDrizzleSchema({
 					adapterConfig: config,
 					options,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@better-auth/drizzle-adapter",
-  "version": "1.7.0-rc.0",
+  "version": "1.7.0-rc.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.0-rc.0"
+    "@better-auth/core": "^1.7.0-rc.2"
   },
   "peerDependenciesMeta": {
     "drizzle-orm": {
@@ -55,9 +55,9 @@
   "devDependencies": {
     "@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-rc.0"
+    "tsdown": "0.22.7",
+    "typescript": "^6.0.3",
+    "@better-auth/core": "1.7.0-rc.2"
   },
   "scripts": {
     "build": "tsdown",
@@ -65,6 +65,7 @@
     "lint:package": "publint run --strict --pack false",
     "lint:types": "attw --profile esm-only --pack .",
     "typecheck": "tsc --noEmit",
-    "test": "vitest"
+    "test": "vitest",
+    "coverage": "vitest run --coverage --coverage.provider=istanbul"
   }
 }