From e2742eee27e253d5d949452ca3411c28b52e7e7d Mon Sep 17 00:00:00 2001 From: Rogier Reerink Date: Sun, 27 Sep 2026 22:08:56 +0200 Subject: [PATCH] Cleaned up constraints a little. --- server/src/database.rs | 15 +++++++++------ server/src/repository/accounts.rs | 2 +- server/src/repository/recurring_transactions.rs | 2 +- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/server/src/database.rs b/server/src/database.rs index b4b3c24..161105a 100644 --- a/server/src/database.rs +++ b/server/src/database.rs @@ -23,7 +23,7 @@ impl From for DatabaseError { let constraint = db_err .constraint() .map(Constraint::from) - .unwrap_or(Constraint::Unknown(None)); + .unwrap_or(Constraint::Unnamed); DatabaseError::ForeignKeyViolation { constraint, @@ -37,14 +37,17 @@ impl From for DatabaseError { #[derive(Debug, Clone, PartialEq, Eq, thiserror::Error)] pub enum Constraint { - #[error("recurring transaction source account constraint violation")] + #[error("recurring transaction source account constraint")] RecurringTransactionSourceAccount, - #[error("recurring transaction destination account constraint violation")] + #[error("recurring transaction destination account constraint")] RecurringTransactionDestinationAccount, - #[error("unknown constraint violation: {0:?}")] - Unknown(Option), + #[error("unknown constraint ({0:?})")] + Unknown(String), + + #[error("unnamed constraint")] + Unnamed, } impl From<&str> for Constraint { @@ -56,7 +59,7 @@ impl From<&str> for Constraint { "fk_recurring_transactions_destination_account" => { Constraint::RecurringTransactionDestinationAccount } - _ => Constraint::Unknown(Some(constraint.to_string())), + _ => Constraint::Unknown(constraint.to_string()), } } } diff --git a/server/src/repository/accounts.rs b/server/src/repository/accounts.rs index e8a9b90..2db73ba 100644 --- a/server/src/repository/accounts.rs +++ b/server/src/repository/accounts.rs @@ -185,7 +185,7 @@ mod tests { #[test] fn keeps_unknown_account_delete_foreign_keys_generic() { - let error = classify_delete_error(foreign_key_violation(Constraint::Unknown(None))); + let error = classify_delete_error(foreign_key_violation(Constraint::Unnamed)); assert!(matches!(error, RepositoryError::Database(_))); } diff --git a/server/src/repository/recurring_transactions.rs b/server/src/repository/recurring_transactions.rs index 426f3b2..6b907a3 100644 --- a/server/src/repository/recurring_transactions.rs +++ b/server/src/repository/recurring_transactions.rs @@ -210,7 +210,7 @@ mod tests { #[test] fn keeps_unknown_upsert_foreign_keys_generic() { - let error = classify_upsert_error(foreign_key_violation(Constraint::Unknown(None))); + let error = classify_upsert_error(foreign_key_violation(Constraint::Unnamed)); assert!(matches!(error, RepositoryError::Database(_))); }