Skip to content

Commit ab0c79d

Browse files
committed
Fix compilation issue after rebase with main
1 parent 4d86088 commit ab0c79d

File tree

2 files changed

+10
-4
lines changed

2 files changed

+10
-4
lines changed

lib/src/query.rs

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ impl Query {
117117
query,
118118
operation,
119119
fetch_size,
120+
db,
120121
}
121122
}
122123

@@ -233,6 +234,7 @@ pub(crate) struct RetryableQuery<'a> {
233234
query: Query,
234235
operation: Operation,
235236
fetch_size: Option<usize>,
237+
db: Option<Database>,
236238
}
237239

238240
impl<'a> RetryableQuery<'a> {
@@ -270,7 +272,10 @@ impl<'a> RetryableQuery<'a> {
270272

271273
async fn connect(&self) -> QueryResult<ManagedConnection> {
272274
// an error when retrieving a connection is considered permanent
273-
self.pool.get(Some(self.operation)).await.map_err(Retry::No)
275+
self.pool
276+
.get(Some(self.operation), self.db.clone())
277+
.await
278+
.map_err(Retry::No)
274279
}
275280
}
276281

lib/src/routing/connection_registry.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -557,9 +557,10 @@ mod tests {
557557

558558
let _ = registry.servers(Some("db1".into())); // ensure db1 is initialized
559559
let _ = registry.servers(Some("db2".into())); // ensure db2 is initialized
560-
let ttl = refresh_all_routing_tables(config.clone(), registry.clone(), provider.clone(), &[])
561-
.await
562-
.unwrap();
560+
let ttl =
561+
refresh_all_routing_tables(config.clone(), registry.clone(), provider.clone(), &[])
562+
.await
563+
.unwrap();
563564

564565
let servers = registry.servers(Some("db1".into()));
565566
assert_eq!(ttl, 200); // must be the min of both

0 commit comments

Comments
 (0)