From 3629b91d01fdc733139923b1d1e9847eaf23ec27 Mon Sep 17 00:00:00 2001 From: Chris Tsang Date: Thu, 13 Jul 2023 15:16:55 +0100 Subject: [PATCH] Do not deprecate default_value --- sea-orm-macros/src/derives/entity_model.rs | 2 +- src/entity/column.rs | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sea-orm-macros/src/derives/entity_model.rs b/sea-orm-macros/src/derives/entity_model.rs index d9abf8e9..bea168ac 100644 --- a/sea-orm-macros/src/derives/entity_model.rs +++ b/sea-orm-macros/src/derives/entity_model.rs @@ -272,7 +272,7 @@ pub fn expand_derive_entity_model(data: Data, attrs: Vec) -> syn::Res match_row = quote! { #match_row.unique() }; } if let Some(default_value) = default_value { - match_row = quote! { #match_row.default(#default_value) }; + match_row = quote! { #match_row.default_value(#default_value) }; } if let Some(default_expr) = default_expr { match_row = quote! { #match_row.default(#default_expr) }; diff --git a/src/entity/column.rs b/src/entity/column.rs index 7569d908..a2b7d872 100644 --- a/src/entity/column.rs +++ b/src/entity/column.rs @@ -362,7 +362,6 @@ impl ColumnDef { } /// Set the default value - #[deprecated(since = "0.12.0", note = "Please use [`ColumnDef::default`]")] pub fn default_value(mut self, value: T) -> Self where T: Into, @@ -537,6 +536,8 @@ mod tests { pub eleven: u8, #[sea_orm(default_value = "twelve_value")] pub twelve: String, + #[sea_orm(default_expr = "\"twelve_value\"")] + pub twelve_two: String, } #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)] @@ -592,6 +593,10 @@ mod tests { hello::Column::Twelve.def(), ColumnType::String(None).def().default("twelve_value") ); + assert_eq!( + hello::Column::TwelveTwo.def(), + ColumnType::String(None).def().default("twelve_value") + ); } #[test]