Skip to content

Commit 138e6cc

Browse files
authored
Merge pull request #593 from TableProApp/fix/alert-loop-on-query-failure
fix: prevent infinite alert loop when table tab query fails
2 parents 51d0647 + 7498571 commit 138e6cc

File tree

3 files changed

+3
-0
lines changed

3 files changed

+3
-0
lines changed

TablePro/Views/Main/Extensions/MainContentCoordinator+QueryHelpers.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -392,6 +392,7 @@ extension MainContentCoordinator {
392392
var errTab = tabManager.tabs[idx]
393393
errTab.errorMessage = error.localizedDescription
394394
errTab.isExecuting = false
395+
errTab.lastExecutedAt = Date()
395396
tabManager.tabs[idx] = errTab
396397
}
397398
toolbarState.setExecuting(false)

TablePro/Views/Main/Extensions/MainContentCoordinator+TabSwitch.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ extension MainContentCoordinator {
108108
let needsLazyQuery = newTab.tabType == .table
109109
&& (newTab.resultRows.isEmpty || isEvicted)
110110
&& (newTab.lastExecutedAt == nil || isEvicted)
111+
&& newTab.errorMessage == nil
111112
&& !newTab.query.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
112113

113114
if needsLazyQuery {

TablePro/Views/Main/MainContentView.swift

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -326,6 +326,7 @@ struct MainContentView: View {
326326
tab.tabType == .table
327327
&& (tab.resultRows.isEmpty || tab.rowBuffer.isEvicted)
328328
&& (tab.lastExecutedAt == nil || tab.rowBuffer.isEvicted)
329+
&& tab.errorMessage == nil
329330
&& !tab.query.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty
330331
} ?? false
331332
if needsLazyLoad && !hasPendingEdits && isConnected {

0 commit comments

Comments
 (0)