sqlx lifetimes issue

matthiasdebernardini · Aug 16, 2024 · 857c03c · 857c03c
1 parent 295b979
commit 857c03c
Show file tree

Hide file tree

Showing 11 changed files with 695 additions and 3 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,6 +16,7 @@ members = [
     "example-crates/wallet_electrum",
     "example-crates/wallet_esplora_blocking",
     "example-crates/wallet_esplora_async",
+    "example-crates/wallet_esplora_async_sqlx",
     "example-crates/wallet_rpc",
 ]
 

diff --git a/crates/chain/Cargo.toml b/crates/chain/Cargo.toml
@@ -23,6 +23,7 @@ miniscript = { version = "12.0.0", optional = true, default-features = false }
 # Feature dependencies
 rusqlite = { version = "0.31.0", features = ["bundled"], optional = true }
 serde_json = {version = "1", optional = true }
+sqlx = { version = "0.8.0", default-features = false, features = ["runtime-tokio-rustls", "postgres", "json", "chrono", "uuid", "sqlx-macros", "migrate"], optional= true }
 
 [dev-dependencies]
 rand = "0.8"
@@ -33,3 +34,4 @@ default = ["std", "miniscript"]
 std = ["bitcoin/std", "miniscript?/std"]
 serde = ["dep:serde", "bitcoin/serde", "miniscript?/serde"]
 rusqlite = ["std", "dep:rusqlite", "serde", "serde_json"]
+sqlx = ["std", "dep:sqlx", "serde", "serde_json"]
diff --git a/crates/chain/src/lib.rs b/crates/chain/src/lib.rs
@@ -57,13 +57,17 @@ pub use indexer::keychain_txout;
 pub use spk_iter::*;
 #[cfg(feature = "rusqlite")]
 pub mod rusqlite_impl;
+#[cfg(feature = "sqlx")]
+pub mod sqlx_impl;
 pub mod spk_client;
 
 #[allow(unused_imports)]
 #[macro_use]
 extern crate alloc;
 #[cfg(feature = "rusqlite")]
 pub extern crate rusqlite;
+#[cfg(feature = "sqlx")]
+pub extern crate sqlx;
 #[cfg(feature = "serde")]
 pub extern crate serde;
 

diff --git a/crates/chain/src/persist.rs b/crates/chain/src/persist.rs
@@ -45,7 +45,7 @@ pub trait PersistWith<Db>: Staged + Sized {
     ) -> Result<(), Self::PersistError>;
 }
 
-type FutureResult<'a, T, E> = Pin<Box<dyn Future<Output = Result<T, E>> + Send + 'a>>;
+pub type FutureResult<'a, T, E> = Pin<Box<dyn Future<Output = Result<T, E>> + Send + 'a>>;
 
 /// Trait that persists the type with an async `Db`.
 pub trait PersistAsyncWith<Db>: Staged + Sized {