update: use owned values for find by primary & partition key by value…

README.md

@@ -174,18 +174,18 @@ Resulting auto-generated migration query will be:
             clustering_keys = [created_at, id],
             global_secondary_indexes = [],
             local_secondary_indexes = [],
-            table_options = #r"
-                WITH CLUSTERING ORDER BY (created_at DESC) 
+            table_options = r#"
+                CLUSTERING ORDER BY (created_at DESC) 
                 AND gc_grace_seconds = 86400
-            ";
+            "#
         )]
         #[derive(Serialize, Deserialize, Default)]
         pub struct Commit {...}
         ```
         * ⚠️ If table exists, table options will result in alter table query that without
           `CLUSTERING ORDER` and `COMPACT STORAGE` options.
 
-  Model dropping is not added. If you removed model, you need to drop table manuall
+  Model dropping is not added. If you removed model, you need to drop table manually.
 
 * ### Running migration
   ```bash

charybdis-macros/Cargo.toml

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

charybdis-migrate/Cargo.toml

@@ -1,15 +1,15 @@
 [package]
 name = "charybdis-migrate"
 rust-version = "1.75.0"
-version = "0.6.2"
+version = "0.7.0"
 edition = "2021"
 description = "Automatic Migration Tool for Charybdis ORM"
 repository = "https://github.com/nodecosmos/charybdis"
 license = "MIT"
 categories = ["database"]
 
 [dependencies]
-charybdis_parser = { version = "0.6.2", path = "../charybdis-parser" }
+charybdis_parser = { version = "0.7.0", path = "../charybdis-parser" }
 scylla = "0.13.0"
 tokio = { version = "1.37.0", features = ["full"] }
 serde_json = "1.0.116"

charybdis-migrate/README.md

@@ -51,10 +51,10 @@ migrate --hosts <host> --keyspace <your_keyspace> --drop-and-replace (optional)
             table_name = commits,
             partition_keys = [object_id],
             clustering_keys = [created_at, id],
-            table_options = #r"
-                WITH CLUSTERING ORDER BY (created_at DESC) 
+            table_options = r#"
+                CLUSTERING ORDER BY (created_at DESC) 
                 AND gc_grace_seconds = 86400
-            ";
+            "#
         )]
         #[derive(Serialize, Deserialize, Default)]
         pub struct Commit {...}

charybdis-parser/Cargo.toml

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

charybdis/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "charybdis"
 rust-version = "1.75.0"
-version = "0.6.2"
+version = "0.7.0"
 edition = "2021"
 description = "High-Performance ORM for ScyllaDB"
 repository = "https://github.com/nodecosmos/charybdis"
@@ -11,7 +11,7 @@ categories = ["database"]
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-charybdis_macros = { version = "0.6.2", path = "../charybdis-macros" }
+charybdis_macros = { version = "0.7.0", path = "../charybdis-macros" }
 chrono = { version = "0.4.38", features = ["serde"] }
 futures = "0.3.30"
 num-bigint = "0.4.4"

charybdis/README.md

@@ -174,18 +174,18 @@ Resulting auto-generated migration query will be:
             clustering_keys = [created_at, id],
             global_secondary_indexes = [],
             local_secondary_indexes = [],
-            table_options = #r"
-                WITH CLUSTERING ORDER BY (created_at DESC) 
+            table_options = r#"
+                CLUSTERING ORDER BY (created_at DESC) 
                 AND gc_grace_seconds = 86400
-            ";
+            "#
         )]
         #[derive(Serialize, Deserialize, Default)]
         pub struct Commit {...}
         ```
         * ⚠️ If table exists, table options will result in alter table query that without
           `CLUSTERING ORDER` and `COMPACT STORAGE` options.
 
-  Model dropping is not added. If you removed model, you need to drop table manuall
+  Model dropping is not added. If you removed model, you need to drop table manually.
 
 * ### Running migration
   ```bash

charybdis/src/operations/find.rs

@@ -35,26 +35,34 @@ pub trait Find: BaseModel {
         CharybdisQuery::new(query, QueryValue::Owned(values))
     }
 
-    fn find_by_primary_key_value(value: &Self::PrimaryKey) -> CharybdisQuery<Self::PrimaryKey, Self, ModelRow<Self>> {
-        CharybdisQuery::new(Self::FIND_BY_PRIMARY_KEY_QUERY, QueryValue::Ref(value))
+    fn find_by_primary_key_value<'a>(
+        value: Self::PrimaryKey,
+    ) -> CharybdisQuery<'a, Self::PrimaryKey, Self, ModelRow<Self>> {
+        CharybdisQuery::new(Self::FIND_BY_PRIMARY_KEY_QUERY, QueryValue::Owned(value))
     }
 
-    fn maybe_find_by_primary_key_value(
-        value: &Self::PrimaryKey,
-    ) -> CharybdisQuery<Self::PrimaryKey, Self, OptionalModelRow<Self>> {
-        CharybdisQuery::new(Self::FIND_BY_PRIMARY_KEY_QUERY, QueryValue::Ref(value))
+    fn maybe_find_by_primary_key_value<'a>(
+        value: Self::PrimaryKey,
+    ) -> CharybdisQuery<'a, Self::PrimaryKey, Self, OptionalModelRow<Self>> {
+        CharybdisQuery::new(Self::FIND_BY_PRIMARY_KEY_QUERY, QueryValue::Owned(value))
     }
 
-    fn find_by_partition_key_value(
-        value: &Self::PartitionKey,
-    ) -> CharybdisQuery<Self::PartitionKey, Self, ModelStream<Self>> {
-        CharybdisQuery::new(Self::FIND_BY_PARTITION_KEY_QUERY, QueryValue::Ref(value))
+    fn find_by_partition_key_value<'a>(
+        value: Self::PartitionKey,
+    ) -> CharybdisQuery<'a, Self::PartitionKey, Self, ModelStream<Self>> {
+        CharybdisQuery::new(Self::FIND_BY_PARTITION_KEY_QUERY, QueryValue::Owned(value))
     }
 
-    fn find_first_by_partition_key_value(
-        value: &Self::PartitionKey,
-    ) -> CharybdisQuery<Self::PartitionKey, Self, ModelRow<Self>> {
-        CharybdisQuery::new(Self::FIND_FIRST_BY_PARTITION_KEY_QUERY, QueryValue::Ref(value))
+    fn find_first_by_partition_key_value<'a>(
+        value: Self::PartitionKey,
+    ) -> CharybdisQuery<'a, Self::PartitionKey, Self, ModelRow<Self>> {
+        CharybdisQuery::new(Self::FIND_FIRST_BY_PARTITION_KEY_QUERY, QueryValue::Owned(value))
+    }
+
+    fn find_by_partition_key_value_paged<'a>(
+        value: Self::PartitionKey,
+    ) -> CharybdisQuery<'a, Self::PartitionKey, Self, ModelPaged<Self>> {
+        CharybdisQuery::new(Self::FIND_BY_PARTITION_KEY_QUERY, QueryValue::Owned(value))
     }
 
     fn find_by_primary_key(&self) -> CharybdisQuery<Self::PrimaryKey, Self, ModelRow<Self>> {