Merge pull request #44 from kanko-travel/refactor-wrapper

make model_wrapper macro self contaiined
kanko-travel · Oct 28, 2024 · 6954fda · 6954fda
2 parents ed350ef + 52c6853
commit 6954fda
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/model/tests/pgoutput.rs b/model/tests/pgoutput.rs
@@ -3,12 +3,11 @@ use uuid::Uuid;
 
 mod models {
     use chrono::{DateTime, NaiveDate, Utc};
-    use model::{model_wrapper, Model};
     use rust_decimal::Decimal;
     use serde::{Deserialize, Serialize};
     use uuid::Uuid;
 
-    #[derive(Serialize, Deserialize, Debug, Clone, Model)]
+    #[derive(Serialize, Deserialize, Debug, Clone, model::Model)]
     #[model(table_name = "test")]
     pub struct Test {
         #[model(id, primary_key)]
@@ -18,7 +17,7 @@ mod models {
         balance: Decimal,
     }
 
-    model_wrapper!(Test);
+    model::model_wrapper!(Test);
 }
 
 #[test]

diff --git a/model_wrapper/src/lib.rs b/model_wrapper/src/lib.rs
@@ -42,7 +42,7 @@ pub fn model_wrapper(input: TokenStream) -> TokenStream {
 
         impl ModelWrapper {
             pub fn from_pgoutput(table_name: &str, col_names: &Vec<String>, row: Vec<Option<String>>) -> Result<Self, model::Error> {
-                use model::FromPgoutput;
+                use model::{ Model, FromPgoutput };
 
                 #(#table_name_matches)*
                 Err(model::Error::bad_request(&format!("unknown tablename {}", table_name)))