More Oracle fixes

Author: moufmouf

src/QueryFactory/AbstractQueryFactory.php

@@ -141,7 +141,7 @@ protected function getColumnsList(string $mainTable, array $additionalTablesFetc
                     }
                 } elseif ($orderByColumn['type'] === 'expr') {
                     $sortColumnName = 'sort_column_'.$sortColumn;
-                    $columnsList[] = $orderByColumn['expr'].' as '.$sortColumnName;
+                    $columnsList[] = $orderByColumn['expr'].' as '.$connection->quoteIdentifier($sortColumnName);
                     $columnDescList[$sortColumnName] = [
                         'tableGroup' => null,
                     ];

tests/TDBMAbstractServiceTest.php

@@ -329,7 +329,7 @@ private static function initSchema(Connection $connection): void
             ->column('name')->string();
 
         $db->table('nodes')
-            ->column('id')->integer()->primaryKey()->autoIncrement()->comment('@JsonIgnore')
+            ->column('id')->integer()->primaryKey()->autoIncrement()->comment("@JsonIgnore\n@Autoincrement")
             ->column('alias_id')->references('nodes')->null()->comment('@JsonRecursive')
             ->column('parent_id')->references('nodes')->null()->comment('@JsonInclude')
             ->column('root_id')->references('nodes')->null()->comment('@JsonIgnore')
@@ -590,53 +590,53 @@ private static function initSchema(Connection $connection): void
             'id' => 1,
             'owner_id' => 1,
             'name' => '/',
-            'created_at' => (new DateTime('last year'))->format('Y-m-d H:i:s'),
+            'created_at' => (new DateTime('last year'))->format('Y-m-d 00:00:00'),
         ]);
         self::insert($connection, 'nodes', [
             'id' => 2,
             'name' => 'private',
-            'created_at' => (new DateTime('last year'))->format('Y-m-d H:i:s'),
+            'created_at' => (new DateTime('last year'))->format('Y-m-d 00:00:00'),
             'parent_id' => 1,
         ]);
         self::insert($connection, 'nodes', [
             'id' => 3,
             'name' => 'var',
-            'created_at' => (new DateTime('last year'))->format('Y-m-d H:i:s'),
+            'created_at' => (new DateTime('last year'))->format('Y-m-d 00:00:00'),
             'parent_id' => 2,
         ]);
         self::insert($connection, 'nodes', [
             'id' => 4,
             'name' => 'var',
-            'created_at' => (new DateTime('last year'))->format('Y-m-d H:i:s'),
+            'created_at' => (new DateTime('last year'))->format('Y-m-d 00:00:00'),
             'parent_id' => 1,
             'alias_id' => 3
         ]);
         self::insert($connection, 'nodes', [
             'id' => 5,
             'name' => 'www',
-            'created_at' => (new DateTime('last week'))->format('Y-m-d H:i:s'),
+            'created_at' => (new DateTime('last week'))->format('Y-m-d 00:00:00'),
             'parent_id' => 4
         ]);
         self::insert($connection, 'nodes', [
             'id' => 6,
             'owner_id' => 2,
             'name' => 'index.html',
-            'created_at' => (new DateTime('now'))->format('Y-m-d H:i:s'),
+            'created_at' => (new DateTime('now'))->format('Y-m-d 00:00:00'),
             'size' => 512,
             'weight' => 42.5,
             'parent_id' => 5
         ]);
         self::insert($connection, 'nodes', [
             'id' => 7,
             'name' => 'index.html',
-            'created_at' => (new DateTime('now'))->format('Y-m-d H:i:s'),
+            'created_at' => (new DateTime('now'))->format('Y-m-d 00:00:00'),
             'alias_id' => 6,
             'parent_id' => 1
         ]);
         self::insert($connection, 'nodes', [
             'id' => 8,
             'name' => 'index.htm',
-            'created_at' => (new DateTime('now'))->format('Y-m-d H:i:s'),
+            'created_at' => (new DateTime('now'))->format('Y-m-d 00:00:00'),
             'alias_id' => 7,
             'parent_id' => 1
         ]);

tests/TDBMDaoGeneratorTest.php

@@ -26,6 +26,7 @@
 use Doctrine\DBAL\Exception\UniqueConstraintViolationException;
 use Doctrine\DBAL\Platforms\MySQL57Platform;
 use Doctrine\DBAL\Platforms\MySqlPlatform;
+use Doctrine\DBAL\Platforms\OraclePlatform;
 use Mouf\Database\SchemaAnalyzer\SchemaAnalyzer;
 use Ramsey\Uuid\Uuid;
 use ReflectionClass;
@@ -1465,6 +1466,9 @@ public function testGetOnAllNullableValues(): void
      */
     public function testExceptionOnMultipleInheritance(): void
     {
+        // Because of the sequence on the PK, we cannot set the PK to 99 at all.
+        $this->skipOracle();
+
         $connection = self::getConnection();
         self::insert($connection, 'animal', [
             'id' => 99, 'name' => 'Snoofield',
@@ -1745,6 +1749,10 @@ public function testRecursiveSave(): void
      */
     public function testBlob(): void
     {
+        // An issue in DBAL makes using BLOB type impossible with resources.
+        // See https://github.com/doctrine/dbal/issues/3290
+        $this->skipOracle();
+
         $fp = fopen(__FILE__, 'r');
         $file = new FileBean($fp);
 
@@ -1767,6 +1775,10 @@ public function testBlob(): void
      */
     public function testReadBlob(): void
     {
+        // An issue in DBAL makes using BLOB type impossible with resources.
+        // See https://github.com/doctrine/dbal/issues/3290
+        $this->skipOracle();
+
         $fileDao = new FileDao($this->tdbmService);
         $loadedFile = $fileDao->getById(1);
 
@@ -1787,6 +1799,10 @@ public function testReadBlob(): void
      */
     public function testReadAndSaveBlob(): void
     {
+        // An issue in DBAL makes using BLOB type impossible with resources.
+        // See https://github.com/doctrine/dbal/issues/3290
+        $this->skipOracle();
+
         $fileDao = new FileDao($this->tdbmService);
         $loadedFile = $fileDao->getById(1);
 
@@ -1801,6 +1817,10 @@ public function testReadAndSaveBlob(): void
      */
     public function testProtectedGetterSetter(): void
     {
+        // An issue in DBAL makes using BLOB type impossible with resources.
+        // See https://github.com/doctrine/dbal/issues/3290
+        $this->skipOracle();
+
         $md5Getter = new ReflectionMethod(FileBaseBean::class, 'getMd5');
         $md5Setter = new ReflectionMethod(FileBaseBean::class, 'setMd5');
 
@@ -2328,4 +2348,11 @@ public function testCanReadVirtualColumn(): void
         $player = $dao->getById(1);
         $this->assertSame('Sally', $player->getNamesVirtual());
     }
+
+    private function skipOracle()
+    {
+        if (self::getConnection()->getDatabasePlatform() instanceof OraclePlatform) {
+            $this->markTestSkipped('Not supported in Oracle');
+        }
+    }
 }