Merge pull request #13 from sascha432/master

camcima · web-flow · commit 42e35ee6948d · 2017-08-02T20:26:44.000-03:00
Added some features
diff --git a/.travis.yml b/.travis.yml
@@ -1,3 +1,4 @@
+dist: trusty
 language: php
 php:
   - '5.6'
@@ -13,4 +14,4 @@ script:
   - vendor/bin/phpunit --verbose
 
 matrix:
-  fast_finish: true
+  fast_finish: true
diff --git a/src/Command/AbstractCommand.php b/src/Command/AbstractCommand.php
@@ -5,6 +5,11 @@
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Output\OutputInterface;
 
+/**
+ * Class AbstractCommand
+ *
+ * @package Camcima\MySqlDiff\Command
+ */
 abstract class AbstractCommand extends Command
 {
     /**
@@ -30,11 +35,11 @@ protected function outputLine($line = '', $forceOutput = false)
 
     /**
      * @param string $string
-     * @param bool $forceOuput
+     * @param bool $forceOutput
      */
-    protected function outputString($string = '', $forceOuput = false)
+    protected function outputString($string = '', $forceOutput = false)
     {
-        if ($this->verbose || $forceOuput) {
+        if ($this->verbose || $forceOutput) {
             $this->output->write($string);
         }
     }
diff --git a/src/Command/DiffCommand.php b/src/Command/DiffCommand.php
@@ -9,6 +9,11 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
+/**
+ * Class DiffCommand
+ *
+ * @package Camcima\MySqlDiff\Command
+ */
 class DiffCommand extends AbstractCommand
 {
     protected function configure()
@@ -38,6 +43,7 @@ protected function configure()
     /**
      * @param InputInterface $input
      * @param OutputInterface $output
+     * @return int|null|void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/src/Command/MigrateCommand.php b/src/Command/MigrateCommand.php
@@ -9,6 +9,11 @@
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 
+/**
+ * Class MigrateCommand
+ *
+ * @package Camcima\MySqlDiff\Command
+ */
 class MigrateCommand extends AbstractCommand
 {
     protected function configure()
@@ -50,6 +55,7 @@ protected function configure()
     /**
      * @param InputInterface $input
      * @param OutputInterface $output
+     * @return int|null|void
      */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
diff --git a/src/Differ.php b/src/Differ.php
@@ -7,6 +7,11 @@
 use Camcima\MySqlDiff\Model\Database;
 use Camcima\MySqlDiff\Model\DatabaseDiff;
 
+/**
+ * Class Differ
+ *
+ * @package Camcima\MySqlDiff
+ */
 class Differ
 {
     /**
@@ -32,7 +37,8 @@ public function diffDatabases(Database $fromDatabase, Database $toDatabase, arra
             }
 
             $toTable = $toDatabase->getTableByName($fromTable->getName());
-            if ($fromTable->generateCreationScript(true) != $toTable->generateCreationScript(true)) {
+
+            if ($fromTable->generateCreationScript(true) !== $toTable->generateCreationScript(true)) {
                 $changedTable = new ChangedTable($fromTable, $toTable);
                 $this->diffChangedTable($changedTable);
                 $databaseDiff->addChangedTable($changedTable);
@@ -89,18 +95,19 @@ private function diffColumns(ChangedTable $changedTable)
 
             // Determine changed columns
             $fromColumn = $fromTable->getColumnByName($toColumn->getName());
-            if ($toColumn->generateCreationScript() != $fromColumn->generateCreationScript()) {
+            if ($toColumn->generateCreationScript() !== $fromColumn->generateCreationScript()) {
                 $changedTable->addChangedColumn($toColumn);
                 continue;
             }
 
             if (!$fromColumn->getPreviousColumn() && !$toColumn->getPreviousColumn()) {
                 continue;
-            } elseif (!$fromColumn->getPreviousColumn() && $toColumn->getPreviousColumn() instanceof Column) {
+            }
+            if (!$fromColumn->getPreviousColumn() && $toColumn->getPreviousColumn() instanceof Column) {
                 $this->addChangedColumn($changedTable, $toColumn);
             } elseif ($fromColumn->getPreviousColumn() instanceof Column && !$toColumn->getPreviousColumn()) {
                 $this->addChangedColumn($changedTable, $toColumn);
-            } elseif ($fromColumn->getPreviousColumn()->getName() != $toColumn->getPreviousColumn()->getName()) {
+            } elseif ($fromColumn->getPreviousColumn()->getName() !== $toColumn->getPreviousColumn()->getName()) {
                 $this->addChangedColumn($changedTable, $toColumn);
             }
         }
@@ -137,7 +144,7 @@ private function diffPrimaryKey(ChangedTable $changedTable)
             return;
         }
 
-        if ($fromTable->generatePrimaryKeyCreationScript() != $toTable->generatePrimaryKeyCreationScript()) {
+        if ($fromTable->generatePrimaryKeyCreationScript() !== $toTable->generatePrimaryKeyCreationScript()) {
             $changedTable->setChangedPrimaryKeys($toTable->getPrimaryKeys());
         }
     }
@@ -167,7 +174,7 @@ private function diffIndexes(ChangedTable $changedTable)
 
             // Determine changed indexes
             $fromIndex = $fromTable->getIndexByName($toIndex->getName());
-            if ($toIndex->generateCreationScript() != $fromIndex->generateCreationScript()) {
+            if ($toIndex->generateCreationScript() !== $fromIndex->generateCreationScript()) {
                 $changedTable->addChangedIndex($toIndex);
             }
         }
@@ -198,7 +205,7 @@ private function diffForeignKeys(ChangedTable $changedTable)
 
             // Determine changed foreign keys
             $fromForeignKey = $fromTable->getForeignKeyByName($toForeignKey->getName());
-            if ($toForeignKey->generateCreationScript() != $fromForeignKey->generateCreationScript()) {
+            if ($toForeignKey->generateCreationScript() !== $fromForeignKey->generateCreationScript()) {
                 $changedTable->addChangedForeignKey($toForeignKey);
             }
         }
@@ -212,46 +219,69 @@ private function diffForeignKeys(ChangedTable $changedTable)
      */
     public function generateMigrationScript(DatabaseDiff $databaseDiff, $displayProgress = false)
     {
-        $migrationScript = '';
-        $migrationScript .= '# Disable Foreign Keys Check' . PHP_EOL;
-        $migrationScript .= 'SET FOREIGN_KEY_CHECKS = 0;' . PHP_EOL;
-        $migrationScript .= 'SET SQL_MODE = \'\';' . PHP_EOL;
+        return implode(PHP_EOL, $this->generateMigrationScriptArray($databaseDiff, $displayProgress));
+    }
 
-        $migrationScript .= PHP_EOL . '# Deleted Tables' . PHP_EOL;
+    /**
+     * @param DatabaseDiff $databaseDiff
+     * @param bool $displayProgress
+     *
+     * @return array
+     */
+    public function generateMigrationScriptArray(DatabaseDiff $databaseDiff, $displayProgress = false)
+    {
+        $migrationScript = array();
+        $migrationScript[] = '# Disable Foreign Keys Check';
+        $migrationScript[] = 'SET FOREIGN_KEY_CHECKS = 0;';
+        $migrationScript[] = 'SET SQL_MODE = \'\';';
+
+        $migrationScript[] = '';
+        $migrationScript[] = '# Deleted Tables';
         foreach ($databaseDiff->getDeletedTables() as $deletedTable) {
-            $migrationScript .= PHP_EOL . sprintf('-- deleted table `%s`' . PHP_EOL . PHP_EOL, $deletedTable->getName());
+            $migrationScript[] = '';
+            $migrationScript[] = sprintf('-- deleted table `%s`', $deletedTable->getName());
+            $migrationScript[] = '';
+
 
             if ($displayProgress) {
-                $migrationScript .= sprintf("SELECT 'Dropping table %s';" . PHP_EOL, $deletedTable->getName());
+                $migrationScript[] = sprintf("SELECT 'Dropping table %s';", $deletedTable->getName());
             }
 
-            $migrationScript .= sprintf('DROP TABLE `%s`;' . PHP_EOL, $deletedTable->getName());
+            $migrationScript[] = sprintf('DROP TABLE `%s`;', $deletedTable->getName());
         }
 
-        $migrationScript .= PHP_EOL . '# Changed Tables' . PHP_EOL;
+        $migrationScript[] = '';
+        $migrationScript[] = '# Changed Tables';
         foreach ($databaseDiff->getChangedTables() as $changedTable) {
-            $migrationScript .= PHP_EOL . sprintf('-- changed table `%s`' . PHP_EOL . PHP_EOL, $changedTable->getName());
+            $migrationScript[] = '';
+            $migrationScript[] = sprintf('-- changed table `%s`', $changedTable->getName());
+            $migrationScript[] = '';
 
             if ($displayProgress) {
-                $migrationScript .= sprintf("SELECT 'Altering table %s';" . PHP_EOL, $changedTable->getName());
+                $migrationScript[] = sprintf("SELECT 'Altering table %s';", $changedTable->getName());
             }
 
-            $migrationScript .= $changedTable->generateAlterScript() . PHP_EOL;
+            $migrationScript[] = $changedTable->generateAlterScript();
         }
+        $migrationScript[] = '';
+        $migrationScript[] = '# New Tables';
 
-        $migrationScript .= PHP_EOL . '# New Tables' . PHP_EOL;
         foreach ($databaseDiff->getNewTables() as $newTable) {
-            $migrationScript .= PHP_EOL . sprintf('-- new table `%s`' . PHP_EOL . PHP_EOL, $newTable->getName());
+            $migrationScript[] = '';
+            $migrationScript[] = sprintf('-- new table `%s`', $newTable->getName());
+            $migrationScript[] = '';
 
             if ($displayProgress) {
-                $migrationScript .= sprintf("SELECT 'Creating table %s';" . PHP_EOL, $newTable->getName());
+                $migrationScript[] = sprintf("SELECT 'Creating table %s';", $newTable->getName());
             }
 
-            $migrationScript .= $newTable->generateCreationScript(true) . PHP_EOL;
+            $migrationScript[] = $newTable->generateCreationScript(true);
         }
 
-        $migrationScript .= PHP_EOL . '# Disable Foreign Keys Check' . PHP_EOL;
-        $migrationScript .= 'SET FOREIGN_KEY_CHECKS = 1;' . PHP_EOL;
+        $migrationScript[] = '';
+        $migrationScript[] = '# Disable Foreign Keys Check';
+        $migrationScript[] = 'SET FOREIGN_KEY_CHECKS = 1;';
+        $migrationScript[] = '';
 
         return $migrationScript;
     }
diff --git a/src/Model/ChangedTable.php b/src/Model/ChangedTable.php
@@ -2,6 +2,11 @@
 
 namespace Camcima\MySqlDiff\Model;
 
+/**
+ * Class ChangedTable
+ *
+ * @package Camcima\MySqlDiff\Model
+ */
 class ChangedTable
 {
     /**
@@ -367,6 +372,26 @@ public function generateAlterScript()
             $tableChanges[] = sprintf('ADD %s', $newForeignKey->generateCreationScript());
         }
 
+        if ($this->fromTable->getEngine() !== $this->toTable->getEngine()) {
+            $tableChanges[] = sprintf('ENGINE=%s', $this->toTable->getEngine());
+        }
+
+        if ($this->fromTable->getDefaultCharset() !== $this->toTable->getDefaultCharset()) {
+            $tableChanges[] = sprintf('DEFAULT CHARSET=%s', $this->toTable->getDefaultCharset());
+        }
+
+        if ($this->fromTable->getRowFormat() !== $this->toTable->getRowFormat()) {
+            $tableChanges[] = sprintf('ROW_FORMAT=%s', $this->toTable->getRowFormat());
+        }
+
+        if ($this->fromTable->getKeyBlockSize() !== $this->toTable->getKeyBlockSize()) {
+            $tableChanges[] = sprintf('KEY_BLOCK_SIZE=%s', $this->toTable->getKeyBlockSize());
+        }
+
+        if ($this->fromTable->getComment() !== $this->toTable->getComment()) {
+            $tableChanges[] = sprintf('COMMENT=\'%s\'', str_replace('\'','\'\'', $this->toTable->getComment()));
+        }
+
         $alterScript = sprintf('ALTER TABLE `%s`%s  %s;', $this->getName(), PHP_EOL, implode(',' . PHP_EOL . '  ', $tableChanges));
 
         return $alterScript;
diff --git a/src/Model/Column.php b/src/Model/Column.php
@@ -2,6 +2,11 @@
 
 namespace Camcima\MySqlDiff\Model;
 
+/**
+ * Class Column
+ *
+ * @package Camcima\MySqlDiff\Model
+ */
 class Column
 {
     /**
@@ -420,7 +425,7 @@ public function generateCreationScript()
 
         if (!$this->nullable) {
             $columnOptions[] = 'NOT NULL';
-        } elseif ($this->columnType == 'timestamp') {
+        } elseif ($this->columnType === 'timestamp') {
             $columnOptions[] = 'NULL';
         }
 
diff --git a/src/Model/Database.php b/src/Model/Database.php
@@ -2,6 +2,11 @@
 
 namespace Camcima\MySqlDiff\Model;
 
+/**
+ * Class Database
+ *
+ * @package Camcima\MySqlDiff\Model
+ */
 class Database
 {
     /**
@@ -27,8 +32,8 @@ public function addTable(Table $table)
 
     /**
      * @param string $tableName
-     *
      * @return Table
+     * @throws \RuntimeException
      */
     public function getTableByName($tableName)
     {
diff --git a/src/Model/DatabaseDiff.php b/src/Model/DatabaseDiff.php
@@ -2,6 +2,11 @@
 
 namespace Camcima\MySqlDiff\Model;
 
+/**
+ * Class DatabaseDiff
+ *
+ * @package Camcima\MySqlDiff\Model
+ */
 class DatabaseDiff
 {
     /**
diff --git a/src/Model/ForeignKey.php b/src/Model/ForeignKey.php
@@ -2,6 +2,11 @@
 
 namespace Camcima\MySqlDiff\Model;
 
+/**
+ * Class ForeignKey
+ *
+ * @package Camcima\MySqlDiff\Model
+ */
 class ForeignKey
 {
     /**
diff --git a/src/Model/Index.php b/src/Model/Index.php
@@ -2,6 +2,11 @@
 
 namespace Camcima\MySqlDiff\Model;
 
+/**
+ * Class Index
+ *
+ * @package Camcima\MySqlDiff\Model
+ */
 class Index
 {
     /**
@@ -72,7 +77,7 @@ public function setParentTable($parentTable)
     }
 
     /**
-     * @return Column[]
+     * @return IndexColumn[]
      */
     public function getIndexColumns()
     {
@@ -97,13 +102,13 @@ public function addIndexColumn(IndexColumn $indexColumn)
 
     /**
      * @param $columnName
-     *
      * @return IndexColumn
+     * @throws \RuntimeException
      */
     public function getIndexColumnByColumnName($columnName)
     {
         foreach ($this->indexColumns as $indexColumn) {
-            if ($indexColumn->getColumn()->getName() == $columnName) {
+            if ($indexColumn->getColumn()->getName() === $columnName) {
                 return $indexColumn;
             }
         }
diff --git a/src/Model/IndexColumn.php b/src/Model/IndexColumn.php
@@ -2,6 +2,11 @@
 
 namespace Camcima\MySqlDiff\Model;
 
+/**
+ * Class IndexColumn
+ *
+ * @package Camcima\MySqlDiff\Model
+ */
 class IndexColumn
 {
     /**
diff --git a/src/Model/Table.php b/src/Model/Table.php
diff --git a/src/Parser.php b/src/Parser.php
diff --git a/src/RegExpPattern.php b/src/RegExpPattern.php
diff --git a/tests/fixtures/sakila_migration.sql b/tests/fixtures/sakila_migration.sql
diff --git a/tests/fixtures/sakila_new.sql b/tests/fixtures/sakila_new.sql

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,11 @@`
`5`	`5`	`use Symfony\Component\Console\Command\Command;`
`6`	`6`	`use Symfony\Component\Console\Output\OutputInterface;`
`7`	`7`
	`8`	`+/**`
	`9`	`+ * Class AbstractCommand`
	`10`	`+ *`
	`11`	`+ * @package Camcima\MySqlDiff\Command`
	`12`	`+ */`
`8`	`13`	`abstract class AbstractCommand extends Command`
`9`	`14`	`{`
`10`	`15`	`/**`
`@@ -30,11 +35,11 @@ protected function outputLine($line = '', $forceOutput = false)`
`30`	`35`
`31`	`36`	`/**`
`32`	`37`	`* @param string $string`
`33`		`- * @param bool $forceOuput`
	`38`	`+ * @param bool $forceOutput`
`34`	`39`	`*/`
`35`		`- protected function outputString($string = '', $forceOuput = false)`
	`40`	`+ protected function outputString($string = '', $forceOutput = false)`
`36`	`41`	`{`
`37`		`- if ($this->verbose \|\| $forceOuput) {`
	`42`	`+ if ($this->verbose \|\| $forceOutput) {`
`38`	`43`	`$this->output->write($string);`
`39`	`44`	`}`
`40`	`45`	`}`