Updated database config structure for multiple connections and demos

judus · Mar 31, 2018 · f137ca3 · f137ca3
1 parent 60fb9c6
commit f137ca3
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 16 deletions.
diff --git a/app/Demo/ORM/Config/routes.php b/app/Demo/ORM/Config/routes.php
@@ -5,14 +5,14 @@
 use App\Demo\ORM\Entities\Role;
 use App\Demo\ORM\Entities\User;
 use App\Demo\ORM\Entities\Usertype;
-use Maduser\Minimal\Database\Connectors\PDO;
 use Maduser\Minimal\Framework\Facades\Config;
+use Maduser\Minimal\Database\DB;
 
 /** @var \Maduser\Minimal\Routing\Router $router */
 
 $router->get('orm', function () {
 
-    PDO::connection(Config::item('database'));
+    DB::connections(Config::database());
 
     // Getting instances
     $user = User::instance();
@@ -115,5 +115,7 @@
     // Eager loading relationships
     $user->with(['type', 'profile', 'roles', 'posts', 'comments'])->getAll();
 
-    return count(PDO::getExecutedQueries()) . ' queries have been executed.';
+    return 'Connector \'' . DB::connector()->getName() . '\' has executed ' .
+        count(DB::connector()->getExecutedQueries()) . ' queries in database \''
+        . DB::connector()->getDatabase() . '\' ' . show(DB::connector()->getExecutedQueries(), null, true);
 });
diff --git a/config/minimal.php b/config/minimal.php
@@ -43,17 +43,19 @@
 // DATABASE
 
     'database' => [
-        'driver' => 'mysql',
-        'host' => 'localhost',
-        'port' => '3306',
-        'user' => '',
-        'password' => '',
-        'database' => '',
-        'charset' => 'utf8',
-        'handler' => \PDO::class,
-        'handlerOptions' => [
-            \PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC,
-            \PDO::ATTR_EMULATE_PREPARES => false
+        'default' => [
+            'driver' => 'mysql',
+            'host' => 'localhost',
+            'port' => '3306',
+            'user' => '',
+            'password' => '',
+            'database' => '',
+            'charset' => 'utf8',
+            'handler' => \PDO::class,
+            'handlerOptions' => [
+                \PDO::ATTR_DEFAULT_FETCH_MODE => \PDO::FETCH_ASSOC,
+                \PDO::ATTR_EMULATE_PREPARES => false
+            ]
         ]
     ],
 

diff --git a/public/index.php b/public/index.php
@@ -81,8 +81,7 @@
 
     // Test the database connection
     Router::get('database', function () {
-        PDO::connection(Config::item('database'));
-
+        DB::connections(Config::database());
         return 'Successfully connected to database';
     });