caisin/sea-orm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Manage auto_increment attribute, call nullable() instead of old null()

Browse Source
This commit is contained in:
Marco Napetti 2021-09-06 12:41:09 +02:00
parent cc2f491a1e
commit ab925e8f11
1 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
sea-orm-macros/src/derives/entity_model.rs
View File

@ -38,6 +38,7 @@ impl sea_orm::prelude::EntityName for Entity {
let mut columns_enum: Punctuated<_, Comma> = Punctuated::new(); let mut columns_enum: Punctuated<_, Comma> = Punctuated::new();
let mut columns_trait: Punctuated<_, Comma> = Punctuated::new(); let mut columns_trait: Punctuated<_, Comma> = Punctuated::new();
let mut primary_keys: Punctuated<_, Comma> = Punctuated::new(); let mut primary_keys: Punctuated<_, Comma> = Punctuated::new();
let mut auto_increment = true;
if let Data::Struct(item_struct) = data { if let Data::Struct(item_struct) = data {
if let Fields::Named(fields) = item_struct.fields { if let Fields::Named(fields) = item_struct.fields {
for field in fields.named { for field in fields.named {
@ -51,15 +52,15 @@ impl sea_orm::prelude::EntityName for Entity {
let mut indexed = false; let mut indexed = false;
let mut unique = false; let mut unique = false;
let mut sql_type = None; let mut sql_type = None;
// search for #[sea_orm(primary_key, column_type = "String", default_value = "new user", default_expr = "gen_random_uuid()", nullable, indexed, unique)] // search for #[sea_orm(primary_key, auto_increment = false, column_type = "String", default_value = "new user", default_expr = "gen_random_uuid()", nullable, indexed, unique)]
field.attrs.iter().for_each(|attr| { for attr in field.attrs.iter() {
if let Some(ident) = attr.path.get_ident() { if let Some(ident) = attr.path.get_ident() {
if ident != "sea_orm" { if ident != "sea_orm" {
return; continue;
} }
} }
else { else {
return; continue;
} }
// single param // single param
@ -70,9 +71,24 @@ impl sea_orm::prelude::EntityName for Entity {
if let Some(name) = nv.path.get_ident() { if let Some(name) = nv.path.get_ident() {
if name == "column_type" { if name == "column_type" {
if let Lit::Str(litstr) = &nv.lit { if let Lit::Str(litstr) = &nv.lit {
let ty: TokenStream = syn::parse_str(&litstr.value()).unwrap(); let ty: TokenStream = syn::parse_str(&litstr.value())?;
sql_type = Some(ty); sql_type = Some(ty);
} }
else {
return Err(Error::new(field.span(), format!("Invalid column_type {:?}", nv.lit)));
}
}
else if name == "auto_increment" {
if let Lit::Str(litstr) = &nv.lit {
auto_increment = match litstr.value().as_str() {
"true" => true,
"false" => false,
_ => return Err(Error::new(field.span(), format!("Invalid auto_increment = {}", litstr.value()))),
};
}
else {
return Err(Error::new(field.span(), format!("Invalid auto_increment = {:?}", nv.lit)));
}
} }
else if name == "default_value" { else if name == "default_value" {
default_value = Some(nv.lit.to_owned()); default_value = Some(nv.lit.to_owned());
@ -102,7 +118,7 @@ impl sea_orm::prelude::EntityName for Entity {
} }
} }
} }
}); }
let field_type = match sql_type { let field_type = match sql_type {
Some(t) => t, Some(t) => t,
@ -140,7 +156,7 @@ impl sea_orm::prelude::EntityName for Entity {
let mut match_row = quote! { Self::#field_name => sea_orm::prelude::ColumnType::#field_type.def() }; let mut match_row = quote! { Self::#field_name => sea_orm::prelude::ColumnType::#field_type.def() };
if nullable { if nullable {
match_row = quote! { #match_row.null() }; match_row = quote! { #match_row.nullable() };
} }
if indexed { if indexed {
match_row = quote! { #match_row.indexed() }; match_row = quote! { #match_row.indexed() };
@ -161,7 +177,7 @@ impl sea_orm::prelude::EntityName for Entity {
} }
let primary_key = (!primary_keys.is_empty()).then(|| { let primary_key = (!primary_keys.is_empty()).then(|| {
let auto_increment = primary_keys.len() == 1; let auto_increment = auto_increment && primary_keys.len() == 1;
quote! { quote! {
#[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)] #[derive(Copy, Clone, Debug, EnumIter, DerivePrimaryKey)]
pub enum PrimaryKey { pub enum PrimaryKey {