update: add test; version: 1.1.0

Author: GoranBrkuljan

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "charybdis_macros"
 rust-version = "1.75.0"
-version = "1.0.4"
+version = "1.1.0"
 edition = "2021"
 description = "Proc macro crate for Charybdis ORM"
 repository = "https://github.com/goranbrkuljan/charybdis"
@@ -12,7 +12,7 @@ categories = ["database"]
 proc-macro = true
 
 [dependencies]
-charybdis_parser = { version = "1.0.4", path = "../charybdis-parser" }
+charybdis_parser = { version = "1.1.0", path = "../charybdis-parser" }
 proc-macro2 = "1.0.81"
 syn = { version = "2.0.60", features = ["full"] }
 quote = "1.0.36"

charybdis-macros/Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "charybdis-migrate"
 rust-version = "1.75.0"
-version = "1.0.4"
+version = "1.1.0"
 edition = "2021"
 description = "Automatic Migration Tool for Charybdis ORM"
 repository = "https://github.com/goranbrkuljan/charybdis"
 license = "MIT"
 categories = ["database"]
 
 [dependencies]
-charybdis_parser = { version = "1.0.4", path = "../charybdis-parser" }
+charybdis_parser = { version = "1.1.0", path = "../charybdis-parser" }
 scylla = { version = "1.4", features = ["openssl-010"] }
 tokio = { version = "1.38.0", features = ["full"] }
 colored = "3.0.0"

charybdis-migrate/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "charybdis_parser"
 rust-version = "1.75.0"
-version = "1.0.4"
+version = "1.1.0"
 edition = "2021"
 description = "Parser crate for Charybdis ORM"
 repository = "https://github.com/goranbrkuljan/charybdis"

charybdis-parser/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "charybdis"
 rust-version = "1.75.0"
-version = "1.0.4"
+version = "1.1.0"
 edition = "2021"
 description = "High-Performance ORM for ScyllaDB"
 repository = "https://github.com/goranbrkuljan/charybdis"
@@ -11,8 +11,8 @@ categories = ["database"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-charybdis-migrate = { version = "1.0.4", path = "../charybdis-migrate", optional = true }
-charybdis_macros = { version = "1.0.4", path = "../charybdis-macros" }
+charybdis-migrate = { version = "1.1.0", path = "../charybdis-migrate", optional = true }
+charybdis_macros = { version = "1.1.0", path = "../charybdis-macros" }
 chrono = { version = "0.4.38", features = ["serde"] }
 futures = "0.3.30"
 scylla = { version = "1.4", features = ["full-serialization"] }

charybdis/Cargo.toml

@@ -312,6 +312,7 @@ in `charybdis::operations` module.
   use charybdis::errors::CharybdisError;
   use charybdis::macros::charybdis_model;
   use charybdis::stream::CharybdisModelStream;
+  use charybdis::scylla::PagingStateResponse;
   use charybdis::types::{Date, Text, Uuid};
 
   #[charybdis_model(
@@ -344,6 +345,23 @@ in `charybdis::operations` module.
          let post: Option<Post> = Post::maybe_find_first_by_date_and_category_id(date, category_id).execute(db_session).await?;
          let post: Option<Post> = Post::maybe_find_first_by_date_and_category_id_and_title(date, category_id, title.clone()).execute(db_session).await?;
 
+         // paged finders over partition key + clustering keys
+         let (paged_posts_iter, paging_state) = Post::find_by_date_and_category_id_paged(date, category_id)
+             .page_size(10)
+             .execute(db_session)
+             .await?;
+         let paged_posts = paged_posts_iter.collect::<Result<Vec<Post>, CharybdisError>>()?;
+
+         if let PagingStateResponse::HasMorePages { state } = paging_state {
+             let (next_page_iter, next_state) = Post::find_by_date_and_category_id_paged(date, category_id)
+                 .paging_state(state)
+                 .page_size(10)
+                 .execute(db_session)
+                 .await?;
+             let _next_posts = next_page_iter.collect::<Result<Vec<Post>, CharybdisError>>()?;
+             assert!(matches!(next_state, PagingStateResponse::NoMorePages));
+         }
+
          // find by local secondary index
          let posts: CharybdisModelStream<Post> = Post::find_by_date_and_title(date, title.clone()).execute(db_session).await?;
          let post: Post = Post::find_first_by_date_and_title(date, title.clone()).execute(db_session).await?;

charybdis/README.md

@@ -163,3 +163,77 @@ async fn model_paged() {
         .await
         .expect("Failed to delete posts");
 }
+
+#[tokio::test]
+async fn model_multi_field_paged() {
+    let db_session = db_session().await;
+    let category_id = uuid::Uuid::new_v4();
+    let author_id = uuid::Uuid::new_v4();
+    let repeated_order_idx = 42;
+
+    let posts_to_insert = (0..5)
+        .map(|i| Post {
+            category_id,
+            order_idx: repeated_order_idx,
+            title: format!("Paged Post {i}"),
+            content: format!("Paged content {i}"),
+            author_id,
+        })
+        .collect::<Vec<Post>>();
+
+    Post::batch()
+        .chunked_insert(&db_session, &posts_to_insert, 100)
+        .await
+        .expect("Failed to insert paged posts");
+
+    let (first_page_iter, paging_state_response) = Post::find_by_category_id_and_order_idx_paged(category_id, repeated_order_idx)
+        .page_size(2)
+        .execute(&db_session)
+        .await
+        .expect("Failed to fetch first page of posts");
+
+    let first_page = first_page_iter
+        .collect::<Result<Vec<Post>, CharybdisError>>()
+        .expect("Failed to collect first paged posts");
+
+    assert_eq!(first_page.len(), 2);
+    assert!(first_page.iter().all(|post| post.order_idx == repeated_order_idx));
+    assert!(
+        matches!(paging_state_response, PagingStateResponse::HasMorePages { .. }),
+        "Expected paged query to have additional pages"
+    );
+
+    let mut collected_posts = first_page.clone();
+
+    if let PagingStateResponse::HasMorePages { state } = paging_state_response {
+        let (next_page_iter, next_paging_state_response) =
+            Post::find_by_category_id_and_order_idx_paged(category_id, repeated_order_idx)
+                .page_size(10)
+                .paging_state(state)
+                .execute(&db_session)
+                .await
+                .expect("Failed to fetch second page of posts");
+
+        let next_page = next_page_iter
+            .collect::<Result<Vec<Post>, CharybdisError>>()
+            .expect("Failed to collect second paged posts");
+
+        assert_eq!(next_page.len(), 3);
+        assert!(next_page.iter().all(|post| post.order_idx == repeated_order_idx));
+        assert!(
+            matches!(next_paging_state_response, PagingStateResponse::NoMorePages),
+            "Expected paged query to finish after the second call"
+        );
+
+        collected_posts.extend(next_page);
+    } else {
+        panic!("Expected additional pages for multi-field paged query");
+    }
+
+    assert_eq!(collected_posts.len(), posts_to_insert.len());
+
+    Post::delete_batch()
+        .chunked_delete(&db_session, &posts_to_insert, 100)
+        .await
+        .expect("Failed to delete paged posts");
+}

charybdis/tests/integrations/query.rs

@@ -8,7 +8,7 @@ tokio = { version = "1.42.0", features = ["rt-multi-thread"] }
 serde = { version = "1.0.204", features = ["derive"] }
 serde_json = "1.0.120"
 actix-web = { version = "4.9.0", features = ["cookies"] }
-charybdis = { version = "1.0.4", features = ["migrate"], path = "../../../charybdis" }
+charybdis = { version = "1.1.0", features = ["migrate"], path = "../../../charybdis" }
 log = "0.4.20"
 scylla = { version = "1.4" }
 chrono = "0.4.39"