Feature guard macros

SeaQL · Sep 30, 2021 · ca296bc · ca296bc
1 parent fcd969e
commit ca296bc
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 7 deletions.
diff --git a/src/entity/prelude.rs b/src/entity/prelude.rs
@@ -1,9 +1,14 @@
 pub use crate::{
     error::*, ActiveModelBehavior, ActiveModelTrait, ColumnDef, ColumnTrait, ColumnType,
+    EntityName, EntityTrait, EnumIter, ForeignKeyAction, Iden, IdenStatic, Linked, ModelTrait,
+    PrimaryKeyToColumn, PrimaryKeyTrait, QueryFilter, QueryResult, Related, RelationDef,
+    RelationTrait, Select, Value,
+};
+
+#[cfg(feature = "macros")]
+pub use crate::{
     DeriveActiveModel, DeriveActiveModelBehavior, DeriveColumn, DeriveCustomColumn, DeriveEntity,
-    DeriveEntityModel, DeriveModel, DerivePrimaryKey, DeriveRelation, EntityName, EntityTrait,
-    EnumIter, ForeignKeyAction, Iden, IdenStatic, Linked, ModelTrait, PrimaryKeyToColumn,
-    PrimaryKeyTrait, QueryFilter, QueryResult, Related, RelationDef, RelationTrait, Select, Value,
+    DeriveEntityModel, DeriveModel, DerivePrimaryKey, DeriveRelation,
 };
 
 #[cfg(feature = "with-json")]

diff --git a/src/executor/query.rs b/src/executor/query.rs
@@ -304,7 +304,7 @@ pub trait TryGetableMany: Sized {
     fn try_get_many(res: &QueryResult, pre: &str, cols: &[String]) -> Result<Self, TryGetError>;
 
     /// ```
-    /// # #[cfg(feature = "mock")]
+    /// # #[cfg(all(feature = "mock", feature = "macros"))]
     /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend};
     /// #
     /// # let db = MockDatabase::new(DbBackend::Postgres)

diff --git a/src/executor/select.rs b/src/executor/select.rs
@@ -127,7 +127,7 @@ where
     }
 
     /// ```
-    /// # #[cfg(feature = "mock")]
+    /// # #[cfg(all(feature = "mock", feature = "macros"))]
     /// # use sea_orm::{error::*, tests_cfg::*, MockDatabase, Transaction, DbBackend};
     /// #
     /// # let db = MockDatabase::new(DbBackend::Postgres)

diff --git a/src/lib.rs b/src/lib.rs
@@ -243,13 +243,13 @@
 //!     pub id: i32,
 //!     pub name: String,
 //! }
-//! 
+//!
 //! #[derive(Copy, Clone, Debug, EnumIter, DeriveRelation)]
 //! pub enum Relation {
 //!     #[sea_orm(has_many = "super::fruit::Entity")]
 //!     Fruit,
 //! }
-//! 
+//!
 //! impl Related<super::fruit::Entity> for Entity {
 //!     fn to() -> RelationDef {
 //!         Relation::Fruit.def()
@@ -433,14 +433,17 @@ pub use executor::*;
 pub use query::*;
 pub use schema::*;
 
+#[cfg(feature = "macros")]
 pub use sea_orm_macros::{
     DeriveActiveModel, DeriveActiveModelBehavior, DeriveColumn, DeriveCustomColumn, DeriveEntity,
     DeriveEntityModel, DeriveModel, DerivePrimaryKey, DeriveRelation, FromQueryResult,
 };
 
 pub use sea_query;
 pub use sea_query::Iden;
+#[cfg(feature = "macros")]
 pub use sea_query::Iden as DeriveIden;
 
 pub use sea_strum;
+#[cfg(feature = "macros")]
 pub use sea_strum::EnumIter;