Added support for fractional seconds (MySQL 5.7).

Author: Carlos Cima

src/Parser.php

@@ -128,6 +128,7 @@ public function parseColumns(Table $table)
             $decimalPrecision = $matches['decimalPrecision'][$i];
             $doublePrecision = $matches['doublePrecision'][$i];
             $floatPrecision = $matches['floatPrecision'][$i];
+            $fractionalSeconds = $matches['fractionalSeconds'][$i];
             $nullable = $matches['nullable'][$i];
             $autoIncrement = $matches['autoIncrement'][$i];
             $defaultValue = $matches['defaultValue'][$i];
@@ -145,7 +146,7 @@ public function parseColumns(Table $table)
             $column->setDataType($dataType);
             $column->setUnsigned($unsigned);
 
-            $column->setLength($this->getColumnLength($intLength, $decimalLength, $doubleLength, $floatLength, $charLength, $binaryLength, $yearLength));
+            $column->setLength($this->getColumnLength($intLength, $decimalLength, $doubleLength, $floatLength, $charLength, $binaryLength, $yearLength, $fractionalSeconds));
             $column->setPrecision($this->getColumnPrecision($decimalPrecision, $doublePrecision, $floatPrecision));
             $column->setNullable($nullable !== 'NOT NULL');
             $column->setAutoIncrement(!empty($autoIncrement));
@@ -299,10 +300,11 @@ public function parseIndexes(Table $table)
      * @param int $charLength
      * @param int $binaryLength
      * @param int $yearLength
+     * @param int $fractionalSeconds
      *
      * @return int|null
      */
-    private function getColumnLength($intLength, $decimalLength, $doubleLength, $floatLength, $charLength, $binaryLength, $yearLength)
+    private function getColumnLength($intLength, $decimalLength, $doubleLength, $floatLength, $charLength, $binaryLength, $yearLength, $fractionalSeconds)
     {
         if (!empty($intLength)) {
             return (int) $intLength;
@@ -325,6 +327,9 @@ private function getColumnLength($intLength, $decimalLength, $doubleLength, $flo
         if (!empty($yearLength)) {
             return (int) $yearLength;
         }
+        if (!empty($fractionalSeconds)) {
+            return (int) $fractionalSeconds;
+        }
 
         return;
     }

src/RegExpPattern.php

@@ -17,10 +17,8 @@ class RegExpPattern
         'real',
         'decimal\((?<decimalLength>\d+),(?<decimalPrecision>\d+)\)(?:\s+unsigned)?',
         'double(?:\((?<doubleLength>\d+),(?<doublePrecision>\d+)\))?(?:\s+unsigned)?',
-        'datetime',
+        '(?:datetime|time|timestamp)(?:\((?<fractionalSeconds>\d+)\))?',
         'date',
-        'time',
-        'timestamp',
         'year\((?<yearLength>\d)\)',
         'geometry',
         '(?:var|nvar)?char\((?<charLength>\d+)\)',

tests/DifferTest.php

@@ -88,4 +88,4 @@ public function testIsGeneratingMigrationScript()
 
         $this->assertEquals($this->getDatabaseFixture('sakila_migration.sql'), $result);
     }
-}
+}

tests/ParserTest.php

@@ -339,4 +339,24 @@ public function testIsParsingCaseInsensitiveAndSpaces()
         $this->assertEquals('InnoDB', $database->getTableByName('contact')->getEngine());
         $this->assertEquals('`id` BIGINT UNSIGNED NOT NULL AUTO_INCREMENT', $database->getTableByName('contact')->getColumnByName('id')->generateCreationScript());
     }
+
+    public function testIsParsingFractionalSeconds()
+    {
+        $creationScript = $this->getDatabaseFixture('fractional_seconds.sql');
+
+        $parser = new Parser();
+
+        $database = $parser->parseDatabase($creationScript);
+
+        $this->assertInstanceOf(Database::class, $database);
+        $this->assertCount(1, $database->getTables());
+        $this->assertCount(3, $database->getTableByName('fractional_seconds')->getColumns());
+        $this->assertCount(0, $database->getTableByName('fractional_seconds')->getPrimaryKeys());
+        $this->assertCount(0, $database->getTableByName('fractional_seconds')->getIndexes());
+        $this->assertNull($database->getTableByName('fractional_seconds')->getDefaultCharset());
+        $this->assertEquals('InnoDB', $database->getTableByName('fractional_seconds')->getEngine());
+        $this->assertEquals('`datetime_column` DATETIME(1) NOT NULL', $database->getTableByName('fractional_seconds')->getColumnByName('datetime_column')->generateCreationScript());
+        $this->assertEquals('`timestamp_column` TIMESTAMP(2) NOT NULL', $database->getTableByName('fractional_seconds')->getColumnByName('timestamp_column')->generateCreationScript());
+        $this->assertEquals('`time_column` TIME(3) NOT NULL', $database->getTableByName('fractional_seconds')->getColumnByName('time_column')->generateCreationScript());
+    }
 }

tests/fixtures/fractional_seconds.sql

@@ -0,0 +1,5 @@
+CREATE TABLE `fractional_seconds` (
+    `datetime_column` DATETIME(1) NOT NULL,
+    `timestamp_column` TIMESTAMP(2) NOT NULL,
+    `time_column` TIME(3) NOT NULL
+ ) ENGINE = InnoDB;