@@ -82,31 +82,33 @@ internal final class MainSplitViewController: NSSplitViewController, InspectorVi
8282 }
8383
8484 static func resolveDefaultSubtitle( tab: QueryTab ? , connection: DatabaseConnection ) -> String {
85- guard let tab, tab. tabType == . table,
86- let tableName = tab. tableContext. tableName, !tableName. isEmpty else {
87- return connection. name
88- }
89- return tableSubtitle (
90- databaseName: tab. tableContext. databaseName,
91- schemaName: tab. tableContext. schemaName,
85+ tableSubtitle (
86+ isTable: tab? . tabType == . table,
87+ tableName: tab? . tableContext. tableName,
88+ databaseName: tab? . tableContext. databaseName ?? " " ,
89+ schemaName: tab? . tableContext. schemaName,
9290 fallback: connection. name
9391 )
9492 }
9593
9694 static func resolveDefaultSubtitle( payload: EditorTabPayload ? , connection: DatabaseConnection ) -> String {
97- guard let payload, payload. tabType == . table,
98- let tableName = payload. tableName, !tableName. isEmpty else {
99- return connection. name
100- }
101- return tableSubtitle (
102- databaseName: payload. databaseName ?? " " ,
103- schemaName: payload. schemaName,
95+ tableSubtitle (
96+ isTable: payload? . tabType == . table,
97+ tableName: payload? . tableName,
98+ databaseName: payload? . databaseName ?? " " ,
99+ schemaName: payload? . schemaName,
104100 fallback: connection. name
105101 )
106102 }
107103
108- private static func tableSubtitle( databaseName: String , schemaName: String ? , fallback: String ) -> String {
109- guard !databaseName. isEmpty else { return fallback }
104+ private static func tableSubtitle(
105+ isTable: Bool ,
106+ tableName: String ? ,
107+ databaseName: String ,
108+ schemaName: String ? ,
109+ fallback: String
110+ ) -> String {
111+ guard isTable, let tableName, !tableName. isEmpty, !databaseName. isEmpty else { return fallback }
110112 if let schemaName, !schemaName. isEmpty {
111113 return " \( databaseName) · \( schemaName) "
112114 }
0 commit comments