fix: patch up config inconsistency

leafsphp · Aug 23, 2024 · 068de19 · 068de19
1 parent 3fd8d2d
commit 068de19
Showing 1 changed file with 7 additions and 6 deletions.
diff --git a/src/Db/Core.php b/src/Db/Core.php
@@ -98,7 +98,7 @@ public function __construct(
         string $dbtype = 'mysql'
     ) {
         if (class_exists('Leaf\App')) {
-            app()->config('db', $this->config);
+            app()->config('db.config', $this->config);
         }
 
         if ($host !== '') {
@@ -263,12 +263,13 @@ public function table(string $table): self
     public function config($name, $value = null)
     {
         if (class_exists('Leaf\App') && function_exists('app')) {
-            if (is_array($name)) {
-                $this->config = array_merge($this->config, $name);
-                app()->config('db', array_merge(app()->config('db'), $this->config));
-            } else {
-                return app()->config("db.$name", $value);
+            $this->config = array_merge($this->config, $name);
+
+            if (!is_array($name)) {
+                $this->config[$name] = $value;
             }
+
+            app()->config('db.config', array_merge(app()->config('db.config'), $this->config));
         } else {
             if (is_array($name)) {
                 $this->config = array_merge($this->config, $name);