@@ -79,7 +79,8 @@ final class ConnectionSessionModel {
7979 @ ObservationIgnored private var placementEpoch = 0
8080 @ ObservationIgnored private var switchesInFlight = 0
8181 @ ObservationIgnored private var placementRestored = false
82- @ ObservationIgnored private var rememberedDatabaseHung = false
82+ // Why the last dial into the remembered database failed with no fallback; the next open starts from the saved one.
83+ @ ObservationIgnored private var rememberedDialFailure : ( any Error ) ?
8384 @ ObservationIgnored private var scenes : [ WeakScene ] = [ ]
8485
8586 private let appState : AppState
@@ -136,6 +137,11 @@ final class ConnectionSessionModel {
136137 record . type == . postgresql || record . type == . redshift
137138 }
138139
140+ // MySQL, MariaDB and TiDB sign in apart from the database; SQL Server signs contained users in to the named one.
141+ private var dialsRememberedDatabase : Bool {
142+ redialsToSwitchDatabase || record . type == . mysql || record . type == . mariadb || record . type == . tidb
143+ }
144+
139145 func adopt ( _ record : DatabaseConnection ) {
140146 guard record . id == self . record . id , record != self . record else { return }
141147 self . record = record
@@ -271,6 +277,10 @@ final class ConnectionSessionModel {
271277 // The record changed how it dials, so the next window opens it again.
272278 func reset ( ) {
273279 let attempt = state . attempt
280+ // What failed was the old record's dial.
281+ if ! redialsToSwitchDatabase {
282+ rememberedDialFailure = nil
283+ }
274284 enter ( . cancel )
275285 if attempt ? . purpose == . open { attempt ? . task ? . cancel ( ) }
276286 leaveDial ( )
@@ -320,34 +330,43 @@ final class ConnectionSessionModel {
320330 do {
321331 let saved = record
322332 // A remembered database that never answered may hang again, so the next open starts from the saved one and
323- // switches after, as opens did before.
324- let target = rememberedDatabaseHung ? record : openTarget ( restoring : wanted )
325- rememberedDatabaseHung = false
333+ // switches after, as opens did before. A USE engine does so after any failure it could not fall back from.
334+ let failedBefore = rememberedDialFailure
335+ rememberedDialFailure = nil
336+ let target = failedBefore == nil ? openTarget ( restoring : wanted ) : record
326337 let landed : OpenLanding
327338 var restoring = wanted
328339 var refused : RefusedDatabase ?
340+ // The saved database's list then says whether the remembered one is gone, as after a refused dial.
341+ if let failedBefore , ! redialsToSwitchDatabase , ! wanted . database . isEmpty , wanted . database != saved . database {
342+ refused = RefusedDatabase ( name : wanted . database , error : failedBefore , reportedBySwitch : true )
343+ }
329344 do {
330345 landed = try await dialForOpen (
331346 target , schema : schemaRestored ( by : target , restoring : wanted ) , by : attempt , joining : allowSignIn
332347 )
333348 } catch let thrown {
334349 let listRefused = thrown as? TableListRefused
335350 let error = listRefused ? . error ?? thrown
336- if target . database != saved . database , case PostgreSQLError . unreachable = error {
337- rememberedDatabaseHung = true
351+ if target . database != saved . database ,
352+ startsNextOpenFromSaved ( after : error , listRefused : listRefused != nil , by : attempt ) {
353+ rememberedDialFailure = error
338354 }
339355 // A sign-in is the connection's, not the database's: the saved database would fail the same way.
340356 guard target . database != saved . database , isCurrent ( attempt ) ,
341- listRefused != nil || Self . mayBlameDatabase ( error ) ,
357+ listRefused != nil || blamesDatabase ( error ) ,
342358 SignInOffer . method ( for : error , connection : saved , secureStore : appState . secureStore ) == nil
343359 else { throw error }
344360 Self . logger . warning ( " Failed to open remembered database \( target . database , privacy : . private ( mask : . hash ) ) : \( LogRedaction . publicDescription ( of : error ) , privacy : . public ) \( error . localizedDescription , privacy : . private ) " )
345361 // A dial that landed and then refused its table list leaves a session to tear down first.
346362 await appState . connectionManager . disconnect ( connectionId )
347363 guard isCurrent ( attempt ) else { return }
348364 landed = try await dialForOpen ( saved , schema : nil , by : attempt , joining : false )
349- restoring . database = saved . database
350- refused = RefusedDatabase ( name : target . database , error : error )
365+ // A USE engine still moves there with USE, which says why it fails, as its open always did.
366+ if redialsToSwitchDatabase {
367+ restoring . database = saved . database
368+ }
369+ refused = RefusedDatabase ( name : target . database , error : error , reportedBySwitch : ! redialsToSwitchDatabase )
351370 }
352371 guard isCurrent ( attempt ) else { return }
353372 let newSession = landed . outcome . session
@@ -391,11 +410,9 @@ final class ConnectionSessionModel {
391410 }
392411 }
393412
394- // Where the connection was, so the first table list is already the right one. Only PostgreSQL and Redshift, which
395- // need a second connection to change database. The others dial the saved one and move with USE, as before, so their
396- // refusals, which the app cannot always tell apart from a failed sign-in, never decide between two dials.
413+ // Where the connection was, so the first table list is already the right one.
397414 private func openTarget ( restoring wanted : Placement ) -> DatabaseConnection {
398- guard redialsToSwitchDatabase , ! wanted . database . isEmpty else { return record }
415+ guard dialsRememberedDatabase , ! wanted . database . isEmpty else { return record }
399416 var target = record
400417 target . database = wanted . database
401418 return target
@@ -419,6 +436,8 @@ final class ConnectionSessionModel {
419436 private struct RefusedDatabase {
420437 let name : String
421438 let error : any Error
439+ // The open's own USE tried it again and said why that failed.
440+ let reportedBySwitch : Bool
422441 }
423442
424443 nonisolated private struct TableListRefused : Error {
@@ -440,6 +459,22 @@ final class ConnectionSessionModel {
440459 return ! notAboutTheDatabase . contains { message . contains ( $0 ) }
441460 }
442461
462+ // The MySQL driver types a refused database by its code.
463+ private func blamesDatabase ( _ error : any Error ) -> Bool {
464+ if redialsToSwitchDatabase { return Self . mayBlameDatabase ( error ) }
465+ if case MySQLError . databaseRefused = error { return true }
466+ return false
467+ }
468+
469+ // A USE engine's other failure may still be the database's on a server that numbers it its own way.
470+ private func startsNextOpenFromSaved ( after error : any Error , listRefused : Bool , by attempt : ConnectionAttempt ) -> Bool {
471+ if redialsToSwitchDatabase {
472+ if case PostgreSQLError . unreachable = error { return true }
473+ return false
474+ }
475+ return isCurrent ( attempt ) && ! listRefused && ! blamesDatabase ( error ) && ! ( error is CancellationError )
476+ }
477+
443478 private nonisolated static let notAboutTheDatabase = [
444479 " password authentication failed " , " authentication failed " , " fe_sendauth " , " no password supplied " ,
445480 " could not connect " , " connection refused " , " timeout expired " , " timed out " , " could not translate host name " ,
@@ -502,6 +537,7 @@ final class ConnectionSessionModel {
502537 reportingTo scene : ConnectionCoordinator ?
503538 ) {
504539 guard let listed , ! listed . contains ( refused . name ) else {
540+ guard ! refused . reportedBySwitch else { return }
505541 scene ? . presentFailure (
506542 title : ConnectionCoordinator . switchDatabaseFailedTitle ,
507543 message : classify ( refused . error , operation : " switchDatabase " ) . message
0 commit comments