Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Plugins/OracleDriverPlugin/OracleConnection.swift
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,8 @@ final class OracleConnectionWrapper: @unchecked Sendable {
throw OracleError(message: detail)
} catch let error as OracleError {
throw error
} catch is CancellationError {
throw CancellationError()
} catch {
throw OracleError(message: "Query execution failed: \(String(describing: error))")
}
Expand Down
3 changes: 3 additions & 0 deletions TablePro/ViewModels/SidebarViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ final class SidebarViewModel {
// MARK: - Table Loading

func loadTables(force: Bool = false) {
loadTask?.cancel()
guard !isLoading else { return }
isLoading = true
errorMessage = nil
Expand Down Expand Up @@ -230,6 +231,8 @@ final class SidebarViewModel {
}
}
isLoading = false
} catch is CancellationError {
isLoading = false
} catch {
errorMessage = error.localizedDescription
isLoading = false
Expand Down
3 changes: 3 additions & 0 deletions TablePro/Views/Toolbar/ConnectionStatusView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ struct ConnectionStatusView: View {
Text(formattedDatabaseInfo)
.font(.system(size: ThemeEngine.shared.activeTheme.typography.small, weight: .regular, design: .monospaced))
.foregroundStyle(ThemeEngine.shared.colors.toolbar.secondaryTextSwiftUI)
.lineLimit(1)
.truncationMode(.middle)
.frame(maxWidth: 280)
.accessibilityLabel(
String(localized: "Database type: \(formattedDatabaseInfo)")
)
Expand Down
Loading