CFSQL-1589 migrations_pattern for configuring recursive migration discovery (#14089)

Author: alsuren

.changeset/d1-execute-logger-level.md

@@ -0,0 +1,9 @@
+---
+"wrangler": patch
+---
+
+Restore the D1 `executeSql` logger level via try/finally
+
+`wrangler d1 execute --json` and the internal `executeSql` helper temporarily lower the global logger to `"error"` to keep human-readable output out of the JSON payload. Previously the level was restored only on the happy path, so any early return or thrown error left the singleton logger muted, silencing later `logger.warn`/`logger.log` output (notably from migration helpers that wrap `executeSql` and are commonly mocked in tests).
+
+The level swap is now wrapped in `try`/`finally` so it is always restored.

.changeset/d1-migrations-pattern.md

@@ -0,0 +1,28 @@
+---
+"wrangler": minor
+"@cloudflare/workers-utils": minor
+---
+
+Add `migrations_pattern` to D1 database bindings
+
+The D1 binding now accepts an optional `migrations_pattern` field, allowing you to point `wrangler d1 migrations apply` and `wrangler d1 migrations list` at migration files in nested layouts (e.g. ORM-generated folders like `migrations/0000_init/migration.sql`).
+
+`migrations_pattern` is a glob (relative to the wrangler config file) and defaults to `${migrations_dir}/*.sql`, which preserves today's behaviour. Files that do not match the pattern are not executed.
+
+```jsonc
+{
+	"d1_databases": [
+		{
+			"binding": "DB",
+			"database_name": "my-db",
+			"database_id": "...",
+			"migrations_dir": "migrations",
+			"migrations_pattern": "migrations/*/migration.sql",
+		},
+	],
+}
+```
+
+When no migrations match the configured pattern but files matching the common `migrations/*/migration.sql` (drizzle-style) layout do exist, Wrangler logs a hint suggesting `migrations_pattern` as an opt-in.
+
+`wrangler d1 migrations create` now returns an actionable error if the generated migration filename would not match the configured pattern.

packages/workers-utils/src/config/environment.ts

@@ -990,6 +990,21 @@ export interface EnvironmentNonInheritable {
 		migrations_table?: string;
 		/** The path to the directory of migrations for this D1 database (defaults to './migrations'). */
 		migrations_dir?: string;
+		/**
+		 * A glob pattern (relative to the Wrangler config file) used to discover
+		 * migration files for this D1 database. Defaults to `${migrations_dir}/*.sql`
+		 * if not specified.
+		 *
+		 * Use this to opt in to nested layouts such as `migrations/*\/migration.sql`
+		 * (as produced by some ORMs).
+		 *
+		 * When `migrations_pattern` is set, `migrations_dir` must also be set, and
+		 * `migrations_pattern` must start with `${migrations_dir}/`. This keeps the
+		 * relationship between the two settings explicit and lets Wrangler record
+		 * each migration's name in the migrations table as a path relative to
+		 * `migrations_dir`.
+		 */
+		migrations_pattern?: string;
 		/** Internal use only. */
 		database_internal_env?: string;
 		/** Whether the D1 database should be remote or not in local development */

packages/workers-utils/src/config/validation.ts

@@ -4117,12 +4117,22 @@ const validateD1Binding: ValidatorFn = (diagnostics, field, value) => {
 		isValid = false;
 	}
 
+	if (!isOptionalProperty(value, "migrations_pattern", "string")) {
+		diagnostics.errors.push(
+			`"${field}" bindings should, optionally, have a string "migrations_pattern" field but got ${JSON.stringify(
+				value
+			)}.`
+		);
+		isValid = false;
+	}
+
 	validateAdditionalProperties(diagnostics, field, Object.keys(value), [
 		"binding",
 		"database_id",
 		"database_internal_env",
 		"database_name",
 		"migrations_dir",
+		"migrations_pattern",
 		"migrations_table",
 		"preview_database_id",
 		"remote",

packages/workers-utils/src/worker.ts

@@ -220,6 +220,7 @@ export interface CfD1Database {
 	database_internal_env?: string;
 	migrations_table?: string;
 	migrations_dir?: string;
+	migrations_pattern?: string;
 	remote?: boolean;
 	raw?: boolean;
 }