@@ -8,7 +8,7 @@ use tablepro_account::{AccountSettings, RefreshTokenVault};
88use tablepro_core:: credentials:: { CredentialInteraction , CredentialPrompter , SecretItems , SecretKind , SecretVault } ;
99use tablepro_core:: {
1010 ConnectEnvironment , Credentials , DatabaseDriver , DriverError , DriverRegistry , FileEndpoint , LivenessPolicy ,
11- SafeModeLevel , WorkspaceSettings ,
11+ SafeModeLevel , UnsupportedFeature , WorkspaceSettings ,
1212} ;
1313use tablepro_session:: runtime:: Tasks ;
1414use tablepro_session:: {
@@ -177,9 +177,11 @@ impl Core {
177177 }
178178
179179 // Typed secrets come first, then Credential Manager; `keep` is stored once it logs in; no prompter, no SSH asks.
180+ // `database`, in place of the saved one, opens the connection in another of the server's databases.
180181 pub async fn connect_saved (
181182 & self ,
182183 id : String ,
184+ database : Option < String > ,
183185 secrets : ConnectionSecrets ,
184186 keep : ConnectionSecrets ,
185187 prompter : Option < Box < dyn HostPrompter > > ,
@@ -215,8 +217,17 @@ impl Core {
215217 CredentialDemand :: default ( ) ,
216218 )
217219 . await ?;
220+ let request = match database. as_deref ( ) . filter ( |name| !name. is_empty ( ) ) {
221+ Some ( database) => refreshed
222+ . request
223+ . in_database ( database)
224+ . ok_or ( DriverError :: Unsupported {
225+ feature : UnsupportedFeature :: NetworkConnection ,
226+ } ) ?,
227+ None => refreshed. request ,
228+ } ;
218229 let pending = connector
219- . establish ( refreshed . request , interaction ( prompter. as_ref ( ) ) , cancel. clone ( ) )
230+ . establish ( request, interaction ( prompter. as_ref ( ) ) , cancel. clone ( ) )
220231 . await ?;
221232 if cancel. is_cancelled ( ) {
222233 let report = pending. discard ( ) . await ;
@@ -657,7 +668,14 @@ mod tests {
657668 } ;
658669
659670 let connect = core
660- . connect_saved ( stored. id . to_string ( ) , typed ( ) , ConnectionSecrets :: default ( ) , None , None )
671+ . connect_saved (
672+ stored. id . to_string ( ) ,
673+ None ,
674+ typed ( ) ,
675+ ConnectionSecrets :: default ( ) ,
676+ None ,
677+ None ,
678+ )
661679 . await
662680 . unwrap_err ( ) ;
663681 let test = core
0 commit comments