From 869b342452f49f65a04314812b5588dfa9f9bda3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= Date: Thu, 7 Mar 2024 18:46:52 +0100 Subject: [PATCH 1/3] chore(d1): throw a better error if binding not found --- src/connectors/cloudflare-d1.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/connectors/cloudflare-d1.ts b/src/connectors/cloudflare-d1.ts index b5d92d0..b1105b7 100644 --- a/src/connectors/cloudflare-d1.ts +++ b/src/connectors/cloudflare-d1.ts @@ -5,7 +5,13 @@ export interface ConnectorOptions { } export default function sqliteConnector(options: ConnectorOptions) { - const getDB = () => globalThis.__cf_env__[options.bindingName]; + const getDB = () => { + const binding = globalThis.__cf_env__?.[options.bindingName]; + if (!binding) { + throw new Error(`D1 binding ${options.bindingName} not found`); + } + return binding; + } return { name: "cloudflare-d1", From 7a058f0ea4df971a7ca8d7f9a42e40451e78155a Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Thu, 7 Mar 2024 19:15:15 +0100 Subject: [PATCH 2/3] Update src/connectors/cloudflare-d1.ts --- src/connectors/cloudflare-d1.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/connectors/cloudflare-d1.ts b/src/connectors/cloudflare-d1.ts index b1105b7..752f025 100644 --- a/src/connectors/cloudflare-d1.ts +++ b/src/connectors/cloudflare-d1.ts @@ -8,7 +8,7 @@ export default function sqliteConnector(options: ConnectorOptions) { const getDB = () => { const binding = globalThis.__cf_env__?.[options.bindingName]; if (!binding) { - throw new Error(`D1 binding ${options.bindingName} not found`); + throw new Error(`[db0] [d1] binding ${options.bindingName} not found`); } return binding; } From 5483a2cb880fa2c78057de004ad9dd2792ae4bf1 Mon Sep 17 00:00:00 2001 From: Pooya Parsa Date: Fri, 8 Mar 2024 16:11:32 +0100 Subject: [PATCH 3/3] Update src/connectors/cloudflare-d1.ts --- src/connectors/cloudflare-d1.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/connectors/cloudflare-d1.ts b/src/connectors/cloudflare-d1.ts index 752f025..faffc49 100644 --- a/src/connectors/cloudflare-d1.ts +++ b/src/connectors/cloudflare-d1.ts @@ -8,7 +8,7 @@ export default function sqliteConnector(options: ConnectorOptions) { const getDB = () => { const binding = globalThis.__cf_env__?.[options.bindingName]; if (!binding) { - throw new Error(`[db0] [d1] binding ${options.bindingName} not found`); + throw new Error(`[db0] [d1] binding \`${options.bindingName}\` not found`); } return binding; }