Merge pull request #2537 from lingoda/allow-precision-0-in-carbon-dba…

…l-types Allow precision 0 in Carbon DBAL types
briannesbitt · Jan 21, 2022 · 626ec8c · 626ec8c
2 parents b989a73 + 5a6c852
commit 626ec8c
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/Carbon/Doctrine/CarbonTypeConverter.php b/src/Carbon/Doctrine/CarbonTypeConverter.php
@@ -36,9 +36,16 @@ protected function getCarbonClassName(): string
      */
     public function getSQLDeclaration(array $fieldDeclaration, AbstractPlatform $platform)
     {
-        $precision = ($fieldDeclaration['precision'] ?: 10) === 10
-            ? DateTimeDefaultPrecision::get()
-            : $fieldDeclaration['precision'];
+        $precision = $fieldDeclaration['precision'] ?: 10;
+
+        if ($fieldDeclaration['secondPrecision'] ?? false) {
+            $precision = 0;
+        }
+
+        if ($precision === 10) {
+            $precision = DateTimeDefaultPrecision::get();
+        }
+
         $type = parent::getSQLDeclaration($fieldDeclaration, $platform);
 
         if (!$precision) {

diff --git a/tests/Doctrine/CarbonTypesTest.php b/tests/Doctrine/CarbonTypesTest.php
@@ -64,14 +64,32 @@ public function testGetSQLDeclaration(string $name)
         $precision = DateTimeDefaultPrecision::get();
         $this->assertSame(6, $precision);
 
+        $this->assertSame('DATETIME', $type->getSQLDeclaration([
+            'precision' => null,
+            'secondPrecision' => true,
+        ], new MySQL57Platform()));
+
         $this->assertSame('DATETIME(3)', $type->getSQLDeclaration([
             'precision' => 3,
         ], new MySQL57Platform()));
 
+        $this->assertSame('TIMESTAMP(0)', $type->getSQLDeclaration([
+            'precision' => null,
+            'secondPrecision' => true,
+        ], new DB2Platform()));
+
         $this->assertSame('TIMESTAMP(6)', $type->getSQLDeclaration([
             'precision' => null,
         ], new DB2Platform()));
 
+        $this->assertSame('TIMESTAMP(6)', $type->getSQLDeclaration([
+            'precision' => 0,
+        ], new DB2Platform()));
+
+        $this->assertSame('DATETIME(6)', $type->getSQLDeclaration([
+            'precision' => 0,
+        ], new MySQL57Platform()));
+
         $this->assertSame('DATETIME(6)', $type->getSQLDeclaration([
             'precision' => null,
         ], new MySQL57Platform()));