From ee9b161c6b59fdd02ff681138c77013937030985 Mon Sep 17 00:00:00 2001
From: Max Rozen <3822106+rozenmd@users.noreply.github.com>
Date: Tue, 30 Jan 2024 17:21:31 +0100
Subject: [PATCH] fix: add light parsing on d1 execute error message

---
 packages/wrangler/src/d1/execute.tsx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/wrangler/src/d1/execute.tsx b/packages/wrangler/src/d1/execute.tsx
index 242bb5278fec5..244afa3bd8dd5 100644
--- a/packages/wrangler/src/d1/execute.tsx
+++ b/packages/wrangler/src/d1/execute.tsx
@@ -150,12 +150,17 @@ export const Handler = async (args: HandlerOptions): Promise<void> => {
 			logger.loggerLevel = existingLogLevel;
 			logger.log(JSON.stringify(response, null, 2));
 		}
-	} catch (e) {
+	} catch (error) {
 		if (json) {
 			logger.loggerLevel = existingLogLevel;
-			logger.log(JSON.stringify({ error: e }, null, 2));
+			const messageToDisplay =
+				(error as Error).name === "APIError"
+					? error
+					: { text: (error as Error).message };
+			logger.log(JSON.stringify({ error: messageToDisplay }, null, 2));
+			process.exit(1);
 		} else {
-			throw e;
+			throw error;
 		}
 	}
 };