diff options
| author | Joe Carstairs <jcarstairs@scottlogic.com> | 2025-08-13 18:44:20 +0100 |
|---|---|---|
| committer | Joe Carstairs <jcarstairs@scottlogic.com> | 2025-08-13 18:44:20 +0100 |
| commit | 8d714f760bd0349560d464583a151a04a19de1c9 (patch) | |
| tree | 7810edb6371251bfc109a30f8ca9e37fba001d73 /schist_core/schist_models/src | |
| parent | 6495038aba28c332050768cecf062418a25d5a96 (diff) | |
rename category -> bucket
Diffstat (limited to 'schist_core/schist_models/src')
| -rw-r--r-- | schist_core/schist_models/src/bucket.rs | 2 | ||||
| -rw-r--r-- | schist_core/schist_models/src/bucket_transfer.rs | 6 | ||||
| -rw-r--r-- | schist_core/schist_models/src/budget_drip.rs | 2 | ||||
| -rw-r--r-- | schist_core/schist_models/src/schema.rs | 20 | ||||
| -rw-r--r-- | schist_core/schist_models/src/transaction_categorisation.rs | 2 |
5 files changed, 16 insertions, 16 deletions
diff --git a/schist_core/schist_models/src/bucket.rs b/schist_core/schist_models/src/bucket.rs index f162405..1ee6a13 100644 --- a/schist_core/schist_models/src/bucket.rs +++ b/schist_core/schist_models/src/bucket.rs @@ -16,7 +16,7 @@ use crate::{budget_period_unit::BudgetPeriodUnit, date_utc::DateUtc}; Deserialize, Insertable, )] -#[diesel(table_name = crate::schema::categories)] +#[diesel(table_name = crate::schema::buckets)] pub struct Bucket { pub id: i32, pub name: String, diff --git a/schist_core/schist_models/src/bucket_transfer.rs b/schist_core/schist_models/src/bucket_transfer.rs index 5d2e268..bdf95d9 100644 --- a/schist_core/schist_models/src/bucket_transfer.rs +++ b/schist_core/schist_models/src/bucket_transfer.rs @@ -2,11 +2,11 @@ use derive_builder::Builder; use diesel::prelude::*; #[derive(Builder, Queryable, Identifiable, Selectable, Debug, PartialEq, Insertable)] -#[diesel(table_name = crate::schema::category_transfers)] +#[diesel(table_name = crate::schema::bucket_transfers)] pub struct BucketTransfer { pub id: i32, pub description: String, pub quantity: i32, - pub from_category_id: i32, - pub to_category_id: i32, + pub from_bucket_id: i32, + pub to_bucket_id: i32, } diff --git a/schist_core/schist_models/src/budget_drip.rs b/schist_core/schist_models/src/budget_drip.rs index 2cc2c63..419c8f9 100644 --- a/schist_core/schist_models/src/budget_drip.rs +++ b/schist_core/schist_models/src/budget_drip.rs @@ -8,7 +8,7 @@ use crate::date_utc::DateUtc; #[diesel(table_name = crate::schema::budget_drips)] pub struct BudgetDrip { pub id: i32, - pub category_id: i32, + pub bucket_id: i32, pub date: DateUtc, pub quantity: i32, } diff --git a/schist_core/schist_models/src/schema.rs b/schist_core/schist_models/src/schema.rs index 40af56f..1c9fc62 100644 --- a/schist_core/schist_models/src/schema.rs +++ b/schist_core/schist_models/src/schema.rs @@ -23,14 +23,14 @@ diesel::table! { diesel::table! { budget_drips (id) { id -> Integer, - category_id -> Integer, + bucket_id -> Integer, date -> Text, quantity -> Integer, } } diesel::table! { - categories (id) { + buckets (id) { id -> Integer, name -> Text, balance -> Integer, @@ -43,12 +43,12 @@ diesel::table! { } diesel::table! { - category_transfers (id) { + bucket_transfers (id) { id -> Integer, description -> Text, quantity -> Integer, - from_category_id -> Integer, - to_category_id -> Integer, + from_bucket_id -> Integer, + to_bucket_id -> Integer, } } @@ -58,7 +58,7 @@ diesel::table! { description -> Text, quantity -> Integer, transaction_id -> Integer, - category_id -> Integer, + bucket_id -> Integer, } } @@ -73,8 +73,8 @@ diesel::table! { } } -diesel::joinable!(budget_drips -> categories (category_id)); -diesel::joinable!(transaction_categorisations -> categories (category_id)); +diesel::joinable!(budget_drips -> buckets (bucket_id)); +diesel::joinable!(transaction_categorisations -> buckets (bucket_id)); diesel::joinable!(transaction_categorisations -> transactions (transaction_id)); diesel::joinable!(transactions -> accounts (account_id)); @@ -82,8 +82,8 @@ diesel::allow_tables_to_appear_in_same_query!( account_transfers, accounts, budget_drips, - categories, - category_transfers, + buckets, + bucket_transfers, transaction_categorisations, transactions, ); diff --git a/schist_core/schist_models/src/transaction_categorisation.rs b/schist_core/schist_models/src/transaction_categorisation.rs index c6ac6ea..36752ee 100644 --- a/schist_core/schist_models/src/transaction_categorisation.rs +++ b/schist_core/schist_models/src/transaction_categorisation.rs @@ -8,5 +8,5 @@ pub struct TransactionCategorisation { pub description: String, pub quantity: i32, pub transaction_id: i32, - pub category_id: i32, + pub bucket_id: i32, } |
