Skip to content

Commit 7aac642

Browse files
Merge pull request #386 from pohlm01/quick-fix-sqlx-compilation-error
Update sqlx to 0.8.5
2 parents 328baf3 + 4ad741a commit 7aac642

4 files changed

Lines changed: 19 additions & 27 deletions

File tree

Cargo.lock

Lines changed: 16 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

askar-storage/src/backend/db_utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ pub trait ExtDatabase: Database {
228228
conn: &mut Connection<Self>,
229229
_nested: bool,
230230
) -> BoxFuture<'_, Result<(), SqlxError>> {
231-
<Self as Database>::TransactionManager::begin(conn)
231+
<Self as Database>::TransactionManager::begin(conn, None)
232232
}
233233
}
234234

askar-storage/src/backend/postgres/test_db.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl TestDB {
5050
// connections are being closed, in case postgres is near the
5151
// configured connection limit.
5252
let mut lock_txn = conn_pool.acquire().await?.detach();
53-
<Postgres as Database>::TransactionManager::begin(&mut lock_txn).await?;
53+
<Postgres as Database>::TransactionManager::begin(&mut lock_txn, None).await?;
5454
if sqlx::query_scalar("SELECT pg_try_advisory_xact_lock(99999)")
5555
.fetch_one(&mut lock_txn)
5656
.await?

askar-storage/src/backend/sqlite/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -601,7 +601,7 @@ impl ExtDatabase for Sqlite {
601601
// no good way to start an immediate transaction with sqlx. Without this
602602
// adjustment, updates will run into 'database is locked' errors.
603603
Box::pin(async move {
604-
<Sqlite as Database>::TransactionManager::begin(conn).await?;
604+
<Sqlite as Database>::TransactionManager::begin(conn, None).await?;
605605
if !nested {
606606
// a no-op write transaction
607607
sqlx::query("DELETE FROM config WHERE 0")

0 commit comments

Comments
 (0)