diff --git a/examples/actix4_example/src/main.rs b/examples/actix4_example/src/main.rs index c30b20d7..6a52b81b 100644 --- a/examples/actix4_example/src/main.rs +++ b/examples/actix4_example/src/main.rs @@ -5,7 +5,7 @@ use actix_web::{ use listenfd::ListenFd; use sea_orm::DatabaseConnection; -use sea_orm::{entity::*, query::*, PaginatorTrait}; +use sea_orm::{entity::*, query::*}; use serde::{Deserialize, Serialize}; use std::env; use tera::Tera; diff --git a/examples/actix_example/src/main.rs b/examples/actix_example/src/main.rs index e7bae507..e2d1e956 100644 --- a/examples/actix_example/src/main.rs +++ b/examples/actix_example/src/main.rs @@ -4,7 +4,7 @@ use actix_web::{ }; use listenfd::ListenFd; use sea_orm::DatabaseConnection; -use sea_orm::{entity::*, query::*, PaginatorTrait}; +use sea_orm::{entity::*, query::*}; use serde::{Deserialize, Serialize}; use std::env; use tera::Tera; diff --git a/examples/axum_example/src/main.rs b/examples/axum_example/src/main.rs index fd07fa72..7b0b428e 100644 --- a/examples/axum_example/src/main.rs +++ b/examples/axum_example/src/main.rs @@ -12,7 +12,7 @@ use axum::{ }; use flash::{get_flash_cookie, post_response, PostResponse}; use post::Entity as Post; -use sea_orm::{prelude::*, Database, QueryOrder, Set, PaginatorTrait}; +use sea_orm::{prelude::*, Database, QueryOrder, Set}; use serde::{Deserialize, Serialize}; use std::str::FromStr; use std::{env, net::SocketAddr}; diff --git a/examples/basic/src/select.rs b/examples/basic/src/select.rs index ae7e1912..ce26f9e2 100644 --- a/examples/basic/src/select.rs +++ b/examples/basic/src/select.rs @@ -1,5 +1,5 @@ use super::*; -use sea_orm::{entity::*, error::*, query::*, DbConn, FromQueryResult, PaginatorTrait}; +use sea_orm::{entity::*, error::*, query::*, DbConn, FromQueryResult}; pub async fn all_about_select(db: &DbConn) -> Result<(), DbErr> { find_all(db).await?; diff --git a/examples/rocket_example/src/main.rs b/examples/rocket_example/src/main.rs index df3e841f..e0b01bea 100644 --- a/examples/rocket_example/src/main.rs +++ b/examples/rocket_example/src/main.rs @@ -9,7 +9,7 @@ use rocket::response::{Flash, Redirect}; use rocket::{Build, Request, Rocket}; use rocket_dyn_templates::{context, Template}; -use sea_orm::{entity::*, query::*, PaginatorTrait}; +use sea_orm::{entity::*, query::*}; use sea_orm_rocket::{Connection, Database}; mod pool; diff --git a/src/entity/mod.rs b/src/entity/mod.rs index 6b413bdf..f85f1ee1 100644 --- a/src/entity/mod.rs +++ b/src/entity/mod.rs @@ -117,3 +117,6 @@ pub use model::*; // pub use prelude::*; pub use primary_key::*; pub use relation::*; + +// Imports paginator utility by default making it backward compatible. +pub use crate::PaginatorTrait; diff --git a/src/entity/prelude.rs b/src/entity/prelude.rs index 211cf853..28f5fe70 100644 --- a/src/entity/prelude.rs +++ b/src/entity/prelude.rs @@ -1,8 +1,8 @@ pub use crate::{ error::*, ActiveEnum, ActiveModelBehavior, ActiveModelTrait, ColumnDef, ColumnTrait, ColumnType, DatabaseConnection, DbConn, EntityName, EntityTrait, EnumIter, ForeignKeyAction, - Iden, IdenStatic, Linked, ModelTrait, PrimaryKeyToColumn, PrimaryKeyTrait, QueryFilter, - QueryResult, Related, RelationDef, RelationTrait, Select, Value, + Iden, IdenStatic, Linked, ModelTrait, PaginatorTrait, PrimaryKeyToColumn, PrimaryKeyTrait, + QueryFilter, QueryResult, Related, RelationDef, RelationTrait, Select, Value, }; #[cfg(feature = "macros")] diff --git a/src/executor/paginator.rs b/src/executor/paginator.rs index 7216d45c..c8bd503a 100644 --- a/src/executor/paginator.rs +++ b/src/executor/paginator.rs @@ -98,7 +98,7 @@ where /// /// ```rust /// # #[cfg(feature = "mock")] - /// # use sea_orm::{error::*, MockDatabase, DbBackend, PaginatorTrait}; + /// # use sea_orm::{error::*, MockDatabase, DbBackend}; /// # let owned_db = MockDatabase::new(DbBackend::Postgres).into_connection(); /// # let db = &owned_db; /// # let _: Result<(), DbErr> = smol::block_on(async { @@ -126,7 +126,7 @@ where /// /// ```rust /// # #[cfg(feature = "mock")] - /// # use sea_orm::{error::*, MockDatabase, DbBackend, PaginatorTrait}; + /// # use sea_orm::{error::*, MockDatabase, DbBackend}; /// # let owned_db = MockDatabase::new(DbBackend::Postgres).into_connection(); /// # let db = &owned_db; /// # let _: Result<(), DbErr> = smol::block_on(async { diff --git a/tests/basic.rs b/tests/basic.rs index 4b6f5b0c..ef379779 100644 --- a/tests/basic.rs +++ b/tests/basic.rs @@ -1,8 +1,6 @@ pub mod common; -pub use sea_orm::{ - entity::*, error::*, query::*, sea_query, tests_cfg::*, Database, DbConn, PaginatorTrait, -}; +pub use sea_orm::{entity::*, error::*, query::*, sea_query, tests_cfg::*, Database, DbConn}; // cargo test --features sqlx-sqlite,runtime-async-std-native-tls --test basic #[sea_orm_macros::test] diff --git a/tests/crud/updates.rs b/tests/crud/updates.rs index 4a3a05a0..262031ef 100644 --- a/tests/crud/updates.rs +++ b/tests/crud/updates.rs @@ -1,6 +1,6 @@ pub use super::*; use rust_decimal_macros::dec; -use sea_orm::{DbErr, PaginatorTrait}; +use sea_orm::DbErr; use uuid::Uuid; pub async fn test_update_cake(db: &DbConn) {