Support precision option in datetime types (PostgreSQL)

src/Platforms/PostgreSQLPlatform.php

@@ -594,15 +594,15 @@
      */
     public function getDateTimeTypeDeclarationSQL(array $column): string
     {
-        return 'TIMESTAMP(0) WITHOUT TIME ZONE';
+        return sprintf('TIMESTAMP(%d) WITHOUT TIME ZONE', $column['precision']);
     }
 
     /**
      * {@inheritDoc}
      */
     public function getDateTimeTzTypeDeclarationSQL(array $column): string
     {
-        return 'TIMESTAMP(0) WITH TIME ZONE';
+        return sprintf('TIMESTAMP(%d) WITH TIME ZONE', $column['precision']);
     }
 
     /**
@@ -662,9 +662,14 @@
         return 'TEXT';
     }
 
+    public function getDateTimeFormatString(): string
+    {
+        return 'Y-m-d H:i:s.u';
+    }
+
     public function getDateTimeTzFormatString(): string
     {
-        return 'Y-m-d H:i:sO';
+        return 'Y-m-d H:i:s.uO';
     }
 
     public function getEmptyIdentityInsertSQL(string $quotedTableName, string $quotedIdentifierColumnName): string

src/Schema/PostgreSQLSchemaManager.php

@@ -8,6 +8,7 @@
 use Doctrine\DBAL\Platforms\PostgreSQLPlatform;
 use Doctrine\DBAL\Result;
 use Doctrine\DBAL\Types\JsonType;
+use Doctrine\DBAL\Types\PhpDateTimeMappingType;
 use Doctrine\DBAL\Types\Type;
 
 use function array_change_key_case;
@@ -331,6 +332,22 @@
 
                 break;
 
+            case 'timestamp':
+            case 'timestamptz':
+                if (
+                    preg_match(
+                        '([A-Za-z]+\(([0-9]+)\))',
+                        $tableColumn['complete_type'],
+                        $match,
+                    ) === 1
+                ) {
+                    $precision = (int) $match[1];
+                } else {
+                    $precision = 6;
+                }
+
+                break;
+
             case 'year':
                 $length = null;
                 break;

src/Types/DateTimeImmutableType.php

@@ -60,12 +60,6 @@ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?Da
             return $value;
         }
 
-        $dateTime = DateTimeImmutable::createFromFormat($platform->getDateTimeFormatString(), $value);
-
-        if ($dateTime !== false) {
-            return $dateTime;
-        }
-
         try {
             return new DateTimeImmutable($value);
         } catch (Exception $e) {

src/Types/DateTimeType.php

@@ -60,12 +60,6 @@ public function convertToPHPValue(mixed $value, AbstractPlatform $platform): ?Da
             return $value;
         }
 
-        $dateTime = DateTime::createFromFormat($platform->getDateTimeFormatString(), $value);
-
-        if ($dateTime !== false) {
-            return $dateTime;
-        }
-
         try {
             return new DateTime($value);
         } catch (Exception $e) {

src/Types/DateTimeTzImmutableType.php

@@ -8,6 +8,7 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Exception\InvalidFormat;
 use Doctrine\DBAL\Types\Exception\InvalidType;
+use Exception;
 
 /**
  * Immutable type of {@see DateTimeTzType}.
@@ -59,16 +60,15 @@
             return $value;
         }
 
-        $dateTime = DateTimeImmutable::createFromFormat($platform->getDateTimeTzFormatString(), $value);
-
-        if ($dateTime !== false) {
-            return $dateTime;
+        try {
+            return new DateTimeImmutable($value);
+        } catch (Exception $e) {
+            throw InvalidFormat::new(
+                $value,
+                static::class,
+                $platform->getDateTimeTzFormatString(),
+                $e,
+            );
         }
-
-        throw InvalidFormat::new(
-            $value,
-            static::class,
-            $platform->getDateTimeTzFormatString(),
-        );
     }
 }

src/Types/DateTimeTzType.php

@@ -8,6 +8,7 @@
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Exception\InvalidFormat;
 use Doctrine\DBAL\Types\Exception\InvalidType;
+use Exception;
 
 /**
  * DateTime type accepting additional information about timezone offsets.
@@ -73,15 +74,15 @@
             return $value;
         }
 
-        $dateTime = DateTime::createFromFormat($platform->getDateTimeTzFormatString(), $value);
-        if ($dateTime !== false) {
-            return $dateTime;
+        try {
+            return new DateTime($value);
+        } catch (Exception $e) {
+            throw InvalidFormat::new(
+                $value,
+                static::class,
+                $platform->getDateTimeTzFormatString(),
+                $e,
+            );
         }
-
-        throw InvalidFormat::new(
-            $value,
-            static::class,
-            $platform->getDateTimeTzFormatString(),
-        );
     }
 }

src/Types/VarDateTimeImmutableType.php

@@ -6,39 +6,15 @@
 
 use DateTimeImmutable;
 use Doctrine\DBAL\Platforms\AbstractPlatform;
 use Doctrine\DBAL\Types\Exception\InvalidType;
 use Doctrine\DBAL\Types\Exception\ValueNotConvertible;
 use Exception;
 
 /**
- * Immutable type of {@see VarDateTimeType}.
+ * @deprecated Use {@see DateTimeImmutableType} instead.
  */
 class VarDateTimeImmutableType extends DateTimeImmutableType
 {
-    /**
-     * @param T $value
-     *
-     * @return (T is null ? null : string)
-     *
-     * @template T
-     */
-    public function convertToDatabaseValue(mixed $value, AbstractPlatform $platform): ?string
-    {
-        if ($value === null) {
-            return $value;
-        }
-
-        if ($value instanceof DateTimeImmutable) {
-            return $value->format($platform->getDateTimeFormatString());
-        }
-
-        throw InvalidType::new(
-            $value,
-            static::class,
-            ['null', DateTimeImmutable::class],
-        );
-    }
-
     /**
      * @param T $value
      *

src/Types/VarDateTimeType.php

@@ -9,12 +9,8 @@
 use Doctrine\DBAL\Types\Exception\ValueNotConvertible;
 use Exception;
 
 /**
- * Variable DateTime Type using DateTime::__construct() instead of DateTime::createFromFormat().
- *
- * This type has performance implications as it runs twice as long as the regular
- * {@see DateTimeType}, however in certain PostgreSQL configurations with
- * TIMESTAMP(n) columns where n > 0 it is necessary to use this type.
+ * @deprecated Use {@see DateTimeType} instead.
  */
 class VarDateTimeType extends DateTimeType
 {

tests/Functional/Schema/PostgreSQL/ComparatorTest.php

@@ -72,6 +72,15 @@ public function testCompareBinariesOfDifferentLength(): void
         });
     }
 
+    public function testCompareDatesOfZeroPrecision(): void
+    {
+        $this->testColumnModification(static function (Table $table, string $name): Column {
+            return $table->addColumn($name, Types::DATETIME_IMMUTABLE)->setPrecision(null);
+        }, static function (Column $column): void {
+            $column->setPrecision(0);
+        });
+    }
+
     public function testPlatformOptionsChangedColumnComparison(): void
     {
         $table = new Table('update_json_to_jsonb_table');

tests/Functional/Schema/PostgreSQLSchemaManagerTest.php

@@ -649,6 +649,34 @@ public function testPartitionTable(): void
         ));
         self::assertSame(1, $partitionsCount);
     }
+
+    public function testTimestampPrecisionComparison(): void
+    {
+        $offlineTable = new Table('timestamp_columns_test');
+        $offlineTable->addColumn('t_0_wz', Types::DATETIME_MUTABLE, ['precision' => 0]);
+        $offlineTable->addColumn('t_6_wz', Types::DATETIME_MUTABLE, ['precision' => 6]);
+        $offlineTable->addColumn('t_u_wz', Types::DATETIME_MUTABLE, ['precision' => 6]);
+        $offlineTable->addColumn('t_0_tz', Types::DATETIMETZ_MUTABLE, ['precision' => 0]);
+        $offlineTable->addColumn('t_6_tz', Types::DATETIMETZ_MUTABLE, ['precision' => 6]);
+        $offlineTable->addColumn('t_u_tz', Types::DATETIMETZ_MUTABLE, ['precision' => 6]);
+
+        $createTableSQL = <<<'SQL'
+            CREATE TABLE timestamp_columns_test (
+                t_0_wz TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,
+                t_6_wz TIMESTAMP(6) WITHOUT TIME ZONE NOT NULL,
+                t_u_wz TIMESTAMP WITHOUT TIME ZONE NOT NULL,
+                t_0_tz TIMESTAMP(0) WITH TIME ZONE NOT NULL,
+                t_6_tz TIMESTAMP(6) WITH TIME ZONE NOT NULL,
+                t_u_tz TIMESTAMP WITH TIME ZONE NOT NULL
+            )
+            SQL;
+
+        $this->connection->executeStatement($createTableSQL);
+
+        $onlineTable = $this->connection->createSchemaManager()->introspectTable($offlineTable->getName());
+
+        self::assertEquals($offlineTable->getColumns(), $onlineTable->getColumns());
+    }
 }
 
 class MoneyType extends Type

tests/Types/DateTimeImmutableTypeTest.php

@@ -78,10 +78,6 @@ public function testConvertsNullToPHPValue(): void
 
     public function testConvertsDateTimeStringToPHPValue(): void
     {
-        $this->platform->expects(self::once())
-            ->method('getDateTimeFormatString')
-            ->willReturn('Y-m-d H:i:s');
-
         $date = $this->type->convertToPHPValue('2016-01-01 15:58:59', $this->platform);
 
         self::assertInstanceOf(DateTimeImmutable::class, $date);
@@ -90,10 +86,6 @@ public function testConvertsDateTimeStringToPHPValue(): void
 
     public function testConvertsDateTimeStringWithMicrosecondsToPHPValue(): void
     {
-        $this->platform
-            ->method('getDateTimeFormatString')
-            ->willReturn('Y-m-d H:i:s');
-
         $date = $this->type->convertToPHPValue('2016-01-01 15:58:59.123456', $this->platform);
 
         self::assertNotNull($date);
@@ -102,10 +94,6 @@ public function testConvertsDateTimeStringWithMicrosecondsToPHPValue(): void
 
     public function testThrowsExceptionDuringConversionToPHPValueWithInvalidDateTimeString(): void
     {
-        $this->platform->expects(self::atLeastOnce())
-            ->method('getDateTimeFormatString')
-            ->willReturn('Y-m-d H:i:s');
-
         $this->expectException(ConversionException::class);
 
         $this->type->convertToPHPValue('invalid datetime string', $this->platform);

tests/Types/DateTimeTzImmutableTypeTest.php

@@ -78,10 +78,6 @@ public function testConvertsNullToPHPValue(): void
 
     public function testConvertsDateTimeWithTimezoneStringToPHPValue(): void
     {
-        $this->platform->expects(self::once())
-            ->method('getDateTimeTzFormatString')
-            ->willReturn('Y-m-d H:i:s T');
-
         $date = $this->type->convertToPHPValue('2016-01-01 15:58:59 UTC', $this->platform);
 
         self::assertInstanceOf(DateTimeImmutable::class, $date);
@@ -90,10 +86,6 @@ public function testConvertsDateTimeWithTimezoneStringToPHPValue(): void
 
     public function testThrowsExceptionDuringConversionToPHPValueWithInvalidDateTimeWithTimezoneString(): void
     {
-        $this->platform->expects(self::atLeastOnce())
-            ->method('getDateTimeTzFormatString')
-            ->willReturn('Y-m-d H:i:s T');
-
         $this->expectException(ConversionException::class);
 
         $this->type->convertToPHPValue('invalid datetime with timezone string', $this->platform);