clean up #37

Author: Colin Viebrock

src/MigrationParser.php

@@ -124,18 +124,19 @@ public function makeMigration()
         $constraints = trim(implode($eol . $indent12, $this->formatConstraints())) . $eol;
         $tableCollationAndCharset = trim(implode($eol . $indent12, $this->formatTableCollationAndCharset())) . $eol;
         $extras = trim(implode($eol . $indent8, $this->formatExtras())) . $eol;
-        $foreign = trim(implode($eol . $indent12, $this->formatForeign())) . $eol;
-        $foreignDrop = trim(implode($eol . $indent12, $this->formatForeignDrop())) . $eol;
-        if ($this->hasForeign == "true") {
-            $className = 'AddFkTo' . $this->studly($this->tableName) . 'Table';
+
+        if ($this->hasForeign === "true") {
+            $foreign = trim(implode($eol . $indent12, $this->formatForeign())) . $eol;
+            $foreignDrop = trim(implode($eol . $indent12, $this->formatForeignDrop())) . $eol;
+            $className = 'AddForeignKeyTo' . $this->studly($this->tableName) . 'Table';
             $output = file_get_contents(__DIR__ . '/foreign_key.stub');
             $output = str_replace(
                 [
                     ':VERSION:',
                     'DummyClass',
                     'DummyTable',
                     "// foreign\n",
-                    "// foreignDrop\n",                
+                    "// foreignDrop\n",
                 ],
                 [
                     $this->version,
@@ -190,7 +191,6 @@ public function formatForeign()
         foreach ($rows as $row) {
             list($table, $colName, $constName, $refTable, $refColumnName) = explode("\t",
                 $row, 5);
-            $fields[] = '$table->unsignedBigInteger(\''. trim($colName) .'\')->change();';
             $fields[] = '$table->foreign(\''. trim($colName) .'\')->references(\''. trim($refColumnName) .'\')->on(\''. trim($refTable) .'\');';
         }
         return array_filter($fields);
@@ -206,7 +206,6 @@ public function formatForeignDrop()
         foreach ($rows as $row) {
             list($table, $colName, $constName, $refTable, $refColumnName) = explode("\t",
                 $row, 5);
-            //$table->dropForeign('local_table_foreign_id_foreign');
             $fields[] = '$table->dropForeign(\''. trim($table) .'_'. trim($colName) .'_foreign\');';
         }
         return array_filter($fields);
@@ -312,7 +311,6 @@ public function buildStructure()
         }
 
         // look for id primary key
-
         if (
             array_key_exists('id', $this->structure)
             && $this->structure['id']['method'] === 'integer'
@@ -395,7 +393,7 @@ public function formatStructure()
             }
 
             // If isn't empty, set the comment
-            if ($data['comment'] !== '') {
+            if ($data['comment'] !== '' || $data['comment'] !== null) {
                 $temp .= '->comment(\'' . addslashes($data['comment']) . '\')';
             }
 
@@ -445,7 +443,7 @@ public function buildKeys()
                 $primaryColumn = reset($primary['columns']);
                 $field = $this->structure[$primaryColumn];
                 // and that column is an "increments" field ...
-                if (isset($field['autoIncrement']) && $field['autoIncrement'] == '1') {
+                if (isset($field['args']['autoIncrement']) && $field['args']['autoIncrement'] === 'true') {
                     // then don't build the primary key, since Laravel takes care of it
                     unset($this->keys['PRIMARY']);
                 }

src/parse.php

@@ -1,9 +1,11 @@
 <?php
+
 require_once(__DIR__ . '/MigrationParser.php');
 $tableName = $argv[1];
 $hasForeign = "false";
+
 if (isset($argv[2])) {
-	$hasForeign = "true";
+    $hasForeign = "true";
 }
 
 $m = new MigrationParser(

src/parse.sh

@@ -190,12 +190,14 @@ do
 # end loop through tables
 done
 
+# ensure timestamps for any foreign key migrations occur after creation migrations
+sleep 1
+
 # Loop through tables
 for table in "${tables[@]}"
 do
     # get the table foreign key
-
-    echo "SELECT 
+    echo "SELECT
       TABLE_NAME,COLUMN_NAME,CONSTRAINT_NAME, REFERENCED_TABLE_NAME,REFERENCED_COLUMN_NAME
     FROM
       INFORMATION_SCHEMA.KEY_COLUMN_USAGE
@@ -208,9 +210,9 @@ do
 
     hasForeignKey=`cat "$SP_BUNDLE_PATH/rowsForeignStructure.tsv" | grep -v "TABLE_NAME" | wc -l | awk '{print $1}'`;
     if [ $hasForeignKey != 0 ]; then
-        FILENAME=$(date "+%Y_%m_%d_%H%M%S-0_add_fk_to_${table}_table.php")
+        FILENAME=$(date "+%Y_%m_%d_%H%M%S_add_foreign_key_to_${table}_table.php")
         /usr/bin/php "$SP_BUNDLE_PATH/parse.php" "${table}" "foreignkey" > $DESTDIR/$FILENAME
-        echo "<p>Migration Foreing Key saved: <a href=\"SP-REVEAL-FILE://$DESTDIR/$FILENAME\">$FILENAME</a></p>"
+        echo "<p>Migration for foreign key saved: <a href=\"SP-REVEAL-FILE://$DESTDIR/$FILENAME\">$FILENAME</a></p>"
         # clean up
         clear_temp
     fi