Upgrade SQLx dependency (#5928)

Author: guilload

quickwit/Cargo.lock

@@ -206,8 +206,8 @@ rust-embed = "6.8"
 rustc-hash = "2.1"
 rustls = "0.23"
 rustls-pemfile = "2.2"
-sea-query = { version = "0.30" }
-sea-query-binder = { version = "0.5", features = [
+sea-query = { version = "0.32" }
+sea-query-binder = { version = "0.7", features = [
   "runtime-tokio-rustls",
   "sqlx-postgres",
 ] }
@@ -221,7 +221,7 @@ serde_yaml = "0.9"
 serial_test = { version = "3.2", features = ["file_locks"] }
 siphasher = "1.0"
 smallvec = "1"
-sqlx = { version = "0.7", features = [
+sqlx = { version = "0.8", features = [
   "migrate",
   "postgres",
   "runtime-tokio-rustls",

quickwit/Cargo.toml

@@ -15,7 +15,6 @@
 use futures::future::BoxFuture;
 use futures::stream::BoxStream;
 use quickwit_common::metrics::GaugeGuard;
-use sqlx::database::HasStatement;
 use sqlx::pool::PoolConnection;
 use sqlx::pool::maybe::MaybePoolConnection;
 use sqlx::{
@@ -71,7 +70,11 @@ impl<'a, DB: Database> Acquire<'a> for &TrackedPool<DB> {
         let acquire_conn_fut = self.acquire();
 
         Box::pin(async move {
-            Transaction::begin(MaybePoolConnection::PoolConnection(acquire_conn_fut.await?)).await
+            Transaction::begin(
+                MaybePoolConnection::PoolConnection(acquire_conn_fut.await?),
+                None,
+            )
+            .await
         })
     }
 }
@@ -105,7 +108,7 @@ where for<'c> &'c mut DB::Connection: Executor<'c, Database = DB>
         self,
         sql: &'q str,
         parameters: &'e [<Self::Database as Database>::TypeInfo],
-    ) -> BoxFuture<'e, Result<<Self::Database as HasStatement<'q>>::Statement, Error>> {
+    ) -> BoxFuture<'e, Result<<Self::Database as Database>::Statement<'q>, Error>> {
         self.inner_pool.prepare_with(sql, parameters)
     }
 

quickwit/quickwit-metastore/src/metastore/postgres/pool.rs

@@ -151,7 +151,10 @@ impl sqlx::Type<sqlx::Postgres> for DocMappingUid {
 
 #[cfg(feature = "postgres")]
 impl sqlx::Encode<'_, sqlx::Postgres> for DocMappingUid {
-    fn encode_by_ref(&self, buf: &mut sqlx::postgres::PgArgumentBuffer) -> sqlx::encode::IsNull {
+    fn encode_by_ref(
+        &self,
+        buf: &mut sqlx::postgres::PgArgumentBuffer,
+    ) -> Result<sqlx::encode::IsNull, sqlx::error::BoxDynError> {
         sqlx::Encode::<sqlx::Postgres>::encode(self.0.to_string(), buf)
     }
 }

quickwit/quickwit-proto/src/types/doc_mapping_uid.rs

@@ -187,9 +187,12 @@ impl sqlx::Type<sqlx::Postgres> for IndexUid {
 
 #[cfg(feature = "postgres")]
 impl sqlx::Encode<'_, sqlx::Postgres> for IndexUid {
-    fn encode_by_ref(&self, buf: &mut sqlx::postgres::PgArgumentBuffer) -> sqlx::encode::IsNull {
-        let _ = sqlx::Encode::<sqlx::Postgres>::encode(&self.index_id, buf);
-        let _ = sqlx::Encode::<sqlx::Postgres>::encode(":", buf);
+    fn encode_by_ref(
+        &self,
+        buf: &mut sqlx::postgres::PgArgumentBuffer,
+    ) -> Result<sqlx::encode::IsNull, sqlx::error::BoxDynError> {
+        let _ = sqlx::Encode::<sqlx::Postgres>::encode(&self.index_id, buf)?;
+        let _ = sqlx::Encode::<sqlx::Postgres>::encode(":", buf)?;
         sqlx::Encode::<sqlx::Postgres>::encode(self.incarnation_id.to_string(), buf)
     }
 }