Skip to content

Commit 4b812a8

Browse files
authored
Merge pull request #1665 from jumpserver/pr@dev@fix_tableedit_save_error
fix(chen): show SQL error on save failure
2 parents da0370e + 49cb232 commit 4b812a8

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

‎ui/chen/types/dataView.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ export interface ChenSaveChangesResultBase {
8080
success: boolean;
8181
allowed?: boolean;
8282
reason?: string;
83+
message?: string;
8384
failedChangeIndex?: number | null;
8485
dataView?: string;
8586
schema?: string;

‎ui/chen/workspaces/DatabaseSessionSurface.vue‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -728,10 +728,10 @@ function confirmDiscardChanges() {
728728
}
729729
730730
function resultFailureDescription(
731-
result: { reason?: string; failedChangeIndex?: number | null } | null,
731+
result: { reason?: string; message?: string; failedChangeIndex?: number | null } | null,
732732
fallback: string
733733
) {
734-
const reason = result?.reason || fallback;
734+
const reason = result?.message?.trim() || result?.reason || fallback;
735735
return result?.failedChangeIndex == null ? reason : `${reason}, failedChangeIndex=${result.failedChangeIndex}`;
736736
}
737737

0 commit comments

Comments
 (0)