Bump the cargo group across 1 directory with 20 updates

opsqueue/Cargo.toml

@@ -17,7 +17,7 @@ required-features = ["server-logic"]
 
 [dependencies]
 # Datatypes and concurrency:
-itertools = "0.14.0"
+itertools = "0.15.0"
 arc-swap = {version = "1.9.1", optional = true}
 moka = { version = "0.12.15", features = ["sync"], optional = true }
 chrono = { version = "0.4.44", features = ["serde"]}
@@ -32,7 +32,7 @@ ux = "0.1.6"
 # Error handling:
 anyhow = "1.0.102"
 # Database:
-sqlx = { version = "0.8.2", features = ["sqlite", "runtime-tokio", "chrono"], optional = true }
+sqlx = { version = "0.9.0", features = ["sqlite", "runtime-tokio", "chrono"], optional = true }
 # Serialization:
 serde = { version = "1.0.203", features = ["derive"] }
 serde_json = "1.0.149"
@@ -46,12 +46,12 @@ axum = { version = "0.8.9", features = ["ws", "macros"], optional = true }
 reqwest = { version = "0.13.2", default-features = false, features = ["json"], optional = true }
 url = {version = "2.5.2"}
 tokio-util = { version = "0.7.18", features = ["io", "rt", "time"] }
-tower-http = { version = "0.6.8", features = ["trace", "catch-panic"], optional = true }
+tower-http = { version = "0.7.0", features = ["trace", "catch-panic"], optional = true }
 # Logging and tracing:
 tracing = {version = "0.1", features = ["log"] }
 tracing-subscriber = {version = "0.3", features = ["std", "env-filter"] }
-sentry = {version = "0.47", optional = true, default-features=false, features=["rustls", "reqwest", "anyhow", "backtrace", "contexts", "tracing", "panic"]}
-sentry-tracing = {version = "0.47", optional = true}
+sentry = {version = "0.48", optional = true, default-features=false, features=["rustls", "reqwest", "anyhow", "backtrace", "contexts", "tracing", "panic"]}
+sentry-tracing = {version = "0.48", optional = true}
 # Exporting traces to Opentelemetry:
 opentelemetry = { version = "0.32", default-features = false, features = ["trace"] }
 opentelemetry_sdk = { version = "0.32", default-features = false, features = ["trace", "rt-tokio"] }

opsqueue/src/common/chunk.rs

@@ -228,14 +228,14 @@ pub mod db {
     impl<'q> sqlx::Encode<'q, Sqlite> for super::ChunkIndex {
         fn encode_by_ref(
             &self,
-            buf: &mut <Sqlite as sqlx::Database>::ArgumentBuffer<'q>,
+            buf: &mut <Sqlite as sqlx::Database>::ArgumentBuffer,
         ) -> Result<sqlx::encode::IsNull, sqlx::error::BoxDynError> {
             <i64 as sqlx::Encode<'q, Sqlite>>::encode_by_ref(&i64::from(*self), buf)
         }
 
         fn encode(
             self,
-            buf: &mut <Sqlite as sqlx::Database>::ArgumentBuffer<'q>,
+            buf: &mut <Sqlite as sqlx::Database>::ArgumentBuffer,
         ) -> Result<sqlx::encode::IsNull, sqlx::error::BoxDynError>
         where
             Self: Sized,
@@ -694,7 +694,7 @@ pub mod test {
     use super::db::*;
     use super::*;
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     pub async fn test_insert_chunk(db: sqlx::SqlitePool) {
         let db = WriterPool::new(db);
         let mut conn = db.writer_conn().await.unwrap();
@@ -711,7 +711,7 @@ pub mod test {
         assert!(count_chunks(&mut conn).await.unwrap() == u63::new(1));
     }
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     pub async fn test_get_chunk(db: sqlx::SqlitePool) {
         let db = WriterPool::new(db);
         let mut conn = db.writer_conn().await.unwrap();
@@ -731,7 +731,7 @@ pub mod test {
         assert!(chunk == fetched_chunk);
     }
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     pub async fn test_complete_chunk_raw(db: sqlx::SqlitePool) {
         let db = WriterPool::new(db);
         let mut conn = db.writer_conn().await.unwrap();
@@ -769,7 +769,7 @@ pub mod test {
         assert!(count_chunks_failed(&mut conn).await.unwrap() == u63::new(0));
     }
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     pub async fn test_complete_chunk_raw_updates_submissions_chunk_total(db: sqlx::SqlitePool) {
         let db = WriterPool::new(db);
         let mut conn = db.writer_conn().await.unwrap();
@@ -812,7 +812,7 @@ pub mod test {
         }
     }
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     pub async fn test_fail_chunk(db: sqlx::SqlitePool) {
         let db = WriterPool::new(db);
         let mut conn = db.writer_conn().await.unwrap();

opsqueue/src/common/submission.rs

@@ -284,14 +284,14 @@ pub mod db {
     impl<'q> sqlx::Encode<'q, Sqlite> for SubmissionId {
         fn encode_by_ref(
             &self,
-            buf: &mut <Sqlite as sqlx::Database>::ArgumentBuffer<'q>,
+            buf: &mut <Sqlite as sqlx::Database>::ArgumentBuffer,
         ) -> Result<sqlx::encode::IsNull, sqlx::error::BoxDynError> {
             <i64 as sqlx::Encode<'q, Sqlite>>::encode_by_ref(&i64::from(*self), buf)
         }
 
         fn encode(
             self,
-            buf: &mut <Sqlite as sqlx::Database>::ArgumentBuffer<'q>,
+            buf: &mut <Sqlite as sqlx::Database>::ArgumentBuffer,
         ) -> Result<sqlx::encode::IsNull, sqlx::error::BoxDynError>
         where
             Self: Sized,
@@ -1050,7 +1050,7 @@ pub mod test {
     use super::*;
 
     async fn explain_query_plan(query: &str, conn: &mut SqliteConnection) -> String {
-        sqlx::raw_sql(&format!("EXPLAIN QUERY PLAN {query}"))
+        sqlx::raw_sql(sqlx::AssertSqlSafe(format!("EXPLAIN QUERY PLAN {query}")))
             .fetch_all(&mut *conn)
             .await
             .unwrap_or_else(|_| panic!("Invalid query: \n{query}\n"))
@@ -1075,7 +1075,7 @@ pub mod test {
         );
     }
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     pub async fn test_query_plan_submission_status_in_progress(db: sqlx::SqlitePool) {
         let mut conn = db.acquire().await.unwrap();
         let query = r#"
@@ -1103,7 +1103,7 @@ pub mod test {
         ");
     }
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     pub async fn test_query_plan_submission_status_completed(db: sqlx::SqlitePool) {
         let mut conn = db.acquire().await.unwrap();
         let query = r#"
@@ -1131,7 +1131,7 @@ pub mod test {
         ");
     }
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     pub async fn test_query_plan_submission_status_failed(db: sqlx::SqlitePool) {
         let mut conn = db.acquire().await.unwrap();
         let query = r#"
@@ -1161,7 +1161,7 @@ pub mod test {
         ");
     }
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     pub async fn test_query_plan_submission_status_cancelled(db: sqlx::SqlitePool) {
         let mut conn = db.acquire().await.unwrap();
         let query = r#"
@@ -1188,7 +1188,7 @@ pub mod test {
         ");
     }
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     pub async fn test_insert_submission(db: sqlx::SqlitePool) {
         let db = WriterPool::new(db);
         let mut conn = db.writer_conn().await.unwrap();
@@ -1208,7 +1208,7 @@ pub mod test {
         assert_matches!(count_submissions(&mut conn).await, Ok(1));
     }
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     pub async fn test_get_submission(db: sqlx::SqlitePool) {
         let db = WriterPool::new(db);
         let mut conn = db.writer_conn().await.unwrap();
@@ -1231,7 +1231,7 @@ pub mod test {
         assert_eq!(fetched_submission, submission);
     }
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     pub async fn test_submission_strategic_metadata(db: sqlx::SqlitePool) {
         let strategic_metadata: StrategicMetadataMap =
             [("company_id".to_string(), 123), ("flavour".to_string(), 42)]
@@ -1275,7 +1275,7 @@ pub mod test {
         assert_eq!(chunk_fetched_metadata, strategic_metadata);
     }
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     pub async fn test_complete_submission_raw(db: sqlx::SqlitePool) {
         let db = WriterPool::new(db);
         let mut conn = db.writer_conn().await.unwrap();
@@ -1300,7 +1300,7 @@ pub mod test {
         assert_matches!(count_submissions_failed(&mut conn).await, Ok(0));
     }
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     pub async fn test_fail_submission_raw(db: sqlx::SqlitePool) {
         let db = WriterPool::new(db);
         let mut conn = db.writer_conn().await.unwrap();
@@ -1327,7 +1327,7 @@ pub mod test {
         assert_matches!(count_submissions_failed(&mut conn).await, Ok(1));
     }
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     pub async fn test_cleanup_old(db: sqlx::SqlitePool) {
         let db = WriterPool::new(db);
         let mut conn = db.writer_conn().await.unwrap();
@@ -1454,7 +1454,7 @@ pub mod test {
         let _sub2 = submission_status(old_four_unfailed, &mut conn).await;
     }
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     /// Test whether empty submissions are marked as completed right away by `insert_submission_from_chunks`.
     pub async fn auto_complete_empty_submission(db: sqlx::SqlitePool) {
         let db = WriterPool::new(db);

opsqueue/src/consumer/client.rs

@@ -409,7 +409,7 @@ mod tests {
 
     use super::*;
 
-    #[sqlx::test]
+    #[sqlx::test(migrator = "crate::MIGRATOR")]
     pub async fn test_fetch_chunks(pool: sqlx::SqlitePool) {
         let db_pools = db::DBPools::from_test_pool(&pool);
         let uri = "0.0.0.0:10083";