Dev (#54)

* many refactorings

Author: ringostarr80

README.md

@@ -31,7 +31,7 @@ For an overview of the software quality over time and the evolving metrics, chec
 | admin.php          | ❌     | yyyy-mm-dd |
 | aggregates.php     | ❌     | yyyy-mm-dd |
 | ajax-ac-insert.php | ❌     | yyyy-mm-dd |
-| all_db.php         | ❌     | yyyy-mm-dd |
+| all_db.php         | ✅     | 2025-08-08 |
 | autoload.php       | ✅     | 2024-12-19 |
 | browser.php        | ✅     | 2024-12-29 |
 | casts.php          | ❌     | yyyy-mm-dd |

composer.lock

@@ -28,40 +28,28 @@ public function outputXmlTree(): void
         $serverIdParam = RequestParameter::getString('server');
         $serverSession = !is_null($serverIdParam) ? ServerSession::fromServerId($serverIdParam) : null;
         if (!is_null($serverSession)) {
-            $db = $serverSession->getDatabaseConnection();
-            $dbs = $db->getDatabases();
-            if ($dbs instanceof \ADORecordSet) {
-                while (!$dbs->EOF) {
-                    if (
-                        is_array($dbs->fields) &&
-                        isset($dbs->fields['datname']) &&
-                        is_string($dbs->fields['datname'])
-                    ) {
-                        $actionUrl = 'redirect.php';
-                        $actionUrlParams = [
-                            'subject' => 'database',
-                            'server' => $serverSession->id(),
-                            'database' => $dbs->fields['datname']
-                        ];
-                        $srcUrl = 'database.php';
-                        $srcUrlParams = $actionUrlParams;
-                        $srcUrlParams['action'] = 'tree';
-
-                        $tree = $dom->createElement('tree');
-                        $tree->setAttribute('text', $dbs->fields['datname']);
-                        $tree->setAttribute('action', $actionUrl . '?' . http_build_query($actionUrlParams));
-                        $tree->setAttribute('src', $srcUrl . '?' . http_build_query($srcUrlParams));
-                        $tree->setAttribute('icon', Config::getIcon('Database'));
-                        $tree->setAttribute('openicon', Config::getIcon('Database'));
-                        if (isset($dbs->fields['datcomment']) && is_string($dbs->fields['datcomment'])) {
-                            $tree->setAttribute('tooltip', $dbs->fields['datcomment']);
-                        }
+            $dbConnection = $serverSession->getDatabaseConnection();
+            $dbs = $dbConnection->getDatabases();
+            foreach ($dbs as $dbData) {
+                $actionUrl = 'redirect.php';
+                $actionUrlParams = [
+                    'subject' => 'database',
+                    'server' => $serverSession->id(),
+                    'database' => $dbData['datname']
+                ];
+                $srcUrl = 'database.php';
+                $srcUrlParams = $actionUrlParams;
+                $srcUrlParams['action'] = 'tree';
 
-                        $root->appendChild($tree);
-                    }
+                $tree = $dom->createElement('tree');
+                $tree->setAttribute('text', $dbData['datname']);
+                $tree->setAttribute('action', $actionUrl . '?' . http_build_query($actionUrlParams));
+                $tree->setAttribute('src', $srcUrl . '?' . http_build_query($srcUrlParams));
+                $tree->setAttribute('icon', Config::getIcon('Database'));
+                $tree->setAttribute('openicon', Config::getIcon('Database'));
+                $tree->setAttribute('tooltip', $dbData['datcomment']);
 
-                    $dbs->MoveNext();
-                }
+                $root->appendChild($tree);
             }
         } else {
             $configuredServers = Config::getServers();

src/Api/Servers/Tree.php

@@ -5,7 +5,7 @@
 namespace PhpPgAdmin\DDD\Entities;
 
 use PhpPgAdmin\Config;
-use PhpPgAdmin\Database\{Connection, Postgres};
+use PhpPgAdmin\Database\PhpPgAdminConnection;
 use PhpPgAdmin\DDD\ValueObjects\Server\{DatabaseName, Filename, Host, Name, Port, SslMode};
 use PhpPgAdmin\DDD\ValueObjects\ServerSession\{Username, Password, Platform};
 
@@ -133,9 +133,9 @@ public static function fromRequestParameter(): ?self
         return self::fromServerId($_REQUEST['server']);
     }
 
-    public function getDatabaseConnection(): Postgres
+    public function getDatabaseConnection(): PhpPgAdminConnection
     {
-        $conn = new Connection(
+        $connection = PhpPgAdminConnection::create(
             host: (string)$this->Host,
             port: $this->Port->Value,
             sslmode: $this->SslMode->value,
@@ -144,27 +144,10 @@ public function getDatabaseConnection(): Postgres
             database: 'postgres'
         );
 
-        $driver = $conn->getDriver();
-        if (!is_string($driver)) {
-            throw new \Exception('Invalid database driver: ' . $driver);
-        }
-
-        $fqnDriver = '\\PhpPgAdmin\\Database\\' . $driver;
-        if (!class_exists($fqnDriver)) {
-            throw new \Exception("Database driver class not found: {$fqnDriver}");
-        }
-
-        $db = new $fqnDriver($conn->conn);
-        if (!($db instanceof Postgres)) {
-            throw new \Exception("Database driver class is not an instance of Postgres: {$fqnDriver}");
-        }
-
-        $db->execute("SET client_encoding TO 'UTF-8'");
-        if ($db->hasByteaHexDefault()) {
-            $db->execute("SET bytea_output TO escape");
-        }
+        $connection->exec("SET client_encoding TO 'UTF-8'");
+        $connection->exec("SET bytea_output TO escape");
 
-        return $db;
+        return $connection;
     }
 
     public static function isLoggedIn(string $serverId): bool