Restore the connection check

diff --git a/src/Database/Database.php b/src/Database/Database.php
index 4ca454821b565ee1382e18c8cf42b07f7d11812e..273c2985c63f250688f2e90ba510cd758ec6ee17 100644 (file)
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -385,12 +385,11 @@ class Database
 
                switch ($this->driver) {
                        case self::PDO:
-                               $connected = true;
-//                             $r = $this->p("SELECT 1");
-//                             if ($this->isResult($r)) {
-//                                     $row       = $this->toArray($r);
-//                                     $connected = ($row[0]['1'] == '1');
-//                             }
+                               $r = $this->p("SELECT 1");
+                               if ($this->isResult($r)) {
+                                       $row       = $this->toArray($r);
+                                       $connected = ($row[0]['1'] == '1');
+                               }
                                break;
                        case self::MYSQLI:
                                $connected = $this->connection->ping();

diff --git a/tests/functional/DependencyCheckTest.php b/tests/functional/DependencyCheckTest.php
index 4694f3d0edfa1fa725d56bf14795369618121533..fcb16e14ccfca28577e2e93533e014574210ca32 100644 (file)
--- a/tests/functional/DependencyCheckTest.php
+++ b/tests/functional/DependencyCheckTest.php
@@ -119,9 +119,9 @@ class DependencyCheckTest extends TestCase
                $database = $this->dice->create(Database::class);
 
                self::assertInstanceOf(Database::class, $database);
-               self::assertContains($database->getDriver(), [Database::PDO, Database::MYSQLI]);
-               self::assertNotNull($database->getConnection());
-               self::assertTrue($database->connected());
+               self::assertContains($database->getDriver(), [Database::PDO, Database::MYSQLI], 'The driver returns an unexpected value');
+               self::assertNotNull($database->getConnection(), 'There is no database connection');
+               self::assertTrue($database->connected(), 'The database is not connected');
        }
 
        public function testAppMode()