diff --git a/lib/Internal/Database/Model.hs b/lib/Internal/Database/Model.hs index e508a36..4f75b72 100644 --- a/lib/Internal/Database/Model.hs +++ b/lib/Internal/Database/Model.hs @@ -59,15 +59,15 @@ SplitR sql=splits memo T.Text value Rational deriving Show Eq -BudgetLabelR +BudgetLabelR sql=budget_labels split SplitRId - name T.Text + budgetName T.Text deriving Show Eq -ExpenseBucketR +ExpenseBucketR sql=expense_buckets budgetLabel BudgetLabelRId bucket ExpenseBucket deriving Show Eq -IncomeBucketR +IncomeBucketR sql=income_buckets budgetLabel BudgetLabelRId bucket IncomeBucket deriving Show Eq diff --git a/lib/Internal/Database/Ops.hs b/lib/Internal/Database/Ops.hs index 2c1c3d5..178bece 100644 --- a/lib/Internal/Database/Ops.hs +++ b/lib/Internal/Database/Ops.hs @@ -102,7 +102,7 @@ nukeTables = do hashConfig :: Config -> [Int] hashConfig Config_ - { budget = Budget {expenses = xs, income = is} + { budget = Budget {transfers = xs, income = is} , statements = ss } = (hash <$> xs) ++ (hash <$> is) ++ (hash <$> ms) ++ (hash <$> ps) diff --git a/lib/Internal/Insert.hs b/lib/Internal/Insert.hs index 97c0e0e..512f958 100644 --- a/lib/Internal/Insert.hs +++ b/lib/Internal/Insert.hs @@ -95,7 +95,7 @@ askBounds = (liftIO . resolveBounds) =<< asks kmBudgetInterval -- budget insertBudget :: MonadUnliftIO m => Budget -> MappingT m [InsertError] -insertBudget Budget {income = is, expenses = es} = do +insertBudget Budget {income = is, transfers = es} = do es1 <- mapM insertIncome is es2 <- mapM insertTransfer es return $ concat $ es1 ++ es2