as2252258/kiri-databases
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

qqq

Browse Source
This commit is contained in:
xl
2023-05-25 16:59:18 +08:00
parent ac443a49b1
commit efa6cf5421
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Base/Model.php
+1 -1
View File
@@ -492,7 +492,7 @@ abstract class Model extends Component implements ModelInterface, ArrayAccess, T
*/ */
private function diff(): array private function diff(): array
{ {
$changes = array_diff_assoc($this->_oldAttributes, $this->_attributes); $changes = array_diff_assoc($this->_attributes, $this->_oldAttributes);
$condition = array_intersect_assoc($this->_oldAttributes, $this->_attributes); $condition = array_intersect_assoc($this->_oldAttributes, $this->_attributes);
DatabasesProviders.php
+5 -5
View File
@@ -6,8 +6,8 @@ namespace Database;
use Exception; use Exception;
use Kiri; use Kiri;
use Kiri\Abstracts\Config;
use Kiri\Abstracts\Providers; use Kiri\Abstracts\Providers;
use Kiri\Config\ConfigProvider;
use Swoole\Timer; use Swoole\Timer;
use Kiri\Di\LocalService; use Kiri\Di\LocalService;
@@ -26,10 +26,10 @@ class DatabasesProviders extends Providers
*/ */
public function onImport(LocalService $application): void public function onImport(LocalService $application): void
{ {
$main = Kiri::getDi()->get(Kiri\Main::class); $main = Kiri::getDi()->get(Kiri\Application::class);
$main->command(BackupCommand::class); $main->command(BackupCommand::class);
$databases = Config::get('databases.connections', []); $databases = \config('databases.connections', []);
if (empty($databases)) { if (empty($databases)) {
return; return;
} }
@@ -45,7 +45,7 @@ class DatabasesProviders extends Providers
return; return;
} }
Timer::tick(60000, function () { Timer::tick(60000, function () {
$databases = Config::get('databases.connections', []); $databases = \config('databases.connections', []);
if (empty($databases)) { if (empty($databases)) {
return; return;
} }
@@ -65,7 +65,7 @@ class DatabasesProviders extends Providers
public function exit(): void public function exit(): void
{ {
Timer::clearAll(); Timer::clearAll();
$databases = Config::get('databases.connections', []); $databases = \config('databases.connections', []);
if (!empty($databases)) { if (!empty($databases)) {
$connection = Kiri::getDi()->get(Kiri\Pool\Pool::class); $connection = Kiri::getDi()->get(Kiri\Pool\Pool::class);
foreach ($databases as $database) { foreach ($databases as $database) {
Db.php
+1 -2
View File
@@ -14,7 +14,6 @@ use Database\Affair\Commit;
use Database\Affair\Rollback; use Database\Affair\Rollback;
use Database\Traits\QueryTrait; use Database\Traits\QueryTrait;
use Exception; use Exception;
use Kiri\Abstracts\Config;
use Kiri\Di\Context; use Kiri\Di\Context;
use Kiri\Events\EventDispatch; use Kiri\Events\EventDispatch;
use Kiri\Exception\ConfigException; use Kiri\Exception\ConfigException;
@@ -377,7 +376,7 @@ class Db implements ISqlBuilder
if ($connection instanceof Connection) { if ($connection instanceof Connection) {
return $connection; return $connection;
} }
$databases = Config::get('databases.connections', []); $databases = \config('databases.connections', []);
if (empty($databases) || !is_array($databases)) { if (empty($databases) || !is_array($databases)) {
throw new Exception('Please configure the database link.'); throw new Exception('Please configure the database link.');
} }