IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix sql query error and upgrade error.

Browse Source
This commit is contained in:
James Cole 2025-01-05 14:33:33 +01:00
parent d08d075e30
commit abb25e2015
No known key found for this signature in database
GPG Key ID: B49A324B7EAD6D80
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/Console/Commands/System/CreatesDatabase.php
View File

@ -38,17 +38,17 @@ class CreatesDatabase extends Command
public function handle(): int public function handle(): int
{ {
if ('mysql' !== config('database.default')) { if ('mysql' !== env('DB_CONNECTION')) {
$this->friendlyInfo(sprintf('CreateDB does not apply to "%s", skipped.', config('database.default'))); $this->friendlyInfo(sprintf('CreateDB does not apply to "%s", skipped.', env('DB_CONNECTION')));
return 0; return 0;
} }
// try to set up a raw connection: // try to set up a raw connection:
$exists = false; $exists = false;
$dsn = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', config('database.mysql.host'), config('database.mysql.port')); $dsn = sprintf('mysql:host=%s;port=%d;charset=utf8mb4', env('DB_HOST'), env('DB_PORT'));
if ('' !== config('database.mysql.unix_socket')) { if ('' !== (string) env('DB_SOCKET')) {
$dsn = sprintf('mysql:unix_socket=%s;charset=utf8mb4', config('database.mysql.unix_socket')); $dsn = sprintf('mysql:unix_socket=%s;charset=utf8mb4', env('DB_SOCKET'));
} }
$this->friendlyLine(sprintf('DSN is %s', $dsn)); $this->friendlyLine(sprintf('DSN is %s', $dsn));
@ -60,7 +60,7 @@ class CreatesDatabase extends Command
// when it fails, display error // when it fails, display error
try { try {
$pdo = new \PDO($dsn, config('database.mysql.username'), config('database.mysql.password'), $options); $pdo = new \PDO($dsn, env('DB_USERNAME'), env('DB_PASSWORD'), $options);
} catch (\PDOException $e) { } catch (\PDOException $e) {
$this->friendlyError(sprintf('Error when connecting to DB: %s', $e->getMessage())); $this->friendlyError(sprintf('Error when connecting to DB: %s', $e->getMessage()));
@ -74,19 +74,19 @@ class CreatesDatabase extends Command
// slightly more complex but less error-prone. // slightly more complex but less error-prone.
foreach ($stmt as $row) { foreach ($stmt as $row) {
$name = $row['Database'] ?? false; $name = $row['Database'] ?? false;
if ($name === config('database.mysql.database')) { if ($name === env('DB_DATABASE')) {
$exists = true; $exists = true;
} }
} }
if (false === $exists) { if (false === $exists) {
$this->friendlyError(sprintf('Database "%s" does not exist.', config('database.mysql.database'))); $this->friendlyError(sprintf('Database "%s" does not exist.', env('DB_DATABASE')));
// try to create it. // try to create it.
$pdo->exec(sprintf('CREATE DATABASE `%s` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;', config('database.mysql.database'))); $pdo->exec(sprintf('CREATE DATABASE `%s` CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;', env('DB_DATABASE')));
$this->friendlyInfo(sprintf('Created database "%s"', config('database.mysql.database'))); $this->friendlyInfo(sprintf('Created database "%s"', env('DB_DATABASE')));
} }
if (true === $exists) { if (true === $exists) {
$this->friendlyInfo(sprintf('Database "%s" exists.', config('database.mysql.database'))); $this->friendlyInfo(sprintf('Database "%s" exists.', env('DB_DATABASE')));
} }
return 0; return 0;

2
app/Validation/FireflyValidator.php
View File

@ -820,7 +820,7 @@ class FireflyValidator extends Validator
} }
$query->where('piggy_banks.name', $value); $query->where('piggy_banks.name', $value);
return 0 === $query->count('piggy_banks.*'); return 0 === $query->count();
} }
/** /**