Merge remote-tracking branch 'origin/master' into hotfix-3.6.1

Alexandre Guidet · Alexandre Guidet · commit 07ad48866cae · 2016-09-19T15:12:34.000+12:00
diff --git a/Migrate/Command/AbstractEnvCommand.php b/Migrate/Command/AbstractEnvCommand.php
@@ -11,7 +11,6 @@
 
 use Migrate\Migration;
 use Migrate\Utils\ArrayUtil;
-use SebastianBergmann\GlobalState\RuntimeException;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -208,21 +207,25 @@ public function removeFromChangelog(Migration $migration)
 
     /**
      * @param Migration $migration
+     * @param bool $changeLogOnly
      */
-    public function executeUpMigration(Migration $migration)
+    public function executeUpMigration(Migration $migration, $changeLogOnly = false)
     {
         $this->getDb()->beginTransaction();
-        $result = $this->getDb()->exec($migration->getSqlUp());
-
-        if ($result === false) {
-            // error while executing the migration
-            $errorInfo = "";
-            $errorInfos = $this->getDb()->errorInfo();
-            foreach ($errorInfos as $line) {
-                $errorInfo .= "\n$line";
+
+        if ($changeLogOnly === false) {
+            $result = $this->getDb()->exec($migration->getSqlUp());
+
+            if ($result === false) {
+                // error while executing the migration
+                $errorInfo = "";
+                $errorInfos = $this->getDb()->errorInfo();
+                foreach ($errorInfos as $line) {
+                    $errorInfo .= "\n$line";
+                }
+                $this->getDb()->rollBack();
+                throw new \RuntimeException("migration error, some SQL may be wrong\n\nid: {$migration->getId()}\nfile: {$migration->getFile()}\n" . $errorInfo);
             }
-            $this->getDb()->rollBack();
-            throw new \RuntimeException("migration error, some SQL may be wrong\n\nid: {$migration->getId()}\nfile: {$migration->getFile()}\n" . $errorInfo);
         }
 
         $this->saveToChangelog($migration);
@@ -231,21 +234,25 @@ public function executeUpMigration(Migration $migration)
 
     /**
      * @param Migration $migration
+     * @param bool $changeLogOnly
      */
-    public function executeDownMigration(Migration $migration)
+    public function executeDownMigration(Migration $migration, $changeLogOnly = false)
     {
         $this->getDb()->beginTransaction();
-        $result = $this->getDb()->exec($migration->getSqlDown());
-
-        if ($result === false) {
-            // error while executing the migration
-            $errorInfo = "";
-            $errorInfos = $this->getDb()->errorInfo();
-            foreach ($errorInfos as $line) {
-                $errorInfo .= "\n$line";
+
+        if ($changeLogOnly === false) {
+            $result = $this->getDb()->exec($migration->getSqlDown());
+
+            if ($result === false) {
+                // error while executing the migration
+                $errorInfo = "";
+                $errorInfos = $this->getDb()->errorInfo();
+                foreach ($errorInfos as $line) {
+                    $errorInfo .= "\n$line";
+                }
+                $this->getDb()->rollBack();
+                throw new \RuntimeException("migration error, some SQL may be wrong\n\nid: {$migration->getId()}\nfile: {$migration->getFile()}\n" . $errorInfo);
             }
-            $this->getDb()->rollBack();
-            throw new \RuntimeException("migration error, some SQL may be wrong\n\nid: {$migration->getId()}\nfile: {$migration->getFile()}\n" . $errorInfo);
         }
         $this->removeFromChangelog($migration);
         $this->getDb()->commit();
diff --git a/Migrate/Command/DownCommand.php b/Migrate/Command/DownCommand.php
@@ -41,6 +41,12 @@ protected function configure()
                 InputOption::VALUE_REQUIRED,
                 'If you need to down this migration id only'
             )
+            ->addOption(
+                'changelog-only',
+                null,
+                InputOption::VALUE_NONE,
+                'Mark as applied without executing SQL '
+            )
         ;
     }
 
@@ -50,6 +56,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $this->init($input, $output);
 
+        $changeLogOnly = (bool) $input->getOption('changelog-only');
         /* @var $questions QuestionHelper */
         $questions = $this->getHelperSet()->get('question');
 
@@ -75,7 +82,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 /* @var $migration \Migrate\Migration */
                 foreach ($toExecute as $migration) {
                     $progress->setMessage($migration->getDescription());
-                    $this->executeDownMigration($migration);
+                    $this->executeDownMigration($migration, $changeLogOnly);
                     $progress->advance();
                 }
 
diff --git a/Migrate/Command/UpCommand.php b/Migrate/Command/UpCommand.php
@@ -38,6 +38,12 @@ protected function configure()
                 InputOption::VALUE_REQUIRED,
                 'If you need to up this migration id only'
             )
+            ->addOption(
+                'changelog-only',
+                null,
+                InputOption::VALUE_NONE,
+                'Mark as applied without executing SQL '
+            )
         ;
     }
 
@@ -47,6 +53,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $this->init($input, $output);
 
+        $changeLogOnly = (bool) $input->getOption('changelog-only');
         $toExecute = $this->filterMigrationsToExecute($input, $output);
 
         if (count($toExecute) == 0) {
@@ -64,7 +71,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
             /* @var $migration \Migrate\Migration */
             foreach ($toExecute as $migration) {
                 $progress->setMessage($migration->getDescription());
-                $this->executeUpMigration($migration);
+                $this->executeUpMigration($migration, $changeLogOnly);
                 $progress->advance();
             }
 
diff --git a/README.md b/README.md
@@ -3,6 +3,7 @@ PhpDbMigration - full PHP database migration tool
 
 [![Build Status](https://travis-ci.org/alwex/php-database-migration.svg?branch=master)](https://travis-ci.org/alwex/php-database-migration)
 [![Packagist](https://img.shields.io/packagist/dt/php-database-migration/php-database-migration.svg?maxAge=2592000)]()
+[![Version](http://img.shields.io/packagist/v/php-database-migration/php-database-migration.svg?style=flat)](https://packagist.org/packages/php-database-migration/php-database-migration)
 
 This is a full standalone PHP tool based on [Symfony Console](http://symfony.com/doc/current/components/console)
 and inspired by the Rails database migration tool and MyBatis. It merges the functionality of the two tools and
@@ -118,6 +119,12 @@ You can now up all the pending migrations. If you decided to down a migration, t
 $ ./bin/migrate migrate:up [env]
 ```
 
+You can mark migrations as applied without executing SQL (e.g. if you switched from another migration system)
+
+```
+$ ./bin/migrate migrate:up [env] --changelog-only
+```
+
 For developement purpose, it is also possible to up a single migration without taking care of the other ones:
 
 ```
diff --git a/composer.lock b/composer.lock

Original file line number	Diff line number	Diff line change
`@@ -41,6 +41,12 @@ protected function configure()`
`41`	`41`	`InputOption::VALUE_REQUIRED,`
`42`	`42`	`'If you need to down this migration id only'`
`43`	`43`	`)`
	`44`	`+ ->addOption(`
	`45`	`+ 'changelog-only',`
	`46`	`+ null,`
	`47`	`+ InputOption::VALUE_NONE,`
	`48`	`+ 'Mark as applied without executing SQL '`
	`49`	`+ )`
`44`	`50`	`;`
`45`	`51`	`}`
`46`	`52`
`@@ -50,6 +56,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`50`	`56`
`51`	`57`	`$this->init($input, $output);`
`52`	`58`
	`59`	`+ $changeLogOnly = (bool) $input->getOption('changelog-only');`
`53`	`60`	`/* @var $questions QuestionHelper */`
`54`	`61`	`$questions = $this->getHelperSet()->get('question');`
`55`	`62`
`@@ -75,7 +82,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`75`	`82`	`/* @var $migration \Migrate\Migration */`
`76`	`83`	`foreach ($toExecute as $migration) {`
`77`	`84`	`$progress->setMessage($migration->getDescription());`
`78`		`- $this->executeDownMigration($migration);`
	`85`	`+ $this->executeDownMigration($migration, $changeLogOnly);`
`79`	`86`	`$progress->advance();`
`80`	`87`	`}`
`81`	`88`
Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,12 @@ protected function configure()`
`38`	`38`	`InputOption::VALUE_REQUIRED,`
`39`	`39`	`'If you need to up this migration id only'`
`40`	`40`	`)`
	`41`	`+ ->addOption(`
	`42`	`+ 'changelog-only',`
	`43`	`+ null,`
	`44`	`+ InputOption::VALUE_NONE,`
	`45`	`+ 'Mark as applied without executing SQL '`
	`46`	`+ )`
`41`	`47`	`;`
`42`	`48`	`}`
`43`	`49`
`@@ -47,6 +53,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`47`	`53`
`48`	`54`	`$this->init($input, $output);`
`49`	`55`
	`56`	`+ $changeLogOnly = (bool) $input->getOption('changelog-only');`
`50`	`57`	`$toExecute = $this->filterMigrationsToExecute($input, $output);`
`51`	`58`
`52`	`59`	`if (count($toExecute) == 0) {`
`@@ -64,7 +71,7 @@ protected function execute(InputInterface $input, OutputInterface $output)`
`64`	`71`	`/* @var $migration \Migrate\Migration */`
`65`	`72`	`foreach ($toExecute as $migration) {`
`66`	`73`	`$progress->setMessage($migration->getDescription());`
`67`		`- $this->executeUpMigration($migration);`
	`74`	`+ $this->executeUpMigration($migration, $changeLogOnly);`
`68`	`75`	`$progress->advance();`
`69`	`76`	`}`
`70`	`77`