[SQLite] Support timezone information on SqlitePlatform::getDateTimeTzFormatString()

.github/workflows/continuous-integration.yml

@@ -25,14 +25,15 @@ on:
     - cron: "42 3 * * *"
 
 env:
-  fail-fast: true
+  fail-fast: false
 
 jobs:
   phpunit-smoke-check:
     name: "PHPUnit with SQLite"
     runs-on: "${{ matrix.os }}"
 
     strategy:
+      fail-fast: false
       matrix:
         os:
           - "ubuntu-22.04"
@@ -373,15 +374,15 @@ jobs:
           - "7.4"
           - "8.0"
         mysql-version:
-          - "5.7"
+          # - "5.7"
           - "8.0"
         extension:
           - "mysqli"
           - "pdo_mysql"
         config-file-suffix:
           - ""
         include:
-          - mysql-version: "5.7"
+          # - mysql-version: "5.7"
           - mysql-version: "8.0"
             # https://stackoverflow.com/questions/60902904/how-to-pass-mysql-native-password-to-mysql-service-in-github-actions
             custom-entrypoint: >-

src/Driver/OCI8/Middleware/InitializeSession.php

@@ -28,7 +28,7 @@ public function connect(
                         . " NLS_TIME_FORMAT = 'HH24:MI:SS'"
                         . " NLS_DATE_FORMAT = 'YYYY-MM-DD HH24:MI:SS'"
                         . " NLS_TIMESTAMP_FORMAT = 'YYYY-MM-DD HH24:MI:SS'"
-                        . " NLS_TIMESTAMP_TZ_FORMAT = 'YYYY-MM-DD HH24:MI:SS TZH:TZM'"
+                        . " NLS_TIMESTAMP_TZ_FORMAT = 'YYYY-MM-DD HH24:MI:SSTZH:TZM'"
                         . " NLS_NUMERIC_CHARACTERS = '.,'",
                 );
 

src/Platforms/MySQL80Platform.php

@@ -9,6 +9,16 @@
  */
 class MySQL80Platform extends MySQL57Platform
 {
+    /**
+     * {@inheritdoc}
+     *
+     * @link https://dev.mysql.com/doc/refman/8.0/en/date-and-time-literals.html#date-and-time-string-numeric-literals
+     */
+    public function getDateTimeTzFormatString()
+    {
+        return 'Y-m-d H:i:sP';
+    }
+
     /**
      * {@inheritdoc}
      *

src/Platforms/OraclePlatform.php

@@ -82,6 +82,8 @@ public function getNowExpression($type = 'timestamp')
         );
 
         switch ($type) {
+            case 'timestamptz':
+                return 'TO_CHAR(CURRENT_TIMESTAMP, \'YYYY-MM-DD HH24:MI:SSTZH:TZM\')';
             case 'date':
             case 'time':
             case 'timestamp':

src/Platforms/SqlitePlatform.php

@@ -193,6 +193,12 @@ public function getCurrentDatabaseExpression(): string
         return "'main'";
     }
 
+    /** @inheritDoc */
+    public function getDateTimeTzFormatString()
+    {
+        return 'Y-m-d H:i:sO';
+    }
+
     /**
      * {@inheritDoc}
      */

tests/Functional/Types/DateTimeTzImmutableTypeTest.php

@@ -0,0 +1,81 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Doctrine\DBAL\Tests\Functional\Types;
+
+use DateTimeImmutable;
+use DateTimeZone;
+use Doctrine\DBAL\Schema\Table;
+use Doctrine\DBAL\Tests\FunctionalTestCase;
+use Doctrine\DBAL\Types\Type;
+use Doctrine\DBAL\Types\Types;
+
+use function sprintf;
+
+class DateTimeTzImmutableTypeTest extends FunctionalTestCase
+{
+    private const TEST_TABLE = 'datetimetz_test';
+
+    protected function setUp(): void
+    {
+        $this->iniSet('date.timezone', 'UTC');
+
+        $table = new Table(self::TEST_TABLE);
+        $table->addColumn('id', Types::INTEGER);
+
+        $table->addColumn('val', Types::DATETIMETZ_IMMUTABLE);
+        $table->setPrimaryKey(['id']);
+
+        $this->dropAndCreateTable($table);
+    }
+
+    public function testInsertAndSelect(): void
+    {
+        $platform                = $this->connection->getDatabasePlatform();
+        $dateTimeTzImmutableType = Type::getType(Types::DATETIMETZ_IMMUTABLE);
+
+        $id1    = 1;
+        $value1 = new DateTimeImmutable('1986-03-22 19:45:30', new DateTimeZone('America/Argentina/Buenos_Aires'));
+
+        $this->insert($id1, $value1);
+
+        $res1 = $this->select($id1);
+
+        $resultDateTimeTzValue = $dateTimeTzImmutableType
+            ->convertToPHPValue($res1, $platform)
+            ->setTimezone(new DateTimeZone('UTC'));
+
+        self::assertInstanceOf(DateTimeImmutable::class, $resultDateTimeTzValue);
+        self::assertSame($value1->getTimestamp(), $resultDateTimeTzValue->getTimestamp());
+        self::assertSame($value1->getTimestamp(), $resultDateTimeTzValue->getTimestamp());
+        self::assertSame('UTC', $resultDateTimeTzValue->format('T'));
+        self::assertSame('1986-03-22T22:45:30+00:00', $resultDateTimeTzValue->format(DateTimeImmutable::ATOM));
+    }
+
+    private function insert(int $id, DateTimeImmutable $value): void
+    {
+        $result = $this->connection->insert(self::TEST_TABLE, [
+            'id'  => $id,
+            'val' => $value,
+        ], [
+            Types::INTEGER,
+            Type::getType(Types::DATETIMETZ_IMMUTABLE),
+        ]);
+
+        self::assertSame(1, $result);
+    }
+
+    private function select(int $id): string
+    {
+        $value = $this->connection->fetchOne(
+            sprintf('SELECT val FROM %s WHERE id = ?', self::TEST_TABLE),
+            [$id],
+            [Types::INTEGER],
+        );
+
+        self::assertIsString($value);
+
+        return $value;
+    }
+}

tests/Platforms/SqlitePlatformTest.php

@@ -2,6 +2,7 @@
 
 namespace Doctrine\DBAL\Tests\Platforms;
 
+use DateTimeImmutable;
 use Doctrine\DBAL\Exception;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Platforms\SqlitePlatform;
@@ -763,4 +764,15 @@ public function testGetCreateTableSQLWithColumnCollation(): void
             $this->platform->getCreateTableSQL($table),
         );
     }
+
+    public function testGetDateTimeTzFormatString(): void
+    {
+        $date = DateTimeImmutable::createFromFormat(
+            $this->platform->getDateTimeTzFormatString(),
+            '1986-03-22 22:45:30-03:00',
+        );
+
+        self::assertInstanceOf(DateTimeImmutable::class, $date);
+        self::assertSame('GMT-0300', $date->format('T'));
+    }
 }