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

Fix: fields with type Option<T> are always nullable (#1257)

Browse Source
This commit is contained in:
Billy Chan 2022-12-01 12:27:49 +08:00 committed by GitHub
parent d32e1eb058
commit 2389a4c83e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,20 +224,21 @@ pub fn expand_derive_entity_model(data: Data, attrs: Vec<Attribute>) -> syn::Res
}); });
} }
let field_type = &field.ty;
let field_type = quote! { #field_type }
.to_string() //E.g.: "Option < String >"
.replace(' ', ""); // Remove spaces
let field_type = if field_type.starts_with("Option<") {
nullable = true;
&field_type[7..(field_type.len() - 1)] // Extract `T` out of `Option<T>`
} else {
field_type.as_str()
};
let col_type = match sql_type { let col_type = match sql_type {
Some(t) => quote! { sea_orm::prelude::ColumnType::#t.def() }, Some(t) => quote! { sea_orm::prelude::ColumnType::#t.def() },
None => { None => {
let field_type = &field.ty; let col_type = match field_type {
let temp = quote! { #field_type }
.to_string() //E.g.: "Option < String >"
.replace(' ', "");
let temp = if temp.starts_with("Option<") {
nullable = true;
&temp[7..(temp.len() - 1)]
} else {
temp.as_str()
};
let col_type = match temp {
"char" => quote! { Char(None) }, "char" => quote! { Char(None) },
"String" | "&str" => quote! { String(None) }, "String" | "&str" => quote! { String(None) },
"i8" => quote! { TinyInteger }, "i8" => quote! { TinyInteger },
@ -270,7 +271,7 @@ pub fn expand_derive_entity_model(data: Data, attrs: Vec<Attribute>) -> syn::Res
}; };
if col_type.is_empty() { if col_type.is_empty() {
let field_span = field.span(); let field_span = field.span();
let ty: Type = LitStr::new(temp, field_span).parse()?; let ty: Type = LitStr::new(field_type, field_span).parse()?;
let def = quote_spanned! { field_span => { let def = quote_spanned! { field_span => {
std::convert::Into::<sea_orm::ColumnType>::into( std::convert::Into::<sea_orm::ColumnType>::into(
<#ty as sea_orm::sea_query::ValueType>::column_type() <#ty as sea_orm::sea_query::ValueType>::column_type()