From 96917c5a1a4a8b486aa2375d8096f4159ee6fc0b Mon Sep 17 00:00:00 2001 From: Albert Marashi Date: Sun, 24 Mar 2024 10:53:45 +1030 Subject: [PATCH] Use full qualifier in derives (#1665) * Update active_model.rs * Update active_model.rs Added missing sea_orm qualifier --- sea-orm-macros/src/derives/active_model.rs | 36 +++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/sea-orm-macros/src/derives/active_model.rs b/sea-orm-macros/src/derives/active_model.rs index 975eabfd..60cac7e4 100644 --- a/sea-orm-macros/src/derives/active_model.rs +++ b/sea-orm-macros/src/derives/active_model.rs @@ -87,8 +87,8 @@ fn derive_active_model(all_fields: IntoIter) -> syn::Result } #[automatically_derived] - impl std::convert::From<::Model> for ActiveModel { - fn from(m: ::Model) -> Self { + impl std::convert::From<::Model> for ActiveModel { + fn from(m: ::Model) -> Self { Self { #(#field: sea_orm::ActiveValue::unchanged(m.#field)),* } @@ -96,7 +96,7 @@ fn derive_active_model(all_fields: IntoIter) -> syn::Result } #[automatically_derived] - impl sea_orm::IntoActiveModel for ::Model { + impl sea_orm::IntoActiveModel for ::Model { fn into_active_model(self) -> ActiveModel { self.into() } @@ -106,9 +106,9 @@ fn derive_active_model(all_fields: IntoIter) -> syn::Result impl sea_orm::ActiveModelTrait for ActiveModel { type Entity = Entity; - fn take(&mut self, c: ::Column) -> sea_orm::ActiveValue { + fn take(&mut self, c: ::Column) -> sea_orm::ActiveValue { match c { - #(::Column::#name => { + #(::Column::#name => { let mut value = sea_orm::ActiveValue::not_set(); std::mem::swap(&mut value, &mut self.#field); value.into_wrapped_value() @@ -117,30 +117,30 @@ fn derive_active_model(all_fields: IntoIter) -> syn::Result } } - fn get(&self, c: ::Column) -> sea_orm::ActiveValue { + fn get(&self, c: ::Column) -> sea_orm::ActiveValue { match c { - #(::Column::#name => self.#field.clone().into_wrapped_value(),)* + #(::Column::#name => self.#field.clone().into_wrapped_value(),)* _ => sea_orm::ActiveValue::not_set(), } } - fn set(&mut self, c: ::Column, v: sea_orm::Value) { + fn set(&mut self, c: ::Column, v: sea_orm::Value) { match c { - #(::Column::#name => self.#field = sea_orm::ActiveValue::set(v.unwrap()),)* + #(::Column::#name => self.#field = sea_orm::ActiveValue::set(v.unwrap()),)* _ => panic!("This ActiveModel does not have this field"), } } - fn not_set(&mut self, c: ::Column) { + fn not_set(&mut self, c: ::Column) { match c { - #(::Column::#name => self.#field = sea_orm::ActiveValue::not_set(),)* + #(::Column::#name => self.#field = sea_orm::ActiveValue::not_set(),)* _ => {}, } } - fn is_not_set(&self, c: ::Column) -> bool { + fn is_not_set(&self, c: ::Column) -> bool { match c { - #(::Column::#name => self.#field.is_not_set(),)* + #(::Column::#name => self.#field.is_not_set(),)* _ => panic!("This ActiveModel does not have this field"), } } @@ -151,9 +151,9 @@ fn derive_active_model(all_fields: IntoIter) -> syn::Result } } - fn reset(&mut self, c: ::Column) { + fn reset(&mut self, c: ::Column) { match c { - #(::Column::#name => self.#field.reset(),)* + #(::Column::#name => self.#field.reset(),)* _ => panic!("This ActiveModel does not have this field"), } } @@ -192,7 +192,7 @@ fn derive_into_model(model_fields: IntoIter) -> syn::Result Ok(quote!( #[automatically_derived] - impl std::convert::TryFrom for ::Model { + impl std::convert::TryFrom for ::Model { type Error = sea_orm::DbErr; fn try_from(a: ActiveModel) -> Result { #(if matches!(a.#active_model_field, sea_orm::ActiveValue::NotSet) { @@ -207,8 +207,8 @@ fn derive_into_model(model_fields: IntoIter) -> syn::Result } #[automatically_derived] - impl sea_orm::TryIntoModel<::Model> for ActiveModel { - fn try_into_model(self) -> Result<::Model, sea_orm::DbErr> { + impl sea_orm::TryIntoModel<::Model> for ActiveModel { + fn try_into_model(self) -> Result<::Model, sea_orm::DbErr> { self.try_into() } }