Use full qualifier in derives (#1665)
* Update active_model.rs * Update active_model.rs Added missing sea_orm qualifier
This commit is contained in:
parent
a321f0a566
commit
96917c5a1a
@ -87,8 +87,8 @@ fn derive_active_model(all_fields: IntoIter<Field>) -> syn::Result<TokenStream>
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[automatically_derived]
|
#[automatically_derived]
|
||||||
impl std::convert::From<<Entity as EntityTrait>::Model> for ActiveModel {
|
impl std::convert::From<<Entity as sea_orm::EntityTrait>::Model> for ActiveModel {
|
||||||
fn from(m: <Entity as EntityTrait>::Model) -> Self {
|
fn from(m: <Entity as sea_orm::EntityTrait>::Model) -> Self {
|
||||||
Self {
|
Self {
|
||||||
#(#field: sea_orm::ActiveValue::unchanged(m.#field)),*
|
#(#field: sea_orm::ActiveValue::unchanged(m.#field)),*
|
||||||
}
|
}
|
||||||
@ -96,7 +96,7 @@ fn derive_active_model(all_fields: IntoIter<Field>) -> syn::Result<TokenStream>
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[automatically_derived]
|
#[automatically_derived]
|
||||||
impl sea_orm::IntoActiveModel<ActiveModel> for <Entity as EntityTrait>::Model {
|
impl sea_orm::IntoActiveModel<ActiveModel> for <Entity as sea_orm::EntityTrait>::Model {
|
||||||
fn into_active_model(self) -> ActiveModel {
|
fn into_active_model(self) -> ActiveModel {
|
||||||
self.into()
|
self.into()
|
||||||
}
|
}
|
||||||
@ -106,9 +106,9 @@ fn derive_active_model(all_fields: IntoIter<Field>) -> syn::Result<TokenStream>
|
|||||||
impl sea_orm::ActiveModelTrait for ActiveModel {
|
impl sea_orm::ActiveModelTrait for ActiveModel {
|
||||||
type Entity = Entity;
|
type Entity = Entity;
|
||||||
|
|
||||||
fn take(&mut self, c: <Self::Entity as EntityTrait>::Column) -> sea_orm::ActiveValue<sea_orm::Value> {
|
fn take(&mut self, c: <Self::Entity as sea_orm::EntityTrait>::Column) -> sea_orm::ActiveValue<sea_orm::Value> {
|
||||||
match c {
|
match c {
|
||||||
#(<Self::Entity as EntityTrait>::Column::#name => {
|
#(<Self::Entity as sea_orm::EntityTrait>::Column::#name => {
|
||||||
let mut value = sea_orm::ActiveValue::not_set();
|
let mut value = sea_orm::ActiveValue::not_set();
|
||||||
std::mem::swap(&mut value, &mut self.#field);
|
std::mem::swap(&mut value, &mut self.#field);
|
||||||
value.into_wrapped_value()
|
value.into_wrapped_value()
|
||||||
@ -117,30 +117,30 @@ fn derive_active_model(all_fields: IntoIter<Field>) -> syn::Result<TokenStream>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get(&self, c: <Self::Entity as EntityTrait>::Column) -> sea_orm::ActiveValue<sea_orm::Value> {
|
fn get(&self, c: <Self::Entity as sea_orm::EntityTrait>::Column) -> sea_orm::ActiveValue<sea_orm::Value> {
|
||||||
match c {
|
match c {
|
||||||
#(<Self::Entity as EntityTrait>::Column::#name => self.#field.clone().into_wrapped_value(),)*
|
#(<Self::Entity as sea_orm::EntityTrait>::Column::#name => self.#field.clone().into_wrapped_value(),)*
|
||||||
_ => sea_orm::ActiveValue::not_set(),
|
_ => sea_orm::ActiveValue::not_set(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn set(&mut self, c: <Self::Entity as EntityTrait>::Column, v: sea_orm::Value) {
|
fn set(&mut self, c: <Self::Entity as sea_orm::EntityTrait>::Column, v: sea_orm::Value) {
|
||||||
match c {
|
match c {
|
||||||
#(<Self::Entity as EntityTrait>::Column::#name => self.#field = sea_orm::ActiveValue::set(v.unwrap()),)*
|
#(<Self::Entity as sea_orm::EntityTrait>::Column::#name => self.#field = sea_orm::ActiveValue::set(v.unwrap()),)*
|
||||||
_ => panic!("This ActiveModel does not have this field"),
|
_ => panic!("This ActiveModel does not have this field"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn not_set(&mut self, c: <Self::Entity as EntityTrait>::Column) {
|
fn not_set(&mut self, c: <Self::Entity as sea_orm::EntityTrait>::Column) {
|
||||||
match c {
|
match c {
|
||||||
#(<Self::Entity as EntityTrait>::Column::#name => self.#field = sea_orm::ActiveValue::not_set(),)*
|
#(<Self::Entity as sea_orm::EntityTrait>::Column::#name => self.#field = sea_orm::ActiveValue::not_set(),)*
|
||||||
_ => {},
|
_ => {},
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn is_not_set(&self, c: <Self::Entity as EntityTrait>::Column) -> bool {
|
fn is_not_set(&self, c: <Self::Entity as sea_orm::EntityTrait>::Column) -> bool {
|
||||||
match c {
|
match c {
|
||||||
#(<Self::Entity as EntityTrait>::Column::#name => self.#field.is_not_set(),)*
|
#(<Self::Entity as sea_orm::EntityTrait>::Column::#name => self.#field.is_not_set(),)*
|
||||||
_ => panic!("This ActiveModel does not have this field"),
|
_ => panic!("This ActiveModel does not have this field"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -151,9 +151,9 @@ fn derive_active_model(all_fields: IntoIter<Field>) -> syn::Result<TokenStream>
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn reset(&mut self, c: <Self::Entity as EntityTrait>::Column) {
|
fn reset(&mut self, c: <Self::Entity as sea_orm::EntityTrait>::Column) {
|
||||||
match c {
|
match c {
|
||||||
#(<Self::Entity as EntityTrait>::Column::#name => self.#field.reset(),)*
|
#(<Self::Entity as sea_orm::EntityTrait>::Column::#name => self.#field.reset(),)*
|
||||||
_ => panic!("This ActiveModel does not have this field"),
|
_ => panic!("This ActiveModel does not have this field"),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -192,7 +192,7 @@ fn derive_into_model(model_fields: IntoIter<Field>) -> syn::Result<TokenStream>
|
|||||||
|
|
||||||
Ok(quote!(
|
Ok(quote!(
|
||||||
#[automatically_derived]
|
#[automatically_derived]
|
||||||
impl std::convert::TryFrom<ActiveModel> for <Entity as EntityTrait>::Model {
|
impl std::convert::TryFrom<ActiveModel> for <Entity as sea_orm::EntityTrait>::Model {
|
||||||
type Error = sea_orm::DbErr;
|
type Error = sea_orm::DbErr;
|
||||||
fn try_from(a: ActiveModel) -> Result<Self, sea_orm::DbErr> {
|
fn try_from(a: ActiveModel) -> Result<Self, sea_orm::DbErr> {
|
||||||
#(if matches!(a.#active_model_field, sea_orm::ActiveValue::NotSet) {
|
#(if matches!(a.#active_model_field, sea_orm::ActiveValue::NotSet) {
|
||||||
@ -207,8 +207,8 @@ fn derive_into_model(model_fields: IntoIter<Field>) -> syn::Result<TokenStream>
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[automatically_derived]
|
#[automatically_derived]
|
||||||
impl sea_orm::TryIntoModel<<Entity as EntityTrait>::Model> for ActiveModel {
|
impl sea_orm::TryIntoModel<<Entity as sea_orm::EntityTrait>::Model> for ActiveModel {
|
||||||
fn try_into_model(self) -> Result<<Entity as EntityTrait>::Model, sea_orm::DbErr> {
|
fn try_into_model(self) -> Result<<Entity as sea_orm::EntityTrait>::Model, sea_orm::DbErr> {
|
||||||
self.try_into()
|
self.try_into()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user