Make sure scripts don't crash when no database present.

This commit is contained in:
James Cole
2016-11-07 20:25:09 +01:00
parent f653bc5f6e
commit 5b8583dd2b
2 changed files with 13 additions and 0 deletions

View File

@@ -20,6 +20,7 @@ use FireflyIII\Models\TransactionJournal;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Database\QueryException; use Illuminate\Database\QueryException;
use Log; use Log;
use Schema;
/** /**
* Class UpgradeDatabase * Class UpgradeDatabase
@@ -65,6 +66,12 @@ class UpgradeDatabase extends Command
*/ */
private function setTransactionIdentifier() private function setTransactionIdentifier()
{ {
// if table does not exist, return false
if (!Schema::hasTable('transaction_journals')) {
return;
}
$subQuery = TransactionJournal $subQuery = TransactionJournal
::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id') ::leftJoin('transactions', 'transactions.transaction_journal_id', '=', 'transaction_journals.id')
->whereNull('transaction_journals.deleted_at') ->whereNull('transaction_journals.deleted_at')

View File

@@ -26,6 +26,7 @@ use FireflyIII\Repositories\User\UserRepositoryInterface;
use FireflyIII\User; use FireflyIII\User;
use Illuminate\Console\Command; use Illuminate\Console\Command;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Schema;
use stdClass; use stdClass;
/** /**
@@ -61,6 +62,11 @@ class VerifyDatabase extends Command
*/ */
public function handle() public function handle()
{ {
// if table does not exist, return false
if (!Schema::hasTable('users')) {
return;
}
// accounts with no transactions. // accounts with no transactions.
$this->reportAccounts(); $this->reportAccounts();
// budgets with no limits // budgets with no limits