Drizzle SQLite adapter: Revert previous optimization for D1 compatibi…

…lity (#1500)

packages/adapter-drizzle/CHANGELOG.md

@@ -1,5 +1,9 @@
 # @lucia-auth/adapter-drizzle
 
+## 1.0.6
+
+- Revert previous optimization for D1 support.
+
 ## 1.0.5
 
 - Fix table types ([#1495](https://github.com/lucia-auth/lucia/pull/1495)).

packages/adapter-drizzle/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@lucia-auth/adapter-drizzle",
-	"version": "1.0.5",
+	"version": "1.0.6",
 	"description": "Drizzle ORM adapter for Lucia",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

packages/adapter-drizzle/src/drivers/mysql.ts

@@ -31,19 +31,21 @@ export class DrizzleMySQLAdapter implements Adapter {
 	public async getSessionAndUser(
 		sessionId: string
 	): Promise<[session: DatabaseSession | null, user: DatabaseUser | null]> {
+		// https://github.com/drizzle-team/drizzle-orm/issues/555
+		const [databaseSession, databaseUser] = await Promise.all([
+			this.getSession(sessionId),
+			this.getUserFromSessionId(sessionId)
+		]);
+		return [databaseSession, databaseUser];
+	}
+
+	private async getSession(sessionId: string): Promise<DatabaseSession | null> {
 		const result = await this.db
-			.select({
-				user: this.userTable,
-				session: this.sessionTable
-			})
+			.select()
 			.from(this.sessionTable)
-			.innerJoin(this.userTable, eq(this.sessionTable.userId, this.userTable.id))
 			.where(eq(this.sessionTable.id, sessionId));
-		if (result.length !== 1) return [null, null];
-		return [
-			transformIntoDatabaseSession(result[0].session),
-			transformIntoDatabaseUser(result[0].user)
-		];
+		if (result.length !== 1) return null;
+		return transformIntoDatabaseSession(result[0]);
 	}
 
 	public async getUserSessions(userId: UserId): Promise<DatabaseSession[]> {
@@ -56,6 +58,17 @@ export class DrizzleMySQLAdapter implements Adapter {
 		});
 	}
 
+	private async getUserFromSessionId(sessionId: string): Promise<DatabaseUser | null> {
+		const { _, $inferInsert, $inferSelect, getSQL, ...userColumns } = this.userTable;
+		const result = await this.db
+			.select(userColumns)
+			.from(this.sessionTable)
+			.innerJoin(this.userTable, eq(this.sessionTable.userId, this.userTable.id))
+			.where(eq(this.sessionTable.id, sessionId));
+		if (result.length !== 1) return null;
+		return transformIntoDatabaseUser(result[0]);
+	}
+
 	public async setSession(session: DatabaseSession): Promise<void> {
 		await this.db.insert(this.sessionTable).values({
 			id: session.id,