From d37b46effc500f469ea3b2954dac3b2913586361 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sun, 4 Jun 2017 08:48:54 +0200
Subject: [PATCH] Database upgrade routine.
---
app/Console/Commands/UpgradeDatabase.php | 52 ++++++++++++++++++++++--
1 file changed, 49 insertions(+), 3 deletions(-)
diff --git a/app/Console/Commands/UpgradeDatabase.php b/app/Console/Commands/UpgradeDatabase.php
index aa2656b712..2c3a20f3a0 100644
--- a/app/Console/Commands/UpgradeDatabase.php
+++ b/app/Console/Commands/UpgradeDatabase.php
@@ -32,6 +32,7 @@ use Illuminate\Database\QueryException;
use Log;
use Preferences;
use Schema;
+use Steam;
/**
* Class UpgradeDatabase
@@ -72,9 +73,54 @@ class UpgradeDatabase extends Command
$this->repairPiggyBanks();
$this->updateAccountCurrencies();
$this->updateJournalCurrencies();
+ $this->currencyInfoToTransactions();
$this->info('Firefly III database is up to date.');
}
+ /**
+ * Moves the currency id info to the transaction instead of the journal.
+ */
+ private function currencyInfoToTransactions()
+ {
+ $count = 0;
+ $expanded = 0;
+ $set = TransactionJournal::with('transactions')->get();
+ /** @var TransactionJournal $journal */
+ foreach ($set as $journal) {
+ /** @var Transaction $transaction */
+ foreach ($journal->transactions as $transaction) {
+ if (is_null($transaction->transaction_currency_id)) {
+ $transaction->transaction_currency_id = $journal->transaction_currency_id;
+ $transaction->save();
+ $count++;
+ }
+ }
+
+
+ // read and use the foreign amounts when present.
+ if ($journal->hasMeta('foreign_amount')) {
+ $amount = Steam::positive($journal->getMeta('foreign_amount'));
+
+ // update both transactions:
+ foreach ($journal->transactions as $transaction) {
+ $transaction->foreign_amount = $amount;
+ if (bccomp($transaction->amount, '0') === -1) {
+ // update with negative amount:
+ $transaction->foreign_amount = bcmul($amount, '-1');
+ }
+ // set foreign currency id:
+ $transaction->foreign_currency_id = intval($journal->getMeta('foreign_currency_id'));
+ $transaction->save();
+ }
+ $journal->deleteMeta('foreign_amount');
+ $journal->deleteMeta('foreign_currency_id');
+ }
+
+ }
+
+ $this->line(sprintf('Updated currency information for %d transactions', $count));
+ }
+
/**
* Migrate budget repetitions to new format.
*/
@@ -269,7 +315,7 @@ class UpgradeDatabase extends Command
$repository = app(CurrencyRepositoryInterface::class);
$notification = '%s #%d uses %s but should use %s. It has been updated. Please verify this in Firefly III.';
$transfer = 'Transfer #%d has been updated to use the correct currencies. Please verify this in Firefly III.';
- $driver = DB::connection()->getDriverName();
+ $driver = DB::connection()->getDriverName();
foreach ($types as $type => $operator) {
$query = TransactionJournal
@@ -282,10 +328,10 @@ class UpgradeDatabase extends Command
->leftJoin('account_meta', 'account_meta.account_id', '=', 'accounts.id')
->where('transaction_types.type', $type)
->where('account_meta.name', 'currency_id');
- if($driver === 'postgresql') {
+ if ($driver === 'postgresql') {
$query->where('transaction_journals.transaction_currency_id', '!=', DB::raw('cast(account_meta.data as int)'));
}
- if($driver !== 'postgresql') {
+ if ($driver !== 'postgresql') {
$query->where('transaction_journals.transaction_currency_id', '!=', DB::raw('account_meta.data'));
}