From 0fff7fd05409fb1ffa13afe6bef388a4721d99dd Mon Sep 17 00:00:00 2001
From: Chris Tsang <tyt2y7@gmail.com>
Date: Tue, 7 Sep 2021 20:36:49 +0800
Subject: [PATCH] Rename to DeriveEntityModel

---
 examples/async-std/src/example_cake.rs |  2 +-
 sea-orm-macros/src/lib.rs              | 30 ++++++++++++++------------
 src/entity/prelude.rs                  |  6 +++---
 src/lib.rs                             |  2 +-
 4 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/examples/async-std/src/example_cake.rs b/examples/async-std/src/example_cake.rs
index 8f704f3b..b159a381 100644
--- a/examples/async-std/src/example_cake.rs
+++ b/examples/async-std/src/example_cake.rs
@@ -1,6 +1,6 @@
 use sea_orm::entity::prelude::*;
 
-#[derive(Clone, Debug, PartialEq, DeriveModel, DeriveActiveModel, EntityModel)]
+#[derive(Clone, Debug, PartialEq, DeriveEntityModel, DeriveModel, DeriveActiveModel)]
 #[sea_orm(table_name = "cake")]
 pub struct Model {
     #[sea_orm(primary_key)]
diff --git a/sea-orm-macros/src/lib.rs b/sea-orm-macros/src/lib.rs
index b1c4141a..b85a84ad 100644
--- a/sea-orm-macros/src/lib.rs
+++ b/sea-orm-macros/src/lib.rs
@@ -15,6 +15,22 @@ pub fn derive_entity(input: TokenStream) -> TokenStream {
     }
 }
 
+#[proc_macro_derive(DeriveEntityModel, attributes(sea_orm))]
+pub fn derive_entity_model(input: TokenStream) -> TokenStream {
+    let DeriveInput {
+        ident, data, attrs, ..
+    } = parse_macro_input!(input as DeriveInput);
+
+    if ident != "Model" {
+        panic!("Struct name must be Model");
+    }
+
+    match derives::expand_derive_entity_model(data, attrs) {
+        Ok(ts) => ts.into(),
+        Err(e) => e.to_compile_error().into(),
+    }
+}
+
 #[proc_macro_derive(DerivePrimaryKey)]
 pub fn derive_primary_key(input: TokenStream) -> TokenStream {
     let DeriveInput { ident, data, .. } = parse_macro_input!(input);
@@ -108,17 +124,3 @@ pub fn test(_: TokenStream, input: TokenStream) -> TokenStream {
     )
     .into()
 }
-
-#[proc_macro_derive(EntityModel, attributes(sea_orm))]
-pub fn derive_entity_model(input: TokenStream) -> TokenStream {
-    let DeriveInput { ident, data, attrs, .. } = parse_macro_input!(input as DeriveInput);
-
-    if ident != "Model" {
-        panic!("Struct name must be Model");
-    }
-
-    match derives::expand_derive_entity_model(data, attrs) {
-        Ok(ts) => ts.into(),
-        Err(e) => e.to_compile_error().into(),
-    }
-}
diff --git a/src/entity/prelude.rs b/src/entity/prelude.rs
index 5d69a2ed..98089970 100644
--- a/src/entity/prelude.rs
+++ b/src/entity/prelude.rs
@@ -1,9 +1,9 @@
 pub use crate::{
     error::*, ActiveModelBehavior, ActiveModelTrait, ColumnDef, ColumnTrait, ColumnType,
     DeriveActiveModel, DeriveActiveModelBehavior, DeriveColumn, DeriveCustomColumn, DeriveEntity,
-    DeriveModel, DerivePrimaryKey, EntityModel, EntityName, EntityTrait, EnumIter, ForeignKeyAction, Iden,
-    IdenStatic, Linked, ModelTrait, PrimaryKeyToColumn, PrimaryKeyTrait, QueryFilter, QueryResult,
-    Related, RelationDef, RelationTrait, Select, Value,
+    DeriveEntityModel, DeriveModel, DerivePrimaryKey, EntityName, EntityTrait, EnumIter,
+    ForeignKeyAction, Iden, IdenStatic, Linked, ModelTrait, PrimaryKeyToColumn, PrimaryKeyTrait,
+    QueryFilter, QueryResult, Related, RelationDef, RelationTrait, Select, Value,
 };
 
 #[cfg(feature = "with-json")]
diff --git a/src/lib.rs b/src/lib.rs
index f6245ae5..b2bbb019 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -227,7 +227,7 @@ pub use query::*;
 
 pub use sea_orm_macros::{
     DeriveActiveModel, DeriveActiveModelBehavior, DeriveColumn, DeriveCustomColumn, DeriveEntity,
-    DeriveModel, DerivePrimaryKey, FromQueryResult, EntityModel,
+    DeriveEntityModel, DeriveModel, DerivePrimaryKey, FromQueryResult,
 };
 
 pub use sea_query;