wrangler 2.6.2 → 2.7.0

package/src/__tests__/whoami.test.tsx

@@ -1,8 +1,6 @@
-import { render } from "ink-testing-library";
 import { rest } from "msw";
-import React from "react";
 import { writeAuthConfigFile } from "../user";
-import { getUserInfo, WhoAmI } from "../whoami";
+import { getUserInfo } from "../whoami";
 import { mockConsoleMethods } from "./helpers/mock-console";
 import { useMockIsTTY } from "./helpers/mock-istty";
 import {
@@ -11,7 +9,6 @@ import {
 	mswSuccessUserHandlers,
 } from "./helpers/msw";
 import { runInTempDir } from "./helpers/run-in-tmp";
-import type { UserInfo } from "../whoami";
 
 describe("getUserInfo()", () => {
 	const ENV_COPY = process.env;
@@ -184,95 +181,3 @@ describe("getUserInfo()", () => {
 	    `);
 	});
 });
-
-describe("WhoAmI component", () => {
-	it("should return undefined if there is no user", async () => {
-		const { lastFrame } = render(<WhoAmI user={undefined}></WhoAmI>);
-
-		expect(lastFrame()).toMatchInlineSnapshot(
-			`"You are not authenticated. Please run \`wrangler login\`."`
-		);
-	});
-
-	it("should display the user's email, accounts and OAuth scopes", async () => {
-		const user: UserInfo = {
-			authType: "OAuth Token",
-			apiToken: "some-oauth-token",
-			email: "user@example.com",
-			tokenPermissions: ["scope1:read", "scope2:write", "scope3"],
-			accounts: [
-				{ name: "Account One", id: "account-1" },
-				{ name: "Account Two", id: "account-2" },
-				{ name: "Account Three", id: "account-3" },
-			],
-		};
-
-		const { lastFrame } = render(<WhoAmI user={user}></WhoAmI>);
-
-		expect(lastFrame()).toContain(
-			"You are logged in with an OAuth Token, associated with the email 'user@example.com'!"
-		);
-		expect(lastFrame()).toMatch(/Account Name .+ Account ID/);
-		expect(lastFrame()).toMatch(/Account One .+ account-1/);
-		expect(lastFrame()).toMatch(/Account Two .+ account-2/);
-		expect(lastFrame()).toMatch(/Account Three .+ account-3/);
-		expect(lastFrame()).toContain(
-			"Token Permissions: If scopes are missing, you may need to logout and re-login."
-		);
-		expect(lastFrame()).toContain("- scope1 (read)");
-		expect(lastFrame()).toContain("- scope2 (write)");
-		expect(lastFrame()).toContain("- scope3");
-	});
-
-	// For the case where the cache hasn't updated to include the scopes array
-	it("should display the user's email and accounts, but no OAuth scopes if none provided", async () => {
-		const user: UserInfo = {
-			authType: "OAuth Token",
-			apiToken: "some-oauth-token",
-			email: "user@example.com",
-			tokenPermissions: undefined,
-			accounts: [
-				{ name: "Account One", id: "account-1" },
-				{ name: "Account Two", id: "account-2" },
-				{ name: "Account Three", id: "account-3" },
-			],
-		};
-
-		const { lastFrame } = render(<WhoAmI user={user}></WhoAmI>);
-
-		expect(lastFrame()).toContain(
-			"You are logged in with an OAuth Token, associated with the email 'user@example.com'!"
-		);
-		expect(lastFrame()).toMatch(/Account Name .+ Account ID/);
-		expect(lastFrame()).toMatch(/Account One .+ account-1/);
-		expect(lastFrame()).toMatch(/Account Two .+ account-2/);
-		expect(lastFrame()).toMatch(/Account Three .+ account-3/);
-	});
-
-	it("should display the user's email, accounts and link to view token permissions for non-OAuth tokens", async () => {
-		const user: UserInfo = {
-			authType: "API Token",
-			apiToken: "some-api-token",
-			email: "user@example.com",
-			tokenPermissions: undefined,
-			accounts: [
-				{ name: "Account One", id: "account-1" },
-				{ name: "Account Two", id: "account-2" },
-				{ name: "Account Three", id: "account-3" },
-			],
-		};
-
-		const { lastFrame } = render(<WhoAmI user={user}></WhoAmI>);
-
-		expect(lastFrame()).toContain(
-			"You are logged in with an API Token, associated with the email 'user@example.com'!"
-		);
-		expect(lastFrame()).toMatch(/Account Name .+ Account ID/);
-		expect(lastFrame()).toMatch(/Account One .+ account-1/);
-		expect(lastFrame()).toMatch(/Account Two .+ account-2/);
-		expect(lastFrame()).toMatch(/Account Three .+ account-3/);
-		expect(lastFrame()).toContain(
-			"To see token permissions visit https://dash.cloudflare.com/profile/api-tokens"
-		);
-	});
-});

package/src/api/dev.ts

@@ -3,28 +3,26 @@ import { startApiDev, startDev } from "../dev";
 import { logger } from "../logger";
 
 import type { Environment } from "../config";
-import type { EnablePagesAssetsServiceBindingOptions } from "../miniflare-cli";
+import type { EnablePagesAssetsServiceBindingOptions } from "../miniflare-cli/types";
 import type { RequestInit, Response, RequestInfo } from "undici";
 
-interface DevOptions {
-	config?: string;
-	env?: string;
-	ip?: string;
-	port?: number;
-	bundle?: boolean;
-	inspectorPort?: number;
-	localProtocol?: "http" | "https";
-	assets?: string;
-	site?: string;
-	siteInclude?: string[];
-	siteExclude?: string[];
-	nodeCompat?: boolean;
-	compatibilityDate?: string;
-	compatibilityFlags?: string[];
-	persist?: boolean;
-	persistTo?: string;
-	liveReload?: boolean;
-	watch?: boolean;
+export interface UnstableDevOptions {
+	config?: string; // Path to .toml configuration file, relative to cwd
+	env?: string; // Environment to use for operations and .env files
+	ip?: string; // IP address to listen on
+	port?: number; // Port to listen on
+	bundle?: boolean; // Set to false to skip internal build steps and directly publish script
+	inspectorPort?: number; // Port for devtools to connect to
+	localProtocol?: "http" | "https"; // Protocol to listen to requests on, defaults to http.
+	assets?: string; // Static assets to be served
+	site?: string; // Root folder of static assets for Workers Sites
+	siteInclude?: string[]; // Array of .gitignore-style patterns that match file or directory names from the sites directory. Only matched items will be uploaded.
+	siteExclude?: string[]; // Array of .gitignore-style patterns that match file or directory names from the sites directory. Matched items will not be uploaded.
+	nodeCompat?: boolean; // Enable node.js compatibility
+	compatibilityDate?: string; // Date to use for compatibility checks
+	compatibilityFlags?: string[]; // Flags to use for compatibility checks
+	persist?: boolean; // Enable persistence for local mode, using default path: .wrangler/state
+	persistTo?: string; // Specify directory to use for local persistence (implies --persist)
 	vars?: {
 		[key: string]: unknown;
 	};
@@ -44,25 +42,25 @@ interface DevOptions {
 		bucket_name: string;
 		preview_bucket_name?: string;
 	}[];
-	d1Databases?: Environment["d1_databases"];
-	showInteractiveDevSession?: boolean;
-	logLevel?: "none" | "info" | "error" | "log" | "warn" | "debug";
+	logLevel?: "none" | "info" | "error" | "log" | "warn" | "debug"; // Specify logging level  [choices: "debug", "info", "log", "warn", "error", "none"] [default: "log"]
 	logPrefix?: string;
 	inspect?: boolean;
 	local?: boolean;
-	forceLocal?: boolean;
-	enablePagesAssetsServiceBinding?: EnablePagesAssetsServiceBindingOptions;
-	_?: (string | number)[]; //yargs wants this
-	$0?: string; //yargs wants this
-	testScheduled?: boolean;
-	experimentalLocal?: boolean;
 	accountId?: string;
-	experimentalLocalRemoteKv?: boolean;
-}
-
-interface DevApiOptions {
-	testMode?: boolean;
-	disableExperimentalWarning?: boolean;
+	experimental?: {
+		d1Databases?: Environment["d1_databases"];
+		disableExperimentalWarning?: boolean; // Disables wrangler's warning when unstable APIs are used.
+		disableDevRegistry?: boolean; // Disables wrangler's support multi-worker setups. May reduce flakiness when used in tests in CI.
+		enablePagesAssetsServiceBinding?: EnablePagesAssetsServiceBindingOptions;
+		experimentalLocal?: boolean; // Use Miniflare 3 instead of Miniflare 2
+		experimentalLocalRemoteKv?: boolean;
+		forceLocal?: boolean;
+		liveReload?: boolean; // Auto reload HTML pages when change is detected in local mode
+		showInteractiveDevSession?: boolean;
+		testMode?: boolean; // This option shouldn't be used - We plan on removing it eventually
+		testScheduled?: boolean; // Test scheduled events by visiting /__scheduled in browser
+		watch?: boolean; // unstable_dev doesn't support watch-mode yet in testMode
+	};
 }
 
 export interface UnstableDevWorker {
@@ -77,11 +75,33 @@ export interface UnstableDevWorker {
  */
 export async function unstable_dev(
 	script: string,
-	options?: DevOptions,
-	apiOptions?: DevApiOptions
+	options?: UnstableDevOptions,
+	apiOptions?: unknown
 ): Promise<UnstableDevWorker> {
-	const { testMode = true, disableExperimentalWarning = false } =
-		apiOptions || {};
+	// Note that not every experimental option is passed directly through to the underlying dev API - experimental options can be used here in unstable_dev. Otherwise we could just pass experimental down to dev blindly.
+	const {
+		// there are two types of "experimental" options:
+		// 1. options to unstable_dev that we're still testing or are unsure of
+		disableDevRegistry = false,
+		disableExperimentalWarning = false,
+		forceLocal,
+		liveReload,
+		showInteractiveDevSession = false,
+		testMode = true,
+		testScheduled,
+		watch,
+		// 2. options for alpha/beta products/libs
+		d1Databases,
+		experimentalLocal,
+		experimentalLocalRemoteKv,
+		enablePagesAssetsServiceBinding,
+	} = options?.experimental ?? {};
+	if (apiOptions) {
+		logger.error(
+			"unstable_dev's third argument (apiOptions) has been deprecated in favor of an `experimental` property within the second argument (options).\nPlease update your code from:\n`await unstable_dev('...', {...}, {...});`\nto:\n`await unstable_dev('...', {..., experimental: {...}});`"
+		);
+	}
+
 	if (!disableExperimentalWarning) {
 		logger.warn(
 			`unstable_dev() is experimental\nunstable_dev()'s behaviour will likely change in future releases`
@@ -101,11 +121,20 @@ export async function unstable_dev(
 					script: script,
 					inspect: false,
 					logLevel: "none",
-					showInteractiveDevSession: false,
 					_: [],
 					$0: "",
 					port: options?.port ?? 0,
 					local: true,
+					d1Databases,
+					disableDevRegistry,
+					testScheduled,
+					experimentalLocal,
+					experimentalLocalRemoteKv,
+					enablePagesAssetsServiceBinding,
+					liveReload,
+					showInteractiveDevSession,
+					forceLocal,
+					watch,
 					...options,
 					onReady: (address, port) => {
 						readyPort = port;
@@ -147,10 +176,18 @@ export async function unstable_dev(
 				const devServer = startDev({
 					script: script,
 					inspect: false,
-					showInteractiveDevSession: false,
 					_: [],
 					$0: "",
 					local: true,
+					showInteractiveDevSession,
+					d1Databases,
+					disableDevRegistry,
+					testScheduled,
+					experimentalLocal,
+					experimentalLocalRemoteKv,
+					enablePagesAssetsServiceBinding,
+					liveReload,
+					watch,
 					...options,
 					onReady: (address, port) => {
 						readyPort = port;

package/src/api/index.ts

@@ -1,2 +1,2 @@
 export { unstable_dev } from "./dev";
-export type { UnstableDevWorker } from "./dev";
+export type { UnstableDevWorker, UnstableDevOptions } from "./dev";

package/src/cfetch/index.ts

@@ -6,8 +6,6 @@ import type { RequestInit } from "undici";
 
 // Check out https://api.cloudflare.com/ for API docs.
 
-export { getCloudflareAPIBaseURL as getCloudflareApiBaseUrl } from "./internal";
-
 export interface FetchError {
 	code: number;
 	message: string;

package/src/cfetch/internal.ts

@@ -1,7 +1,7 @@
 import assert from "node:assert";
 import { fetch, File, Headers } from "undici";
 import { version as wranglerVersion } from "../../package.json";
-import { getEnvironmentVariableFactory } from "../environment-variables";
+import { getCloudflareApiBaseUrl } from "../environment-variables/misc-variables";
 import { logger } from "../logger";
 import { ParseError, parseJSON } from "../parse";
 import { loginOrRefreshIfRequired, requireApiToken } from "../user";
@@ -9,15 +9,6 @@ import type { ApiCredentials } from "../user";
 import type { URLSearchParams } from "node:url";
 import type { RequestInit, HeadersInit, Response } from "undici";
 
-/**
- * Get the URL to use to access the Cloudflare API.
- */
-export const getCloudflareAPIBaseURL = getEnvironmentVariableFactory({
-	variableName: "CLOUDFLARE_API_BASE_URL",
-	deprecatedName: "CF_API_BASE_URL",
-	defaultValue: "https://api.cloudflare.com/client/v4",
-});
-
 /*
  * performApiFetch does everything required to make a CF API request,
  * but doesn't parse the response as JSON. For normal V4 API responses,
@@ -42,7 +33,7 @@ export async function performApiFetch(
 
 	const queryString = queryParams ? `?${queryParams.toString()}` : "";
 	logger.debug(
-		`-- START CF API REQUEST: ${method} ${getCloudflareAPIBaseURL()}${resource}${queryString}`
+		`-- START CF API REQUEST: ${method} ${getCloudflareApiBaseUrl()}${resource}${queryString}`
 	);
 	const logHeaders = cloneHeaders(headers);
 	delete logHeaders["Authorization"];
@@ -52,7 +43,7 @@ export async function performApiFetch(
 		JSON.stringify({ ...init, headers: logHeaders }, null, 2)
 	);
 	logger.debug("-- END CF API REQUEST");
-	return await fetch(`${getCloudflareAPIBaseURL()}${resource}${queryString}`, {
+	return await fetch(`${getCloudflareApiBaseUrl()}${resource}${queryString}`, {
 		method,
 		...init,
 		headers,
@@ -173,7 +164,7 @@ export async function fetchKVGetValue(
 	const auth = requireApiToken();
 	const headers: Record<string, string> = {};
 	addAuthorizationHeaderIfUnspecified(headers, auth);
-	const resource = `${getCloudflareAPIBaseURL()}/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${key}`;
+	const resource = `${getCloudflareApiBaseUrl()}/accounts/${accountId}/storage/kv/namespaces/${namespaceId}/values/${key}`;
 	const response = await fetch(resource, {
 		method: "GET",
 		headers,
@@ -206,7 +197,7 @@ export async function fetchR2Objects(
 	addAuthorizationHeaderIfUnspecified(headers, auth);
 	addUserAgent(headers);
 
-	const response = await fetch(`${getCloudflareAPIBaseURL()}${resource}`, {
+	const response = await fetch(`${getCloudflareApiBaseUrl()}${resource}`, {
 		...bodyInit,
 		headers,
 	});
@@ -233,7 +224,7 @@ export async function fetchDashboardScript(
 	addAuthorizationHeaderIfUnspecified(headers, auth);
 	addUserAgent(headers);
 
-	const response = await fetch(`${getCloudflareAPIBaseURL()}${resource}`, {
+	const response = await fetch(`${getCloudflareApiBaseUrl()}${resource}`, {
 		...bodyInit,
 		headers,
 	});

package/src/cli.ts

@@ -4,7 +4,7 @@ import { unstable_dev } from "./api";
 import { FatalError } from "./errors";
 import { main } from ".";
 
-import type { UnstableDevWorker } from "./api";
+import type { UnstableDevWorker, UnstableDevOptions } from "./api";
 /**
  * The main entrypoint for the CLI.
  * main only gets called when the script is run directly, not when it's imported as a module.
@@ -25,4 +25,4 @@ if (typeof jest === "undefined" && require.main === module) {
  * and call wrangler.unstable_dev().
  */
 export { unstable_dev };
-export type { UnstableDevWorker };
+export type { UnstableDevWorker, UnstableDevOptions };

package/src/config/validation.ts

@@ -909,7 +909,6 @@ function normalizeAndValidateEnvironment(
 
 	experimental(diagnostics, rawEnv, "unsafe");
 	experimental(diagnostics, rawEnv, "services");
-	experimental(diagnostics, rawEnv, "dispatch_namespaces");
 
 	const route = normalizeAndValidateRoute(diagnostics, topLevelEnv, rawEnv);
 
@@ -1824,7 +1823,7 @@ const validateD1Binding: ValidatorFn = (diagnostics, field, value) => {
 	}
 	if (isValid && !process.env.NO_D1_WARNING) {
 		diagnostics.warnings.push(
-			`D1 Bindings are currently in alpha to allow the API to evolve before general availability.\nPlease report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose\nNote: set NO_D1_WARNING=true to hide this message`
+			"D1 Bindings are currently in alpha to allow the API to evolve before general availability.\nPlease report any issues to https://github.com/cloudflare/wrangler2/issues/new/choose\nNote: Run this command with the environment variable NO_D1_WARNING=true to hide this message\n\nFor example: `export NO_D1_WARNING=true && wrangler <YOUR COMMAND HERE>`"
 		);
 	}
 	return isValid;

package/src/create-worker-upload-form.ts

@@ -44,7 +44,7 @@ type WorkerMetadataBinding =
 	| { type: "d1"; name: string; id: string; internalEnv?: string }
 	| { type: "service"; name: string; service: string; environment?: string }
 	| { type: "analytics_engine"; name: string; dataset?: string }
-	| { type: "namespace"; name: string; namespace: string }
+	| { type: "dispatch_namespace"; name: string; namespace: string }
 	| {
 			type: "logfwdr";
 			name: string;
@@ -161,7 +161,7 @@ export function createWorkerUploadForm(worker: CfWorkerInit): FormData {
 	bindings.dispatch_namespaces?.forEach(({ binding, namespace }) => {
 		metadataBindings.push({
 			name: binding,
-			type: "namespace",
+			type: "dispatch_namespace",
 			namespace,
 		});
 	});

package/src/d1/execute.tsx

@@ -9,11 +9,13 @@ import React from "react";
 import { fetchResult } from "../cfetch";
 import { withConfig } from "../config";
 import { getLocalPersistencePath } from "../dev/get-local-persistence-path";
-import { confirm, logDim } from "../dialogs";
+import { confirm } from "../dialogs";
 import { logger } from "../logger";
+import { readFileSync } from "../parse";
 import { readableRelative } from "../paths";
 import { requireAuth } from "../user";
 import * as options from "./options";
+import splitSqlQuery from "./splitter";
 import {
 	d1BetaWarning,
 	getDatabaseByNameOrBinding,
@@ -21,8 +23,6 @@ import {
 } from "./utils";
 import type { Config, ConfigFields, DevConfig, Environment } from "../config";
 import type { Database } from "./types";
-import type splitSqlQuery from "@databases/split-sql-query";
-import type { SQL, SQLQuery } from "@databases/sql";
 import type { Statement as StatementType } from "@miniflare/d1";
 import type { createSQLiteDB as createSQLiteDBType } from "@miniflare/shared";
 import type { Argv } from "yargs";
@@ -103,19 +103,15 @@ export async function executeSql(
 	file?: string,
 	command?: string
 ) {
-	const { parser, splitter } = await loadSqlUtils();
-
-	const sql = file
-		? parser.file(file)
-		: command
-		? parser.__dangerous__rawValue(command)
-		: null;
+	const sql = file ? readFileSync(file) : command;
 
 	if (!sql) throw new Error(`Error: must provide --command or --file.`);
 	if (persistTo && !local)
 		throw new Error(`Error: can't use --persist-to without --local`);
 
-	const queries = splitSql(splitter, sql);
+	logger.log(`🌀 Mapping SQL input into an array of statements`);
+	const queries = splitSqlQuery(sql);
+
 	if (file && sql) {
 		if (queries[0].startsWith("SQLite format 3")) {
 			//TODO: update this error to recommend using `wrangler d1 restore` when it exists
@@ -211,7 +207,7 @@ async function executeLocally(
 	const [{ Statement }, { createSQLiteDB }] =
 		await npxImport<MiniflareNpxImportTypes>(
 			["@miniflare/d1", "@miniflare/shared"],
-			logDim
+			logger.log
 		);
 
 	if (!existsSync(dbDir) && shouldPrompt) {
@@ -309,18 +305,6 @@ function logResult(r: QueryResult | QueryResult[]) {
 	);
 }
 
-function splitSql(splitter: (query: SQLQuery) => SQLQuery[], sql: SQLQuery) {
-	// We have no interpolations, so convert everything to text
-	logger.log(`🌀 Mapping SQL input into an array of statements`);
-	return splitter(sql).map(
-		(q) =>
-			q.format({
-				escapeIdentifier: (_) => "",
-				formatValue: (_, __) => ({ placeholder: "", value: "" }),
-			}).text
-	);
-}
-
 function batchSplit(queries: string[]) {
 	logger.log(`🌀 Parsing ${queries.length} statements`);
 	const num_batches = Math.ceil(queries.length / QUERY_LIMIT);
@@ -337,16 +321,3 @@ function batchSplit(queries: string[]) {
 	}
 	return batches;
 }
-
-async function loadSqlUtils() {
-	const [
-		{ default: parser },
-		{
-			// No idea why this is doubly-nested, see https://github.com/ForbesLindesay/atdatabases/issues/255
-			default: { default: splitter },
-		},
-	] = await npxImport<
-		[{ default: SQL }, { default: { default: typeof splitSqlQuery } }]
-	>(["@databases/sql@3.2.0", "@databases/split-sql-query@1.0.3"], logDim);
-	return { parser, splitter };
-}

package/src/d1/migrations/apply.tsx

@@ -1,3 +1,4 @@
+import assert from "node:assert";
 import fs from "node:fs";
 import path from "path";
 import { Box, render, Text } from "ink";
@@ -10,6 +11,7 @@ import isInteractive from "../../is-interactive";
 import { logger } from "../../logger";
 import { requireAuth } from "../../user";
 import { createBackup } from "../backups";
+import { DEFAULT_MIGRATION_PATH, DEFAULT_MIGRATION_TABLE } from "../constants";
 import { executeSql } from "../execute";
 import { d1BetaWarning, getDatabaseInfoFromConfig } from "../utils";
 import {
@@ -28,11 +30,10 @@ export function ApplyOptions(yargs: Argv): Argv<BaseSqlExecuteArgs> {
 
 export const ApplyHandler = withConfig<BaseSqlExecuteArgs>(
 	async ({ config, database, local, persistTo }): Promise<void> => {
-		const accountId = await requireAuth({});
 		logger.log(d1BetaWarning);
 
 		const databaseInfo = await getDatabaseInfoFromConfig(config, database);
-		if (!databaseInfo) {
+		if (!databaseInfo && !local) {
 			throw new Error(
 				`Can't find a DB with name/binding '${database}' in local config. Check info in wrangler.toml...`
 			);
@@ -44,11 +45,14 @@ export const ApplyHandler = withConfig<BaseSqlExecuteArgs>(
 
 		const migrationsPath = await getMigrationsPath(
 			path.dirname(config.configPath),
-			databaseInfo.migrationsFolderPath,
+			databaseInfo?.migrationsFolderPath ?? DEFAULT_MIGRATION_PATH,
 			false
 		);
+
+		const migrationTableName =
+			databaseInfo?.migrationsTableName ?? DEFAULT_MIGRATION_TABLE;
 		await initMigrationsTable(
-			databaseInfo.migrationsTableName,
+			migrationTableName,
 			local,
 			config,
 			database,
@@ -57,7 +61,7 @@ export const ApplyHandler = withConfig<BaseSqlExecuteArgs>(
 
 		const unappliedMigrations = (
 			await getUnappliedMigrations(
-				databaseInfo.migrationsTableName,
+				migrationTableName,
 				migrationsPath,
 				local,
 				config,
@@ -89,22 +93,26 @@ export const ApplyHandler = withConfig<BaseSqlExecuteArgs>(
 			render(<Text>✅ No migrations to apply!</Text>);
 			return;
 		}
-
-		if (isInteractive() && !CI.isCI()) {
-			const ok = await confirm(
-				`About to apply ${unappliedMigrations.length} migration(s)\n` +
-					"Your database may not be available to serve requests during the migration, continue?",
-				<Box flexDirection="column">
-					<Text>Migrations to be applied:</Text>
-					<Table data={unappliedMigrations} columns={["Name"]}></Table>
-				</Box>
-			);
-			if (!ok) return;
-		}
+		render(
+			<Box flexDirection="column">
+				<Text>Migrations to be applied:</Text>
+				<Table data={unappliedMigrations} columns={["Name"]}></Table>
+			</Box>
+		);
+		const ok = await confirm(
+			`About to apply ${unappliedMigrations.length} migration(s)
+Your database may not be available to serve requests during the migration, continue?`
+		);
+		if (!ok) return;
 
 		// don't backup prod db when applying migrations locally
 		if (!local) {
+			assert(
+				databaseInfo,
+				"In non-local mode `databaseInfo` should be defined."
+			);
 			render(<Text>🕒 Creating backup...</Text>);
+			const accountId = await requireAuth({});
 			await createBackup(accountId, databaseInfo.uuid);
 		}
 
@@ -114,7 +122,7 @@ export const ApplyHandler = withConfig<BaseSqlExecuteArgs>(
 				"utf8"
 			);
 			query += `
-								INSERT INTO ${databaseInfo.migrationsTableName} (name)
+								INSERT INTO ${migrationTableName} (name)
 								values ('${migration.Name}');
 						`;
 
@@ -154,7 +162,9 @@ export const ApplyHandler = withConfig<BaseSqlExecuteArgs>(
 				const err = e as ParseError;
 
 				success = false;
-				errorNotes = err.notes.map((msg) => msg.text);
+				errorNotes = err.notes?.map((msg) => msg.text) ?? [
+					err.message ?? err.toString(),
+				];
 			}
 
 			migration.Status = success ? "✅" : "❌";