From b100e32ffd98563e6fcecba7127b9b6a832079ea Mon Sep 17 00:00:00 2001
From: Billy Chan <ccw.billy.123@gmail.com>
Date: Mon, 6 Sep 2021 22:41:01 +0800
Subject: [PATCH] Rename `entity_to_table_create_statement`

---
 src/entity/mod.rs                          | 2 --
 src/lib.rs                                 | 2 ++
 src/{entity/schema.rs => schema/entity.rs} | 8 ++++----
 src/schema/mod.rs                          | 3 +++
 tests/common/setup/schema.rs               | 9 ++-------
 5 files changed, 11 insertions(+), 13 deletions(-)
 rename src/{entity/schema.rs => schema/entity.rs} (94%)
 create mode 100644 src/schema/mod.rs

diff --git a/src/entity/mod.rs b/src/entity/mod.rs
index 47eb4fa5..6da5e1b6 100644
--- a/src/entity/mod.rs
+++ b/src/entity/mod.rs
@@ -6,7 +6,6 @@ mod model;
 pub mod prelude;
 mod primary_key;
 mod relation;
-mod schema;
 
 pub use active_model::*;
 pub use base_entity::*;
@@ -16,4 +15,3 @@ pub use model::*;
 // pub use prelude::*;
 pub use primary_key::*;
 pub use relation::*;
-pub use schema::*;
diff --git a/src/lib.rs b/src/lib.rs
index 2573fc30..329ad4aa 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -214,6 +214,7 @@ pub mod entity;
 pub mod error;
 mod executor;
 pub mod query;
+pub mod schema;
 #[doc(hidden)]
 pub mod tests_cfg;
 mod util;
@@ -224,6 +225,7 @@ pub use entity::*;
 pub use error::*;
 pub use executor::*;
 pub use query::*;
+pub use schema::*;
 
 pub use sea_orm_macros::{
     DeriveActiveModel, DeriveActiveModelBehavior, DeriveColumn, DeriveCustomColumn, DeriveEntity,
diff --git a/src/entity/schema.rs b/src/schema/entity.rs
similarity index 94%
rename from src/entity/schema.rs
rename to src/schema/entity.rs
index 06c688a8..8ee0fc2b 100644
--- a/src/entity/schema.rs
+++ b/src/schema/entity.rs
@@ -4,7 +4,7 @@ use crate::{
 };
 use sea_query::{ColumnDef, ForeignKeyCreateStatement, Iden, Index, TableCreateStatement};
 
-pub fn entity_to_table_create_statement<E>(entity: E) -> TableCreateStatement
+pub fn create_table_from_entity<E>(entity: E) -> TableCreateStatement
 where
     E: EntityTrait,
 {
@@ -112,14 +112,14 @@ where
 
 #[cfg(test)]
 mod tests {
-    use crate::{entity_to_table_create_statement, tests_cfg::*};
+    use crate::{create_table_from_entity, tests_cfg::*};
     use pretty_assertions::assert_eq;
     use sea_query::*;
 
     #[test]
-    fn test_entity_to_table_create_statement() {
+    fn test_create_table_from_entity() {
         assert_eq!(
-            entity_to_table_create_statement(CakeFillingPrice).to_string(MysqlQueryBuilder),
+            create_table_from_entity(CakeFillingPrice).to_string(MysqlQueryBuilder),
             Table::create()
                 .table(CakeFillingPrice)
                 .if_not_exists()
diff --git a/src/schema/mod.rs b/src/schema/mod.rs
new file mode 100644
index 00000000..135a9f2a
--- /dev/null
+++ b/src/schema/mod.rs
@@ -0,0 +1,3 @@
+mod entity;
+
+pub use entity::*;
diff --git a/tests/common/setup/schema.rs b/tests/common/setup/schema.rs
index e3844dd2..b1f0ae2d 100644
--- a/tests/common/setup/schema.rs
+++ b/tests/common/setup/schema.rs
@@ -1,8 +1,6 @@
 pub use super::super::bakery_chain::*;
 use pretty_assertions::assert_eq;
-use sea_orm::{
-    entity_to_table_create_statement, error::*, sea_query, DbConn, EntityTrait, ExecResult,
-};
+use sea_orm::{create_table_from_entity, error::*, sea_query, DbConn, EntityTrait, ExecResult};
 use sea_query::{ColumnDef, ForeignKey, ForeignKeyAction, Index, Table, TableCreateStatement};
 
 async fn create_table<E>(
@@ -15,10 +13,7 @@ where
 {
     let builder = db.get_database_backend();
     let stmt = builder.build(stmt);
-    assert_eq!(
-        builder.build(&entity_to_table_create_statement(entity)),
-        stmt
-    );
+    assert_eq!(builder.build(&create_table_from_entity(entity)), stmt);
     db.execute(stmt).await
 }