Merge pull request #302 from joomla-framework/3.x/fix/pr-301

Fixing failing tests

Author: HLeithner

Tests/Pgsql/PgsqlPreparedStatementTest.php

@@ -10,6 +10,9 @@
 use Joomla\Database\Exception\ExecutionFailureException;
 use Joomla\Test\DatabaseTestCase;
 
+/**
+ * Test class for Joomla\Database\Pgsql\PgsqlStatement
+ */
 class PgsqlPreparedStatementTest extends DatabaseTestCase
 {
     /**
@@ -19,14 +22,11 @@ class PgsqlPreparedStatementTest extends DatabaseTestCase
      */
     public static function setUpBeforeClass(): void
     {
-        $manager = static::getDatabaseManager();
+        parent::setUpBeforeClass();
 
-        $connection = $manager->getConnection();
-        $manager->dropDatabase();
-        $manager->createDatabase();
-        $connection->select($manager->getDbName());
-
-        static::$connection = $connection;
+        if (!static::$connection || static::$connection->getName() !== 'pgsql') {
+            self::markTestSkipped('PostgreSQL database not configured.');
+        }
     }
 
     /**

Tests/Sqlsrv/SqlsrvPreparedStatementTest.php

@@ -11,6 +11,9 @@
 use Joomla\Database\Sqlsrv\SqlsrvStatement;
 use Joomla\Test\DatabaseTestCase;
 
+/**
+ * Test class for Joomla\Database\Sqlsrv\SqlsrvStatement
+ */
 class SqlsrvPreparedStatementTest extends DatabaseTestCase
 {
     /**
@@ -20,14 +23,11 @@ class SqlsrvPreparedStatementTest extends DatabaseTestCase
      */
     public static function setUpBeforeClass(): void
     {
-        $manager = static::getDatabaseManager();
+        parent::setUpBeforeClass();
 
-        $connection = $manager->getConnection();
-        $manager->dropDatabase();
-        $manager->createDatabase();
-        $connection->select($manager->getDbName());
-
-        static::$connection = $connection;
+        if (!static::$connection || static::$connection->getName() !== 'sqlsrv') {
+            self::markTestSkipped('SQL Server database not configured.');
+        }
     }
 
     /**
@@ -49,7 +49,7 @@ protected function setUp(): void
         } catch (ExecutionFailureException $exception) {
             $this->markTestSkipped(
                 \sprintf(
-                    'Could not load MS SQL Server database: %s',
+                    'Could not load SQL Server database: %s',
                     $exception->getMessage()
                 )
             );

Tests/Sqlsrv/SqlsrvStatementTest.php

@@ -4,7 +4,7 @@
  * @license    GNU General Public License version 2 or later; see LICENSE
  */
 
-namespace Joomla\Database\Tests\Sqlqrv;
+namespace Joomla\Database\Tests\Sqlsrv;
 
 use Joomla\Database\DatabaseDriver;
 use Joomla\Database\Exception\ExecutionFailureException;

src/Mysqli/MysqliStatement.php

@@ -200,7 +200,6 @@ public function prepareParameterKeyMapping($sql)
                     if (isset($mapping[$match[0]])) {
                         $mapping[$match[0]] = is_array($mapping[$match[0]]) ? $mapping[$match[0]] : [$mapping[$match[0]]];
                         $mapping[$match[0]][] = \count($mapping);
-
                     } else {
                         $mapping[$match[0]] = \count($mapping);
                     }

src/Sqlsrv/SqlsrvStatement.php

@@ -205,7 +205,6 @@ public function prepareParameterKeyMapping($sql)
                     if (isset($mapping[$match[0]])) {
                         $mapping[$match[0]] = is_array($mapping[$match[0]]) ? $mapping[$match[0]] : [$mapping[$match[0]]];
                         $mapping[$match[0]][] = \count($mapping);
-
                     } else {
                         $mapping[$match[0]] = \count($mapping);
                     }