diff --git a/src/entity/prelude.rs b/src/entity/prelude.rs index fb326808..003ddcd0 100644 --- a/src/entity/prelude.rs +++ b/src/entity/prelude.rs @@ -12,8 +12,8 @@ pub use crate::{ pub use crate::{ DeriveActiveEnum, DeriveActiveModel, DeriveActiveModelBehavior, DeriveColumn, DeriveCustomColumn, DeriveDisplay, DeriveEntity, DeriveEntityModel, DeriveIden, - DeriveIntoActiveModel, DeriveModel, DerivePrimaryKey, DeriveRelatedEntity, DeriveRelation, - FromJsonQueryResult, + DeriveIntoActiveModel, DeriveModel, DerivePartialModel, DerivePrimaryKey, DeriveRelatedEntity, + DeriveRelation, DeriveValueType, }; pub use async_trait; diff --git a/src/lib.rs b/src/lib.rs index cdf5bb3d..f7367f02 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -351,7 +351,7 @@ pub use sea_orm_macros::{ DeriveActiveEnum, DeriveActiveModel, DeriveActiveModelBehavior, DeriveColumn, DeriveCustomColumn, DeriveDisplay, DeriveEntity, DeriveEntityModel, DeriveIden, DeriveIntoActiveModel, DeriveMigrationName, DeriveModel, DerivePartialModel, DerivePrimaryKey, - DeriveRelatedEntity, DeriveRelation, FromJsonQueryResult, FromQueryResult, + DeriveRelatedEntity, DeriveRelation, DeriveValueType, FromJsonQueryResult, FromQueryResult, }; pub use sea_query; diff --git a/tests/common/features/json_struct.rs b/tests/common/features/json_struct.rs index 44235d1b..b291a22d 100644 --- a/tests/common/features/json_struct.rs +++ b/tests/common/features/json_struct.rs @@ -1,4 +1,5 @@ use sea_orm::entity::prelude::*; +use sea_orm::FromJsonQueryResult; use serde::{Deserialize, Serialize}; #[derive(Clone, Debug, PartialEq, DeriveEntityModel)] diff --git a/tests/common/features/value_type.rs b/tests/common/features/value_type.rs index f0efb9dc..783a7ae2 100644 --- a/tests/common/features/value_type.rs +++ b/tests/common/features/value_type.rs @@ -36,7 +36,6 @@ pub mod value_type_pg { } use sea_orm::entity::prelude::*; -use sea_orm_macros::DeriveValueType; #[derive(Clone, Debug, PartialEq, Eq, DeriveValueType)] #[sea_orm(array_type = "Int")] diff --git a/tests/derive_iden_tests.rs b/tests/derive_iden_tests.rs index e45adda7..12dd6fe0 100644 --- a/tests/derive_iden_tests.rs +++ b/tests/derive_iden_tests.rs @@ -1,7 +1,6 @@ pub mod common; pub use common::{features::*, setup::*, TestContext}; use sea_orm::entity::prelude::*; -use sea_orm_macros::DeriveIden; #[derive(DeriveIden)] pub enum ClassName { @@ -13,6 +12,7 @@ pub enum ClassName { #[derive(DeriveIden)] pub enum Book { + #[sea_orm(iden = "book_table")] Table, Id, #[sea_orm(iden = "turtle")] @@ -38,7 +38,7 @@ fn main() -> Result<(), DbErr> { assert_eq!(ClassName::Text.to_string(), "text"); assert_eq!(Book::Id.to_string(), "id"); - assert_eq!(Book::Table.to_string(), "book"); + assert_eq!(Book::Table.to_string(), "book_table"); assert_eq!(Book::Title.to_string(), "turtle"); assert_eq!(Book::Text.to_string(), "TeXt"); assert_eq!(Book::Type.to_string(), "ty_pe");