From 46d9fd30e639df595a081a0f3886e0ba1a76ab30 Mon Sep 17 00:00:00 2001
From: Chris Tsang <tyt2y7@gmail.com>
Date: Tue, 7 Sep 2021 21:53:09 +0800
Subject: [PATCH] Try DeriveEntity

---
 sea-orm-macros/src/attributes.rs     | 4 ++--
 sea-orm-macros/src/derives/entity.rs | 2 +-
 src/tests_cfg/fruit.rs               | 7 +------
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/sea-orm-macros/src/attributes.rs b/sea-orm-macros/src/attributes.rs
index d195a98f..39cccaa8 100644
--- a/sea-orm-macros/src/attributes.rs
+++ b/sea-orm-macros/src/attributes.rs
@@ -2,7 +2,7 @@ pub mod derive_attr {
     use bae::FromAttributes;
 
     #[derive(Default, FromAttributes)]
-    pub struct Sea {
+    pub struct SeaOrm {
         pub column: Option<syn::Ident>,
         pub entity: Option<syn::Ident>,
         pub model: Option<syn::Ident>,
@@ -17,7 +17,7 @@ pub mod field_attr {
     use bae::FromAttributes;
 
     #[derive(Default, FromAttributes)]
-    pub struct Sea {
+    pub struct SeaOrm {
         pub auto_increment: Option<syn::Lit>,
         pub belongs_to: Option<syn::Lit>,
         pub column_type: Option<syn::Lit>,
diff --git a/sea-orm-macros/src/derives/entity.rs b/sea-orm-macros/src/derives/entity.rs
index 06696d8f..f1893ca7 100644
--- a/sea-orm-macros/src/derives/entity.rs
+++ b/sea-orm-macros/src/derives/entity.rs
@@ -17,7 +17,7 @@ struct DeriveEntity {
 
 impl DeriveEntity {
     fn new(input: syn::DeriveInput) -> Result<Self, syn::Error> {
-        let sea_attr = derive_attr::Sea::try_from_attributes(&input.attrs)?.unwrap_or_default();
+        let sea_attr = derive_attr::SeaOrm::try_from_attributes(&input.attrs)?.unwrap_or_default();
 
         let ident = input.ident;
         let column_ident = sea_attr.column.unwrap_or_else(|| format_ident!("Column"));
diff --git a/src/tests_cfg/fruit.rs b/src/tests_cfg/fruit.rs
index b0b8bc79..0cbfb16f 100644
--- a/src/tests_cfg/fruit.rs
+++ b/src/tests_cfg/fruit.rs
@@ -2,14 +2,9 @@ use crate as sea_orm;
 use crate::entity::prelude::*;
 
 #[derive(Copy, Clone, Default, Debug, DeriveEntity)]
+#[sea_orm(table_name = "fruit")]
 pub struct Entity;
 
-impl EntityName for Entity {
-    fn table_name(&self) -> &str {
-        "fruit"
-    }
-}
-
 #[derive(Clone, Debug, PartialEq, DeriveModel, DeriveActiveModel)]
 pub struct Model {
     pub id: i32,