FEAT: add trait ArelAttributeFromRow

rust-china · Aug 30, 2023 · 4f32117 · 4f32117
1 parent 67c17b6
commit 4f32117
Show file tree

Hide file tree

Showing 12 changed files with 305 additions and 183 deletions.
diff --git a/arel-macros/src/arel/arel_model.rs b/arel-macros/src/arel/arel_model.rs
@@ -75,11 +75,13 @@ fn impl_trait_sqlx_from_row(input: &crate::Input) -> syn::Result<proc_macro2::To
         // arel(rename="x")
         if let Some(rename) = crate::get_path_value(input, Some(&field), "rename", None)? {
             build_assign_clauses.push(quote::quote!(
-                user.#ident = row.try_get::<#option_type, _>(#rename).unwrap_or_default();
+                // user.#ident = row.try_get::<#option_type, _>(#rename).unwrap_or_default();
+                user.#ident = <#option_type as arel::ArelAttributeFromRow>::from_row(&row, #rename).unwrap_or_default();
             ));
         } else {
             build_assign_clauses.push(quote::quote!(
-                user.#ident = row.try_get::<#option_type, _>(stringify!(#ident)).unwrap_or_default();
+                // user.#ident = row.try_get::<#option_type, _>(stringify!(#ident)).unwrap_or_default();
+                user.#ident = <#option_type as arel::ArelAttributeFromRow>::from_row(&row, stringify!(#ident)).unwrap_or_default();
             ));
         }
     }

diff --git a/arel-macros/src/arel/mod.rs b/arel-macros/src/arel/mod.rs
@@ -95,11 +95,13 @@ fn impl_trait_sqlx_from_row(input: &crate::Input) -> syn::Result<proc_macro2::To
         // arel(rename="x")
         if let Some(rename) = crate::get_path_value(input, Some(&field), "rename", None)? {
             build_assign_clauses.push(quote::quote!(
-                user.#ident = row.try_get::<#r#type, _>(#rename).unwrap_or_default();
+                // user.#ident = row.try_get::<#r#type, _>(#rename).unwrap_or_default();
+                user.#ident = <#r#type as arel::ArelAttributeFromRow>::from_row(&row, #rename).unwrap_or_default();
             ));
         } else {
             build_assign_clauses.push(quote::quote!(
-                user.#ident = row.try_get::<#r#type, _>(stringify!(#ident)).unwrap_or_default();
+                // user.#ident = row.try_get::<#r#type, _>(stringify!(#ident)).unwrap_or_default();
+                user.#ident = <#r#type as arel::ArelAttributeFromRow>::from_row(&row, stringify!(#ident)).unwrap_or_default();
             ));
         }
     }

diff --git a/example/src/main.rs b/example/src/main.rs
@@ -1,5 +1,36 @@
 use arel::prelude::*;
 
+#[derive(Debug, Clone, PartialEq)]
+pub enum Gender {
+    Unknown = 0,
+    Male = 1,
+    Female = 2,
+}
+impl ArelAttributeFromRow for Gender {
+    fn from_row<'r, I>(row: &'r arel::DatabaseRow, index: I) -> sqlx::Result<Self, sqlx::Error>
+    where
+        Self: Sized,
+        I: sqlx::ColumnIndex<arel::DatabaseRow>,
+    {
+        let v: u8 = row.try_get(index)?;
+        let ret = match v {
+            1 => Gender::Male,
+            2 => Gender::Female,
+            _ => Gender::Unknown,
+        };
+        Ok(ret)
+    }
+}
+impl From<Gender> for arel::Value {
+    fn from(value: Gender) -> Self {
+        match value {
+            Gender::Male => 1.into(),
+            Gender::Female => 2.into(),
+            _ => 0.into(),
+        }
+    }
+}
+
 #[arel(table_name = "user")]
 #[allow(dead_code)]
 struct User {
@@ -8,6 +39,7 @@ struct User {
     name: String,
     #[arel(rename = "type")]
     r#type: String,
+    gender: Option<Gender>,
     desc: Option<String>,
     done: Option<bool>,
     lock_version: Option<i32>,
@@ -23,6 +55,7 @@ async fn init_db() -> anyhow::Result<()> {
                 id             INTEGER PRIMARY KEY NOT NULL,
                 name           VARCHAR(255),
                 type           VARCHAR(255),
+                gender         INT(1) NOT NULL DEFAULT 0,
                 desc           TEXT,
                 done           BOOLEAN NOT NULL DEFAULT 0,
                 lock_version   INT(11) NOT NULL DEFAULT 0,

diff --git a/src/active_model/active_record/mod.rs b/src/active_model/active_record/mod.rs
diff --git a/src/active_model/mod.rs b/src/active_model/mod.rs
diff --git a/src/lib.rs b/src/lib.rs
@@ -22,7 +22,7 @@ pub mod traits;
 pub mod value;
 pub mod visitor;
 
-pub use crate::traits::{Arel, ArelPersisted, SuperArel};
+pub use crate::traits::{Arel, ArelAttributeFromRow, ArelPersisted, SuperArel};
 pub use bytes::Bytes;
 pub use sql::Sql;
 pub use value::{ActiveValue, Value};

diff --git a/src/prelude.rs b/src/prelude.rs
@@ -10,4 +10,4 @@ pub use crate::arel;
 pub use crate::statements::ArelStatement;
 pub use crate::Set;
 // pub use crate::{ActiveValue, Value};
-pub use crate::{Arel, ArelPersisted, SuperArel};
+pub use crate::{Arel, ArelAttributeFromRow, ArelPersisted, SuperArel};
diff --git a/src/sql/query_builder.rs b/src/sql/query_builder.rs
@@ -39,16 +39,16 @@ impl<'a> QueryBuilder<'a> {
                 self.push_bind(Some(*val));
             }
             crate::Value::TinyUnsigned(val) => {
-                self.push_bind(Some(*val as i32));
+                self.push_bind(Some(*val as i64));
             }
             crate::Value::SmallUnsigned(val) => {
-                self.push_bind(Some(*val as i32));
+                self.push_bind(Some(*val as i64));
             }
             crate::Value::Unsigned(val) => {
-                self.push_bind(Some(*val as i32));
+                self.push_bind(Some(*val as i64));
             }
             crate::Value::BigUnsigned(val) => {
-                self.push_bind(Some(*val as i32));
+                self.push_bind(Some(*val as i64));
             }
             crate::Value::Float(val) => {
                 self.push_bind(Some(*val));