Merge branch 'release-3.4.0' into stable

Author: Alexandre GUIDET

Migrate/Command/AbstractEnvCommand.php

@@ -19,7 +19,7 @@
 class AbstractEnvCommand extends AbstractComand
 {
 
-    protected static $progressBarFormat = '%current%/%max% [%bar%] %percent% % %memory% [%message%]';
+    protected static $progressBarFormat = '%current%/%max% [%bar%] %percent% % [%message%]';
 
     /**
      * @var \PDO
@@ -76,10 +76,14 @@ protected function init(InputInterface $input, OutputInterface $output, $env = n
         $password = ArrayUtil::get($conf['connection'], 'password');
 
         $uri = $driver;
-        $uri .= ($dbname == null) ?: ":dbname=$dbname";
-        $uri .= ($host == null) ?: ";host=$host";
-        $uri .= ($port == null) ?: ";port=$port";
 
+        if ($driver == 'sqlite') {
+            $uri .= ":$dbname";
+        }  else {
+            $uri .= ($dbname == null) ?: ":dbname=$dbname";
+            $uri .= ($host == null) ?: ";host=$host";
+            $uri .= ($port == null) ?: ";port=$port";
+        }
         $this->db = new \PDO(
             $uri,
             $username,
@@ -98,6 +102,7 @@ public function getLocalMigrations()
         $fileList = scandir($this->getMigrationDir());
         $fileList = ArrayUtil::filter($fileList);
 
+        $migrations = array();
         foreach ($fileList as $file) {
             $migration = Migration::createFromFile($file, $this->getMigrationDir());
             $migrations[$migration->getId()] = $migration;

Migrate/Command/CreateCommand.php

@@ -49,7 +49,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
         file_put_contents($migrationFullPath, $templateFile);
         $output->writeln("<info>$migrationFullPath created</info>");
 
-        system("vim $migrationFullPath  > `tty`");
+        if (!defined('PHPUNIT')) {
+            system("vim $migrationFullPath  > `tty`");
+        }
     }
 
 }

Migrate/Enum/Directory.php

@@ -0,0 +1,25 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: aguidet
+ * Date: 01/03/15
+ * Time: 01:41
+ */
+
+namespace Migrate\Enum;
+
+
+class Directory {
+
+    public static $appDirectory = '.php-database-migration';
+
+    public static function getEnvPath()
+    {
+        return self::$appDirectory . '/environments';
+    }
+
+    public static function getMigrationsPath()
+    {
+        return self::$appDirectory . '/migrations';
+    }
+}

Migrate/Utils/InputStreamUtil.php

@@ -0,0 +1,23 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: aguidet
+ * Date: 01/03/15
+ * Time: 01:45
+ */
+
+namespace Migrate\Utils;
+
+
+class InputStreamUtil {
+
+    public static function type($input)
+    {
+        $stream = fopen('php://memory', 'r+', false);
+        fputs($stream, $input);
+        rewind($stream);
+
+        return $stream;
+    }
+
+}

README.md

@@ -1,48 +1,67 @@
 PhpDbMigration - full PHP database migration tool
 =================================================
 
-This is a full standalone PHP tool inspired by the rails database migration tool and MyBatis.
+This is a full standalone PHP tool based on symfony console and inspired by the rails database migration tool and MyBatis.
 It merge the functionnality of the two tools and has been desined to be as flexible as possible.
 
+Installing it to your project
+-----------------------------
+Just add it to your composer.json (don't forget to specify your bin directory)
+Warning, all migrate commands must be executed on your root folder like `bin/migrate migrate:command...`
+
+    {
+        "name": "jdoe/testproject",
+        "authors": [
+            {
+                "name": "Jhon DOE",
+                "email": "jdoe@gmail.com"
+            }
+        ],
+        "require": {
+            "php-database-migration/php-database-migration" :"3.4.*"
+        },
+        "config": {
+            "bin-dir": "bin"
+        }
+    }
+
+
+Adding an environment
+---------------------
+The first thing to do before playing with SQL migrations is to add an environment, let's add the dev one.
+
+![alt tag](http://tikotepadventure.com/files/php-database-migration/addenv.gif)
+
 Initialization
 --------------
+Once the environment is added, you have to initialize it (create the changelog table on the good database) 
 
-The first time the tool is run, it needs a first initialization like the following:
-
-    ./migrate --init --driver=<driver> --database=<database> --host=<host> --login=<db_login> --password=<db_password> --changelog=<changelog_table_name>
+![alt tag](http://tikotepadventure.com/files/php-database-migration/init.gif)
 
-Example:
+Create a migration
+------------------
+It is time to create our first migration file.
 
-    ./migrate --init --driver=pgsql --database=php_migration_test --host=localhost --login=my_login --password=my_password --changelog=changelog
+![alt tag](http://tikotepadventure.com/files/php-database-migration/create.gif)
 
-wich will create the following directories/files
+Migrations file are like this
 
-    ./environments
-         |----development.ini
-         |----preproduction.ini
-         `----production.ini
+    --// add table users
+    -- Migration SQL that makes the change goes here.
+    create table users (id integer, name text);
+    -- @UNDO
+    -- SQL to undo the change goes here.
+    drop table users;
 
-    ./migrations
+Up and down
+------------------
+You can now up all the pending migrations. If you decided to down a migration, the last one will be downed alone to prevent from mistake. You will be asked to confirm the downgrade of your database before runing the real SQL script. 
+![alt tag](http://tikotepadventure.com/files/php-database-migration/status.gif)
 
-just edit/change the environment ini files in order to match with your database access.
+For developement purpose, it is also possible to up a single migration without taking care of the other ones.
 
-Usage
------
+![alt tag](http://tikotepadventure.com/files/php-database-migration/uponly.gif)
 
-    Usage: ./migrate command [parameters] [--env=<environment>]
-    
-    Commands:
-      --env=<environment>       Environment to configure. Default environment is 'dev'.
-      --generate <description>  Creates a new migration with the provided description.
-      --up                      Run unapplied migrations, ALL by default.
-      --up=<version>            Run unapplied migrations up to version (included).
-      --down                    Undoes migrations applied to the database. ONE by default.
-      --down=<version>          Undoes migrations applied to the database. Down to version (included).
-      --force                   Run or undoes only specified migration (not recommended).
-      --transactional           Rollback all applied migration up or down on error.
-      --status                  Show migrations status (applied, unapplied ect...).
+Same thing for down
 
-    Examples:
-    ./migrate [--generate <migration_name>]
-    ./migrate [--up | --up=<version> | --down | --down=<version>] [--transactional] [--force] [--env=<environment>]
-    ./migrate [--status] [--env=<environment>]
+![alt tag](http://tikotepadventure.com/files/php-database-migration/downonly.gif)

composer.json

@@ -30,5 +30,8 @@
     },
     "autoload": {
       "psr-4": {"Migrate\\": "Migrate/"}
+    },
+    "autoload-dev": {
+      "psr-4": { "Migrate\\Test\\": "tests/" }
     }
 }

composer.lock

@@ -0,0 +1,83 @@
+<?php
+/**
+ * User: aguidet
+ * Date: 02/03/15
+ * Time: 15:19
+ */
+
+namespace Migrate\Test\Command;
+
+use Migrate\Command\AddEnvCommand;
+use Migrate\Command\InitCommand;
+use Migrate\Enum\Directory;
+use Migrate\Utils\InputStreamUtil;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Tester\CommandTester;
+
+class AbstractCommandTester extends \PHPUnit_Framework_TestCase
+{
+    public static $env = 'testing';
+    public static $driver = 'sqlite';
+    public static $bddName = 'migrate_test';
+    public static $username = 'aguidet';
+    public static $password = 'aguidet';
+    public static $host = 'localhost';
+    public static $port = '5432';
+
+    public function cleanEnv()
+    {
+        exec("rm -rf .php-database-migration");
+
+        if (file_exists('test.sqlite')) {
+            exec("rm test.sqlite");
+        }
+    }
+
+    public function createEnv()
+    {
+        $application = new Application();
+        $application->add(new AddEnvCommand());
+
+        $command = $application->find('migrate:addenv');
+        $commandTester = new CommandTester($command);
+
+        /* @var $question QuestionHelper */
+        $question = $command->getHelper('question');
+        $question->setInputStream(InputStreamUtil::type("testing\n1\ntest.sqlite\n\n\n\n\nchangelog\nvim\n"));
+
+        $commandTester->execute(array('command' => $command->getName()));
+    }
+
+    public function initEnv()
+    {
+        $application = new Application();
+        $application->add(new InitCommand());
+
+        $command = $application->find('migrate:init');
+        $commandTester = new CommandTester($command);
+
+        $commandTester->execute(array(
+            'command' => $command->getName(),
+            'env' => 'testing'
+        ));
+    }
+
+    public function createMigration($timestamp, $sqlUp, $sqlDown)
+    {
+        $filename = Directory::getMigrationsPath() . '/' . $timestamp . '_migration.sql';
+
+        $content =<<<SQL
+--// unit testing migration
+-- Migration SQL that makes the change goes here.
+$sqlUp
+
+-- @UNDO
+-- SQL to undo the change goes here.
+$sqlDown
+
+SQL;
+
+        file_put_contents($filename, $content);
+    }
+}

tests/Command/AbstractCommandTester.php

@@ -0,0 +1,66 @@
+<?php
+/**
+ * User: aguidet
+ * Date: 27/02/15
+ * Time: 17:21
+ */
+
+namespace Migrate\Command;
+
+use Migrate\Enum\Directory;
+use Migrate\Utils\InputStreamUtil;
+use Symfony\Component\Console\Application;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Tester\CommandTester;
+use Migrate\Test\Command\AbstractCommandTester;
+
+class AddenvCommandTest extends AbstractCommandTester
+{
+    public function setUp()
+    {
+        $this->cleanEnv();
+    }
+
+    public function tearDown()
+    {
+        $this->cleanEnv();
+    }
+
+    public function testExecute()
+    {
+        $application = new Application();
+        $application->add(new AddEnvCommand());
+
+        $command = $application->find('migrate:addenv');
+        $commandTester = new CommandTester($command);
+
+        /* @var $question QuestionHelper */
+        $question = $command->getHelper('question');
+        $question->setInputStream(InputStreamUtil::type("testing\n1\nmigrate_test\nlocalhost\n5432\naguidet\naguidet\nchangelog\nvim\n"));
+
+        $commandTester->execute(array('command' => $command->getName()));
+
+        $expected = "Please enter the name of the new environment (default dev): Please chose your pdo driver\n  [0] pgsql\n  [1] sqlite\n > Please enter the database name (or the database file location): Please enter the database host (if needed): Please enter the database port (if needed): Please enter the database user name (if needed): Please enter the database user password (if needed): Please enter the changelog table (default changelog): Please enter the text editor to use by default (default vim): ";
+        $this->assertEquals($expected, $commandTester->getDisplay());
+
+        $envDir = Directory::getEnvPath();
+
+        $expected = <<<EXPECTED
+connection:
+    host:     localhost
+    driver:   sqlite
+    port:     5432
+    username: aguidet
+    password: aguidet
+    database: migrate_test
+
+changelog: changelog
+default_editor: vim
+EXPECTED;
+
+        $fileContent = file_get_contents($envDir . '/testing.yml');
+
+        $this->assertEquals($expected, $fileContent);
+    }
+
+}