Various fixes and improvements, version bump

Author: Colin Viebrock

.semver

@@ -1,5 +1,5 @@
 ---
 :major: 1
-:minor: 6
+:minor: 7
 :patch: 0
 :special: ''

CHANGELOG.md

@@ -1,10 +1,20 @@
 # Changelog
 
+## 1.7.0 - 09-Mar-2020
+
+- Adds support for timestamp columns with `ON UPDATE CURRENT_TIMESTAMP`
+- suppresses `->characterSet()` and `->collation()` on text columns
+  that share the table's default character set and/or collation  
+- removes some extra blank lines from the resulting migration file
+- a bit of code cleanup
+
+
 ## 1.6.0 - 20-Jan-2020
 
 - Adds charset and collation information for tables/columns
 - Fix for default values being double-quoted
 
+
 ## 1.5.0 - 24-Feb-2019
 
 - Fixes for:

ExportToLaravelMigration.spBundle/MigrationParser.php

@@ -3,10 +3,12 @@
 class MigrationParser
 {
 
+    const TS_UPDATE_STRING = 'ON UPDATE CURRENT_TIMESTAMP';
+
     /**
      * @var string
      */
-    protected $version = '1.6.0';
+    protected $version = '1.7.0';
 
     /**
      * @var array
@@ -94,10 +96,10 @@ public function __construct($tableName, $structureFile, $keysFile, $constraintsF
 
     public function makeMigration()
     {
+        $this->buildTableCollationAndCharset();
         $this->buildStructure();
         $this->buildKeys();
         $this->buildConstraints();
-        $this->buildTableCollationAndCharset();
 
         $indent8 = str_repeat(' ', 8);
         $indent12 = str_repeat(' ', 12);
@@ -119,6 +121,8 @@ public function makeMigration()
             $output
         );
 
+        $output = preg_replace("/^(\s*\R){2,}/m", "\n", $output);
+
         return $output;
     }
 
@@ -156,8 +160,8 @@ public function buildStructure()
                     'field'    => $field,
                     'nullable' => ($null === 'YES'),
                     'default'  => ($default !== 'NULL') ? $default : null,
-                    'characterSet' => ($characterSet !== 'NULL') ? $characterSet : null,
-                    'collation' => ($collation !== 'NULL') ? $collation : null,
+                    'characterSet' => ($characterSet !== 'NULL' && $characterSet !== $this->tableCharset) ? $characterSet : null,
+                    'collation' => ($collation !== 'NULL' && $collation !== $this->tableCollation) ? $collation : null,
                     '_colType' => $colType,
                 ];
 
@@ -232,6 +236,11 @@ public function formatStructure()
                 || $method === 'double'
                 || $method === 'float';
 
+            if ($method==='timestamp' && $data['args'] === self::TS_UPDATE_STRING) {
+                $data['default'] = $data['default'] . ' ' . $data['args'];
+                $data['args'] = null;
+            }
+
             $temp = '$table->' . $method;
             if ($data['field']) {
                 $temp .= '(\'' . $field . '\'';
@@ -259,8 +268,8 @@ public function formatStructure()
                     $temp .= '->default(' . $data['default'] . ')';
                 } elseif ($method==='boolean') {
                     $temp .= '->default(' . ($data['default'] ? 'true' : 'false') . ')';
-                } elseif (strtolower(trim($data['default'])) === 'current_timestamp') {
-                    $temp .= '->default(\DB::raw(\'CURRENT_TIMESTAMP\'))';
+                } elseif (stripos(trim($data['default']), 'CURRENT_TIMESTAMP') !==false) {
+                    $temp .= '->default(\DB::raw(\'' . trim($data['default']) . '\'))';
                 } else {
                     $temp .= '->default(\'' . $this->trimStringQuotes($data['default']) . '\')';
                 }
@@ -405,9 +414,6 @@ public function buildTableCollationAndCharset()
     {
         $this->constraints = [];
 
-        $rows = file($this->constraintsFile);
-        array_shift($rows);
-
         $rows = file($this->tableCharsetAndCollationFile);
         array_shift($rows);
 
@@ -439,13 +445,6 @@ protected function copyToClipboard($content)
         shell_exec($cmd);
     }
 
-    protected function extractSize($string)
-    {
-        if (preg_match('#\(([^)]+)\)#', $string, $m)) {
-            return $m[1];
-        }
-    }
-
     protected function escapeArray($array)
     {
         $array = (array)$array;
@@ -585,6 +584,9 @@ protected function parseTime($type, $args, $typeExtra, $extra)
 
     protected function parseTimestamp($type, $args, $typeExtra, $extra)
     {
+        if (stripos($extra, self::TS_UPDATE_STRING) !==false) {
+            $args = self::TS_UPDATE_STRING;
+        }
         return $this->defaultParse('timestamp', $args);
     }