diff --git a/frontend/src/lib/components/DBManager.svelte b/frontend/src/lib/components/DBManager.svelte index 73689f6444..35bd88abec 100644 --- a/frontend/src/lib/components/DBManager.svelte +++ b/frontend/src/lib/components/DBManager.svelte @@ -370,7 +370,7 @@ refresh?.() sendUserToast(`Schema '${schemaKey}' deleted successfully`) } catch (e) { - let msg: string | undefined = (e as Error).message + let msg: string | undefined = (e as any).body ?? (e as Error).message if (typeof msg !== 'string') msg = e ? JSON.stringify(e) : undefined sendUserToast(msg ?? 'Action failed!', true) } @@ -436,7 +436,7 @@ refresh?.() sendUserToast(`Table '${tableKey}' deleted successfully`) } catch (e) { - let msg: string | undefined = (e as Error).message + let msg: string | undefined = (e as any).body ?? (e as Error).message if (typeof msg !== 'string') msg = e ? JSON.stringify(e) : undefined sendUserToast(msg ?? 'Action failed!', true) } @@ -502,7 +502,7 @@ refresh?.() sendUserToast(`Table '${tableKey}' deleted successfully`) } catch (e) { - let msg: string | undefined = (e as Error).message + let msg: string | undefined = (e as any).body ?? (e as Error).message if (typeof msg !== 'string') msg = e ? JSON.stringify(e) : undefined sendUserToast(msg ?? 'Action failed!', true) } diff --git a/frontend/src/lib/components/DBTableEditor.svelte b/frontend/src/lib/components/DBTableEditor.svelte index 6b6efca289..27d5eb6d0a 100644 --- a/frontend/src/lib/components/DBTableEditor.svelte +++ b/frontend/src/lib/components/DBTableEditor.svelte @@ -460,7 +460,7 @@ askingForConfirmation && (askingForConfirmation.loading = true) await onConfirm({ values }) } catch (e) { - let msg: string | undefined = (e as Error)?.message + let msg: string | undefined = (e as any)?.body ?? (e as Error)?.message if (typeof msg !== 'string') msg = e ? JSON.stringify(e) : 'An error occurred' sendUserToast(msg, true) } @@ -472,7 +472,7 @@ ...(preview && { codeContent: preview.sql, alert: preview.alert }) } } catch (e) { - let msg: string | undefined = (e as Error)?.message + let msg: string | undefined = (e as any)?.body ?? (e as Error)?.message if (typeof msg !== 'string') msg = e ? JSON.stringify(e) : 'An error occurred' sendUserToast(msg, true) } finally { diff --git a/frontend/src/lib/components/SqlRepl.svelte b/frontend/src/lib/components/SqlRepl.svelte index a7c32ee606..6c8d90ba15 100644 --- a/frontend/src/lib/components/SqlRepl.svelte +++ b/frontend/src/lib/components/SqlRepl.svelte @@ -135,7 +135,10 @@ isRunning = false return await run({ doPostgresRowToJsonFix: true }) } - sendUserToast('Error running query: ' + (e.message ?? e.error.message), true) + sendUserToast( + 'Error running query: ' + (e?.body ?? e?.message ?? e?.error?.message ?? e), + true + ) } finally { isRunning = false }