diff --git a/crates/matrix-sdk-sqlite/src/crypto_store.rs b/crates/matrix-sdk-sqlite/src/crypto_store.rs index 7f3d68c6f..4f28b4812 100644 --- a/crates/matrix-sdk-sqlite/src/crypto_store.rs +++ b/crates/matrix-sdk-sqlite/src/crypto_store.rs @@ -188,7 +188,7 @@ impl SqliteCryptoStore { self.static_account.read().unwrap().clone() } - async fn acquire(&self) -> Result { + async fn acquire(&self) -> Result { Ok(self.pool.get().await?) } } @@ -674,7 +674,7 @@ trait SqliteObjectCryptoStoreExt: SqliteObjectExt { } #[async_trait] -impl SqliteObjectCryptoStoreExt for deadpool_sqlite::Object {} +impl SqliteObjectCryptoStoreExt for SqliteConn {} #[async_trait] impl CryptoStore for SqliteCryptoStore { diff --git a/crates/matrix-sdk-sqlite/src/event_cache_store.rs b/crates/matrix-sdk-sqlite/src/event_cache_store.rs index 73366d1a6..e59c1d902 100644 --- a/crates/matrix-sdk-sqlite/src/event_cache_store.rs +++ b/crates/matrix-sdk-sqlite/src/event_cache_store.rs @@ -138,7 +138,7 @@ impl SqliteEventCacheStore { } } - async fn acquire(&self) -> Result { + async fn acquire(&self) -> Result { Ok(self.pool.get().await?) } } @@ -212,7 +212,7 @@ trait SqliteObjectEventCacheStoreExt: SqliteObjectExt { } #[async_trait] -impl SqliteObjectEventCacheStoreExt for deadpool_sqlite::Object {} +impl SqliteObjectEventCacheStoreExt for SqliteConn {} #[async_trait] impl EventCacheStore for SqliteEventCacheStore { diff --git a/crates/matrix-sdk-sqlite/src/state_store.rs b/crates/matrix-sdk-sqlite/src/state_store.rs index 4b209e7c4..9f41fdf1d 100644 --- a/crates/matrix-sdk-sqlite/src/state_store.rs +++ b/crates/matrix-sdk-sqlite/src/state_store.rs @@ -351,7 +351,7 @@ impl SqliteStateStore { self.encode_key(keys::KV_BLOB, full_key) } - async fn acquire(&self) -> Result { + async fn acquire(&self) -> Result { Ok(self.pool.get().await?) } @@ -901,7 +901,7 @@ trait SqliteObjectStateStoreExt: SqliteObjectExt { } #[async_trait] -impl SqliteObjectStateStoreExt for deadpool_sqlite::Object { +impl SqliteObjectStateStoreExt for SqliteConn { async fn set_kv_blob(&self, key: Key, value: Vec) -> Result<()> { Ok(self.interact(move |conn| conn.set_kv_blob(&key, &value)).await.unwrap()?) } diff --git a/crates/matrix-sdk-sqlite/src/utils.rs b/crates/matrix-sdk-sqlite/src/utils.rs index 5e030aa09..5df49004a 100644 --- a/crates/matrix-sdk-sqlite/src/utils.rs +++ b/crates/matrix-sdk-sqlite/src/utils.rs @@ -16,6 +16,7 @@ use core::fmt; use std::{borrow::Borrow, cmp::min, future::Future, iter, ops::Deref}; use async_trait::async_trait; +use deadpool_sqlite::Object as SqliteConn; use itertools::Itertools; use rusqlite::{limits::Limit, OptionalExtension, Params, Row, Statement, Transaction}; @@ -106,7 +107,7 @@ pub(crate) trait SqliteObjectExt { } #[async_trait] -impl SqliteObjectExt for deadpool_sqlite::Object { +impl SqliteObjectExt for SqliteConn { async fn execute

( &self, sql: impl AsRef + Send + 'static, @@ -245,7 +246,7 @@ pub(crate) trait SqliteObjectStoreExt: SqliteObjectExt { } #[async_trait] -impl SqliteObjectStoreExt for deadpool_sqlite::Object { +impl SqliteObjectStoreExt for SqliteConn { async fn set_kv(&self, key: &str, value: Vec) -> rusqlite::Result<()> { let key = key.to_owned(); self.interact(move |conn| conn.set_kv(&key, &value)).await.unwrap()?; @@ -255,7 +256,7 @@ impl SqliteObjectStoreExt for deadpool_sqlite::Object { } /// Load the version of the database with the given connection. -pub(crate) async fn load_db_version(conn: &deadpool_sqlite::Object) -> Result { +pub(crate) async fn load_db_version(conn: &SqliteConn) -> Result { let kv_exists = conn .query_row( "SELECT count(*) FROM sqlite_master WHERE type = 'table' AND name = 'kv'",