Fixing connection and tests for Oracle

Author: moufmouf

tests/ConnectionFactory.php

@@ -25,33 +25,19 @@ public static function resetDatabase(
     ): Connection {
         $config = new \Doctrine\DBAL\Configuration();
 
-        $dbDriver = $dbDriver;
-
         if ($dbDriver === 'pdo_sqlite') {
             $dbConnection = self::getConnection();
             $dbConnection->exec('PRAGMA foreign_keys = ON;');
         } elseif ($dbDriver === 'oci8') {
-            $connectionParams = array(
-                'servicename' => 'XE',
-                'user' => $dbAdminUserName,
-                // Because of issues in DBAL, admin and normal user password have to be the same.
-                'password' => $dbPassword,
-                'host' => $dbHost,
-                'port' => $dbPort,
-                'driver' => $dbDriver,
-                'dbname' => $dbAdminUserName,
-                'charset' => 'AL32UTF8',
-            );
-
-            $adminConn = DriverManager::getConnection($connectionParams, $config);
+            $adminConn = self::createConnection($dbDriver, $dbHost, $dbPort, $dbAdminUserName, $dbPassword, $dbAdminUserName);
 
             // When dropAndCreateDatabase is run several times, Oracle can have some issues releasing the TDBM user.
             // Let's forcefully delete the connection!
             $adminConn->exec("select 'alter system kill session ''' || sid || ',' || serial# || ''';' from v\$session where username = '".strtoupper($dbName)."'");
 
             $adminConn->getSchemaManager()->dropAndCreateDatabase($dbName);
 
-            $dbConnection = $adminConn;
+            $dbConnection = self::createConnection($dbDriver, $dbHost, $dbPort, $dbName, $dbPassword, $dbName);
         } else {
             $connectionParams = array(
                 'user' => $dbUserName,

tests/TDBMAbstractServiceTest.php

@@ -44,6 +44,7 @@
 use TheCodingMachine\TDBM\Utils\DefaultNamingStrategy;
 use TheCodingMachine\TDBM\Utils\PathFinder\PathFinder;
 use function stripos;
+use const PHP_EOL;
 
 abstract class TDBMAbstractServiceTest extends TestCase
 {
@@ -380,12 +381,14 @@ private static function initSchema(Connection $connection): void
 
         $db->junctionTable('person', 'boats');
 
-        $db->table('base_objects')
-            ->column('id')->integer()->primaryKey()->autoIncrement()
-            ->column('label')->string();
-        $db->table('inherited_objects')
-            ->column('id')->integer()->primaryKey()->autoIncrement()
-            ->column('base_object_id')->references('base_objects')->unique()->comment('@JsonCollection');
+        if (!$connection->getDatabasePlatform() instanceof OraclePlatform) {
+            $db->table('base_objects')
+                ->column('id')->integer()->primaryKey()->autoIncrement()
+                ->column('label')->string();
+            $db->table('inherited_objects')
+                ->column('id')->integer()->primaryKey()->autoIncrement()
+                ->column('base_object_id')->references('base_objects')->unique()->comment('@JsonCollection');
+        }
 
         $targetTable = $db->table('composite_fk_target')
             ->column('id_1')->integer()
@@ -395,7 +398,7 @@ private static function initSchema(Connection $connection): void
             ->column('id')->integer()->primaryKey()->autoIncrement()
             ->column('fk_1')->integer()
             ->column('fk_2')->integer()
-            ->then()->getDbalTable()->addForeignKeyConstraint($targetTable->getDbalTable(), ['fk_1', 'fk_2'], ['id_1', 'id_2']);
+            ->then()->getDbalTable()->addForeignKeyConstraint($targetTable->getDbalTable(), [$connection->quoteIdentifier('fk_1'), $connection->quoteIdentifier('fk_2')], [$connection->quoteIdentifier('id_1'), $connection->quoteIdentifier('id_2')]);
 
         // Test case, the problem here is:
         // - `inheritance_agency` have an FK to `inheritance_society.**id_entity**`