Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cont. added reexports for sqlx errors #1434

Merged
merged 3 commits into from
Jan 31, 2023
Merged

Cont. added reexports for sqlx errors #1434

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1a377be
added reexports for sqlx errors (#1181)
junbl Jan 30, 2023
c800e79
Re-export SQLx error types
billy1624 Jan 30, 2023
2d424af
Apply suggestions from code review
tyt2y3 Jan 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
#[cfg(feature = "sqlx-dep")]
use sqlx::error::Error as SqlxError;
#[cfg(all(feature = "sea-orm-internal", feature = "sqlx-dep"))]
pub use sqlx::error::Error as SqlxError;

#[cfg(all(feature = "sea-orm-internal", feature = "sqlx-mysql"))]
pub use sqlx::mysql::MySqlDatabaseError as SqlxMySqlError;

#[cfg(all(feature = "sea-orm-internal", feature = "sqlx-postgres"))]
pub use sqlx::postgres::PgDatabaseError as SqlxPostgresError;

#[cfg(all(feature = "sea-orm-internal", feature = "sqlx-sqlite"))]
pub use sqlx::sqlite::SqliteError as SqlxSqliteError;

use thiserror::Error;

/// An error from unsuccessful database operations
Expand Down Expand Up @@ -71,7 +81,7 @@ pub enum RuntimeErr {
/// SQLx Error
#[cfg(feature = "sqlx-dep")]
#[error("{0}")]
SqlxError(SqlxError),
SqlxError(sqlx::error::Error),
/// Error generated from within SeaORM
#[error("{0}")]
Internal(String),
Expand Down