Update

Author: ging-dev

README.md

@@ -28,23 +28,23 @@ declare(strict_types=1);
 
 namespace App\Presenters;
 
-use Illuminate\Database\Capsule\Manager;
+use Illuminate\Database\Connection;
 use Nette;
 
 
 final class HomepagePresenter extends Nette\Application\UI\Presenter
 {
-    /** @var Manager */
+    /** @var Connection */
     protected $database;
 
-    public function injectDatabase(Manager $database) {
+    public function injectDatabase(Connection $database) {
         $this->database = $database;
     }
 
     public function actionDefault()
     {
-        $this->database->schema()->drop('users');
-        $this->database->schema()->create('users', function ($table) {
+        $this->database->getSchemaBuilder()->drop('users');
+        $this->database->getSchemaBuilder()->create('users', function ($table) {
             $table->increments('id');
             $table->string('name')->unique();
         });

src/EloquentExtension.php

@@ -6,26 +6,55 @@
 
 use Illuminate\Database\Capsule\Manager;
 use Nette\DI\CompilerExtension;
+use Nette\Schema\Expect;
+use Nette\Schema\Schema;
 
 class EloquentExtension extends CompilerExtension
 {
+    public function getConfigSchema(): Schema
+    {
+        /** @var Schema */
+        $schema = Expect::arrayOf(
+            Expect::array()
+        )->before(fn ($value) => is_array(reset($value)) || null === reset($value)
+            ? $value
+            : ['default' => $value]
+        );
+
+        return $schema;
+    }
+
     public function loadConfiguration()
     {
         $container = $this->getContainerBuilder();
-        $config = $this->getConfig();
 
-        $connection = $container->addDefinition($this->prefix('connection'))
+        $manager = $container->addDefinition($this->prefix('manager'))
             ->setFactory(Manager::class)
-            ->addSetup('addConnection', [$config])
             ->addSetup('setAsGlobal')
             ->addSetup('bootEloquent')
             ->setAutowired(true);
 
-        if ($container->parameters['debugMode']) {
-            $panel = $container->addDefinition($this->prefix('panel'))
+        $autowired = true;
+        foreach ($this->config as $name => $config) {
+            $config['autowired'] ??= $autowired;
+
+            $manager->addSetup('addConnection', [$config, $name]);
+
+            $connection = $container->addDefinition($this->prefix("$name.connection"))
+                ->setFactory([$manager, 'connection'], [$name])
+                ->setAutowired($config['autowired']);
+
+            $autowired = false;
+
+            if (!$container->parameters['debugMode']) {
+                continue;
+            }
+
+            $panel = $container->addDefinition($this->prefix("$name.panel"))
                 ->setFactory(EloquentPanel::class)
                 ->setAutowired(false);
-            $connection->addSetup([$panel, 'register'], [$connection]);
+
+            $connection->addSetup([$panel, 'register'], [$connection, $name]);
         }
     }
 }

src/EloquentPanel.php

@@ -4,31 +4,35 @@
 
 namespace Gingdev\NetteExtension;
 
-use Illuminate\Database\Capsule\Manager;
+use Illuminate\Database\Connection;
 use Illuminate\Events\Dispatcher;
 use Nette\Utils\Helpers;
 use Tracy\Debugger;
 use Tracy\IBarPanel;
 
 class EloquentPanel implements IBarPanel
 {
+    private $connectionName;
+
     private $totalTime = 0;
 
     private $queries = [];
 
-    public function register(Manager $connection)
+    public function register(Connection $connection, string $name)
     {
         Debugger::getBar()->addPanel($this);
-        $connection->connection()->setEventDispatcher(new Dispatcher());
-        $connection->connection()->listen(function ($query) {
+        $connection->setEventDispatcher(new Dispatcher());
+        $connection->listen(function ($query) {
             $this->queries[] = $query;
             $this->totalTime += $query->time;
         });
+        $this->connectionName = $name;
     }
 
     public function getTab()
     {
         return Helpers::capture(function () {
+            $connectionName = $this->connectionName;
             $count = count($this->queries);
             $totalTime = $this->totalTime;
             require __DIR__.'/templates/tab.phtml';
@@ -41,6 +45,8 @@ public function getPanel()
             if (!$queries = $this->queries) {
                 return;
             }
+            $connectionName = $this->connectionName;
+            $totalTime = $this->totalTime;
             require __DIR__.'/templates/panel.phtml';
         });
     }

src/templates/panel.phtml

@@ -1,4 +1,4 @@
-<h1>SQL Queries</h1>
+<h1>Queries: <?= count($queries) ?>, time: <?= $totalTime ?> ms, <?= $connectionName ?></h1>
 <div class="tracy-inner tracy-Eloquent">
   <table>
     <tr>

src/templates/tab.phtml

@@ -1,6 +1,6 @@
-<span title="Eloquent">
+<span title="Eloquent <?= $connectionName ?>">
   <svg viewBox="0 0 2048 2048" style="vertical-align: bottom; width:1.23em; height:1.55em">
     <path fill="<?= ($count ? '#b079d6' : '#aaa') ?>" d="M1024 896q237 0 443-43t325-127v170q0 69-103 128t-280 93.5-385 34.5-385-34.5-280-93.5-103-128v-170q119 84 325 127t443 43zm0 768q237 0 443-43t325-127v170q0 69-103 128t-280 93.5-385 34.5-385-34.5-280-93.5-103-128v-170q119 84 325 127t443 43zm0-384q237 0 443-43t325-127v170q0 69-103 128t-280 93.5-385 34.5-385-34.5-280-93.5-103-128v-170q119 84 325 127t443 43zm0-1152q208 0 385 34.5t280 93.5 103 128v128q0 69-103 128t-280 93.5-385 34.5-385-34.5-280-93.5-103-128v-128q0-69 103-128t280-93.5 385-34.5z"/>
   </svg>
-  <span class="tracy-label" title="Eloquent"><?= $count ?> queries <?= ($totalTime ? ' / '.$totalTime.' ms' : '') ?></span>
+  <span class="tracy-label" title="Eloquent <?= $connectionName ?>"><?= $count ?><?= ($totalTime ? ' / '.$totalTime.' ms' : '') ?></span>
 </span>