From 122525543167c6cb544a537cb7c4dc0b9abafa2f Mon Sep 17 00:00:00 2001 From: Chris Tsang Date: Wed, 14 Sep 2022 00:28:24 +0800 Subject: [PATCH] Address comments --- issues/324/src/model.rs | 2 +- issues/400/src/model.rs | 2 +- src/driver/sqlx_mysql.rs | 12 ++++++------ src/driver/sqlx_postgres.rs | 12 ++++++------ src/driver/sqlx_sqlite.rs | 12 ++++++------ src/error.rs | 12 ++++++------ src/executor/insert.rs | 2 +- src/executor/query.rs | 4 ++-- src/executor/update.rs | 2 +- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/issues/324/src/model.rs b/issues/324/src/model.rs index 1a2720be..8b335c25 100644 --- a/issues/324/src/model.rs +++ b/issues/324/src/model.rs @@ -26,7 +26,7 @@ macro_rules! impl_try_from_u64_err { ($newtype: ident) => { impl sea_orm::TryFromU64 for $newtype { fn try_from_u64(_n: u64) -> Result { - Err(sea_orm::DbErr::CannotConvertFromU64(stringify!($newtype))) + Err(sea_orm::DbErr::ConvertFromU64(stringify!($newtype))) } } }; diff --git a/issues/400/src/model.rs b/issues/400/src/model.rs index 134397ac..28a44d64 100644 --- a/issues/400/src/model.rs +++ b/issues/400/src/model.rs @@ -31,7 +31,7 @@ impl From> for Uuid { impl sea_orm::TryFromU64 for AccountId { fn try_from_u64(_n: u64) -> Result { - Err(sea_orm::DbErr::CannotConvertFromU64(stringify!(AccountId))) + Err(sea_orm::DbErr::ConvertFromU64(stringify!(AccountId))) } } diff --git a/src/driver/sqlx_mysql.rs b/src/driver/sqlx_mysql.rs index c15197a4..e3d0ddbf 100644 --- a/src/driver/sqlx_mysql.rs +++ b/src/driver/sqlx_mysql.rs @@ -89,7 +89,7 @@ impl SqlxMySqlPoolConnection { } }) } else { - Err(DbErr::ConnFromPool) + Err(DbErr::ConnectionAcquire) } } @@ -110,7 +110,7 @@ impl SqlxMySqlPoolConnection { } }) } else { - Err(DbErr::ConnFromPool) + Err(DbErr::ConnectionAcquire) } } @@ -128,7 +128,7 @@ impl SqlxMySqlPoolConnection { } }) } else { - Err(DbErr::ConnFromPool) + Err(DbErr::ConnectionAcquire) } } @@ -144,7 +144,7 @@ impl SqlxMySqlPoolConnection { self.metric_callback.clone(), ))) } else { - Err(DbErr::ConnFromPool) + Err(DbErr::ConnectionAcquire) } } @@ -154,7 +154,7 @@ impl SqlxMySqlPoolConnection { if let Ok(conn) = self.pool.acquire().await { DatabaseTransaction::new_mysql(conn, self.metric_callback.clone()).await } else { - Err(DbErr::ConnFromPool) + Err(DbErr::ConnectionAcquire) } } @@ -175,7 +175,7 @@ impl SqlxMySqlPoolConnection { .map_err(|e| TransactionError::Connection(e))?; transaction.run(callback).await } else { - Err(TransactionError::Connection(DbErr::ConnFromPool)) + Err(TransactionError::Connection(DbErr::ConnectionAcquire)) } } diff --git a/src/driver/sqlx_postgres.rs b/src/driver/sqlx_postgres.rs index 78cc4f3c..085abaa8 100644 --- a/src/driver/sqlx_postgres.rs +++ b/src/driver/sqlx_postgres.rs @@ -89,7 +89,7 @@ impl SqlxPostgresPoolConnection { } }) } else { - Err(DbErr::ConnFromPool) + Err(DbErr::ConnectionAcquire) } } @@ -110,7 +110,7 @@ impl SqlxPostgresPoolConnection { } }) } else { - Err(DbErr::ConnFromPool) + Err(DbErr::ConnectionAcquire) } } @@ -128,7 +128,7 @@ impl SqlxPostgresPoolConnection { } }) } else { - Err(DbErr::ConnFromPool) + Err(DbErr::ConnectionAcquire) } } @@ -144,7 +144,7 @@ impl SqlxPostgresPoolConnection { self.metric_callback.clone(), ))) } else { - Err(DbErr::ConnFromPool) + Err(DbErr::ConnectionAcquire) } } @@ -154,7 +154,7 @@ impl SqlxPostgresPoolConnection { if let Ok(conn) = self.pool.acquire().await { DatabaseTransaction::new_postgres(conn, self.metric_callback.clone()).await } else { - Err(DbErr::ConnFromPool) + Err(DbErr::ConnectionAcquire) } } @@ -175,7 +175,7 @@ impl SqlxPostgresPoolConnection { .map_err(|e| TransactionError::Connection(e))?; transaction.run(callback).await } else { - Err(TransactionError::Connection(DbErr::ConnFromPool)) + Err(TransactionError::Connection(DbErr::ConnectionAcquire)) } } diff --git a/src/driver/sqlx_sqlite.rs b/src/driver/sqlx_sqlite.rs index f2b17a95..36e9dfa4 100644 --- a/src/driver/sqlx_sqlite.rs +++ b/src/driver/sqlx_sqlite.rs @@ -96,7 +96,7 @@ impl SqlxSqlitePoolConnection { } }) } else { - Err(DbErr::ConnFromPool) + Err(DbErr::ConnectionAcquire) } } @@ -117,7 +117,7 @@ impl SqlxSqlitePoolConnection { } }) } else { - Err(DbErr::ConnFromPool) + Err(DbErr::ConnectionAcquire) } } @@ -135,7 +135,7 @@ impl SqlxSqlitePoolConnection { } }) } else { - Err(DbErr::ConnFromPool) + Err(DbErr::ConnectionAcquire) } } @@ -151,7 +151,7 @@ impl SqlxSqlitePoolConnection { self.metric_callback.clone(), ))) } else { - Err(DbErr::ConnFromPool) + Err(DbErr::ConnectionAcquire) } } @@ -161,7 +161,7 @@ impl SqlxSqlitePoolConnection { if let Ok(conn) = self.pool.acquire().await { DatabaseTransaction::new_sqlite(conn, self.metric_callback.clone()).await } else { - Err(DbErr::ConnFromPool) + Err(DbErr::ConnectionAcquire) } } @@ -182,7 +182,7 @@ impl SqlxSqlitePoolConnection { .map_err(|e| TransactionError::Connection(e))?; transaction.run(callback).await } else { - Err(TransactionError::Connection(DbErr::ConnFromPool)) + Err(TransactionError::Connection(DbErr::ConnectionAcquire)) } } diff --git a/src/error.rs b/src/error.rs index 3f2e5375..e45b3834 100644 --- a/src/error.rs +++ b/src/error.rs @@ -7,7 +7,7 @@ use thiserror::Error; pub enum DbErr { /// This error can happen when the connection pool is fully-utilized #[error("Failed to acquire connection from pool")] - ConnFromPool, + ConnectionAcquire, /// Runtime type conversion error #[error("Error converting `{from}` into `{into}`: {source}")] TryIntoErr { @@ -20,14 +20,14 @@ pub enum DbErr { }, /// Type error: the specified type cannot be converted from u64. This is not a runtime error. #[error("Type '{0}' cannot be converted from u64")] - CannotConvertFromU64(&'static str), + ConvertFromU64(&'static str), /// After an insert statement it was impossible to retrieve the last_insert_id #[error("Failed to unpack last_insert_id")] - InsertCouldNotUnpackInsertId, + UnpackInsertId, /// When updating, a model should know it's primary key to check /// if the record has been correctly updated, otherwise this error will occur #[error("Failed to get primary key from model")] - UpdateCouldNotGetPrimaryKey, + UpdateGetPrimeryKey, /// There was a problem with the database connection #[error("Connection Error: {0}")] Conn(#[source] RuntimeErr), @@ -57,12 +57,12 @@ pub enum DbErr { /// Runtime error #[derive(Error, Debug)] pub enum RuntimeErr { - #[cfg(feature = "sqlx-dep")] /// SQLx Error + #[cfg(feature = "sqlx-dep")] #[error("{0}")] SqlxError(SqlxError), - #[error("{0}")] /// Error generated from within SeaORM + #[error("{0}")] Internal(String), } diff --git a/src/executor/insert.rs b/src/executor/insert.rs index f7bb0629..33d0d4ed 100644 --- a/src/executor/insert.rs +++ b/src/executor/insert.rs @@ -130,7 +130,7 @@ where Some(value_tuple) => FromValueTuple::from_value_tuple(value_tuple), None => match last_insert_id_opt { Some(last_insert_id) => last_insert_id, - None => return Err(DbErr::InsertCouldNotUnpackInsertId), + None => return Err(DbErr::UnpackInsertId), }, }; Ok(InsertResult { last_insert_id }) diff --git a/src/executor/query.rs b/src/executor/query.rs index 90697fb3..3b53542b 100644 --- a/src/executor/query.rs +++ b/src/executor/query.rs @@ -709,7 +709,7 @@ macro_rules! try_from_u64_err { ( $type: ty ) => { impl TryFromU64 for $type { fn try_from_u64(_: u64) -> Result { - Err(DbErr::CannotConvertFromU64(stringify!($type))) + Err(DbErr::ConvertFromU64(stringify!($type))) } } }; @@ -720,7 +720,7 @@ macro_rules! try_from_u64_err { $( $gen_type: TryFromU64, )* { fn try_from_u64(_: u64) -> Result { - Err(DbErr::CannotConvertFromU64(stringify!($($gen_type,)*))) + Err(DbErr::ConvertFromU64(stringify!($($gen_type,)*))) } } }; diff --git a/src/executor/update.rs b/src/executor/update.rs index 1edd9461..7fa8b242 100644 --- a/src/executor/update.rs +++ b/src/executor/update.rs @@ -122,7 +122,7 @@ where Updater::new(query).check_record_exists().exec(db).await?; let primary_key_value = match model.get_primary_key_value() { Some(val) => FromValueTuple::from_value_tuple(val), - None => return Err(DbErr::UpdateCouldNotGetPrimaryKey), + None => return Err(DbErr::UpdateGetPrimeryKey), }; let found = ::find_by_id(primary_key_value) .one(db)