From 71e62054f98f55354bcb5c8193352d5f1eeb6805 Mon Sep 17 00:00:00 2001
From: Bobby Donchev <contact@donchev.is>
Date: Fri, 22 Dec 2023 20:47:46 +0100
Subject: [PATCH] revert shims

---
 src/lib/server/d1.ts      | 10 +++++-----
 src/lib/server/db/dbms.ts | 11 +++--------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/src/lib/server/d1.ts b/src/lib/server/d1.ts
index 670b992..c9e9926 100644
--- a/src/lib/server/d1.ts
+++ b/src/lib/server/d1.ts
@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 // adapted from https://github.com/cloudflare/workers-sdk/blob/main/packages/wrangler/templates/d1-beta-facade.js
-export class D1Shim {
+export class D1Database {
 	binding: Fetcher;
 
 	constructor(binding: Fetcher) {
@@ -102,11 +102,11 @@ export class D1Shim {
 }
 
 class D1PreparedStatement {
-	database: D1Shim;
+	database: D1Database;
 	statement: any;
 	params: any;
 
-	constructor(database: D1Shim, statement: any, values?: any) {
+	constructor(database: D1Database, statement: any, values?: any) {
 		this.database = database;
 		this.statement = statement;
 		this.params = values || [];
@@ -160,7 +160,7 @@ class D1PreparedStatement {
 	async all() {
 		return firstIfArray(await this.database._send("/query", this.statement, this.params));
 	}
-	async raw<T>(): Promise<T[]> {
+	async raw() {
 		const s = firstIfArray(await this.database._send("/query", this.statement, this.params));
 		const raw = [];
 		for (const r in s.results) {
@@ -169,7 +169,7 @@ class D1PreparedStatement {
 			});
 			raw.push(entry);
 		}
-		return raw as any;
+		return raw;
 	}
 }
 
diff --git a/src/lib/server/db/dbms.ts b/src/lib/server/db/dbms.ts
index 51be0b5..72f0d13 100644
--- a/src/lib/server/db/dbms.ts
+++ b/src/lib/server/db/dbms.ts
@@ -1,21 +1,16 @@
-import type { D1Database } from "@cloudflare/workers-types";
-import { D1Shim } from "../d1";
+import { D1Database } from "../d1";
 
-export function DBMS(
-	env: Record<string, Fetcher | D1Database | string>,
-): Record<string, D1Database> {
+export function DBMS(env: Record<string, Fetcher | string>): Record<string, D1Database> {
 	const keys = Object.keys(env).filter(
 		(k) => k.startsWith("DB") || k.startsWith("__D1_BETA__DB"),
 	);
-	console.log("Database Bindings:", keys.join(", "));
-
 	const results: Record<string, D1Database> = {};
 	for (const k of keys) {
 		const e = env[k];
 		if (typeof e === "string") {
 			continue;
 		}
-		const db = "prepare" in e ? e : new D1Shim(e);
+		const db = "fetch" in e ? new D1Database(e) : e;
 		results[k.replace(/^(__D1_BETA__)?DB_?/, "") || "default"] = db;
 	}
 	return results;