Allow setting d1 database id in pages dev

cloudflare · Jun 17, 2023 · c45d4a3 · c45d4a3
1 parent ca4d27b
commit c45d4a3
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 5 deletions.
diff --git a/.changeset/weak-dolphins-carry.md b/.changeset/weak-dolphins-carry.md
@@ -0,0 +1,5 @@
+---
+"wrangler": patch
+---
+
+feat: Allow setting a D1 database ID when using `wrangler pages dev` by providing an optional `=<ID>` suffix to the argument like `--d1 BINDING_NAME=database-id`
diff --git a/packages/wrangler/src/pages/dev.ts b/packages/wrangler/src/pages/dev.ts
@@ -32,6 +32,10 @@ const DURABLE_OBJECTS_BINDING_REGEXP = new RegExp(
 	/^(?<binding>[^=]+)=(?<className>[^@\s]+)(@(?<scriptName>.*)$)?$/
 );
 
+const D1_BINDING_REGEXP = new RegExp(
+	/^(?<binding>[^=]+)(?:=(?<databaseId>[^@\s]+))?$/
+);
+
 export function Options(yargs: CommonYargsArgv) {
 	return yargs
 		.positional("directory", {
@@ -563,11 +567,16 @@ export const Handler = async ({
 		experimental: {
 			processEntrypoint: true,
 			additionalModules: modules,
-			d1Databases: d1s.map((binding) => ({
-				binding: binding.toString(),
-				database_id: binding.toString(),
-				database_name: `local-${binding}`,
-			})),
+			d1Databases: d1s.map((d1) => {
+				const { binding, databaseId } =
+					D1_BINDING_REGEXP.exec(d1.toString())?.groups || {};
+
+				return {
+					binding,
+					database_id: databaseId || d1.toString(),
+					database_name: `local-${d1}`,
+				};
+			}),
 			disableExperimentalWarning: true,
 			enablePagesAssetsServiceBinding: {
 				proxyPort,