Merge pull request #7 from jeremygiberson/master

Adding unit tests

.gitignore

@@ -0,0 +1,4 @@
+.idea/
+vendor/
+composer.lock
+tests/integration/data/ignore/

.travis.yml

@@ -0,0 +1,29 @@
+language: php
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+env:
+  - DB=sqlite
+  - DB=mysql
+  - DB=mysqli
+  - DB=postgresql
+
+matrix:
+  allow_failures:
+    - php: 5.4
+      env: DB=postgresql
+    - php: 5.5
+      env: DB=postgresql
+    - php: 5.6
+      env: DB=postgresql
+
+services:
+    - postgresql
+
+before_script:
+    - composer install
+    - mysql -e "create database IF NOT EXISTS test;" -uroot
+    - psql -c 'create database test;' -U postgres
+
+script: phpunit -c phpunit.${DB}.xml

README.md

@@ -2,6 +2,14 @@
 
 Simple Migrations for Zend Framework 2. Project originally based on [ZendDbMigrations](https://github.com/vadim-knyzev/ZendDbMigrations) but module author did not response for issues and pull-requests so fork became independent project.
 
+## Supported Drivers
+The following DB adapter drivers are supported by this module.
+
+  * Pdo_Sqlite
+  * Pdo_Mysql
+  * Mysqli _only if you configure the driver options with `'buffer_results' => true`_
+
+
 ## Installation
 
 ### Using composer
@@ -51,6 +59,22 @@ class Version20130403165433 extends AbstractMigration
 }
 ```
 
+#### Multi-statement sql
+While this module supports execution of multiple SQL statements it does not have way to detect if any other statement than the first contained an error. It is *highly* recommended you only provide single SQL statements to `addSql` at a time.
+I.e instead of
+
+```
+$this->addSql('SELECT NOW(); SELECT NOW(); SELECT NOW();');
+```
+
+You should use
+
+```
+$this->addSql('SELECT NOW();');
+$this->addSql('SELECT NOW();');
+$this->addSql('SELECT NOW();');
+```
+
 ### Accessing ServiceLocator In Migration Class
 
 By implementing the `Zend\ServiceManager\ServiceLocatorAwareInterface` in your migration class you get access to the

composer.json

@@ -23,9 +23,12 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.4",
         "zendframework/zendframework": ">=2.2.0"
     },
+    "require-dev": {
+        "phpunit/phpunit": "4.6.*"
+    },
     "autoload": {
         "psr-0": {
             "ZfSimpleMigrations": "src/"

phpunit.mysql.xml

@@ -0,0 +1,19 @@
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.6/phpunit.xsd"
+        bootstrap="vendor/autoload.php"
+        >
+    <testsuites>
+        <testsuite name="Integration Tests">
+            <directory>tests/integration</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <env name="db_type" value="Pdo_Mysql"/>
+        <env name="db_host" value="localhost" />
+        <env name="db_username" value="travis" />
+        <env name="db_password" value="" />
+        <env name="db_name" value="test" />
+        <env name="db_port" value=""/>
+    </php>
+</phpunit>

phpunit.mysqli.xml

@@ -0,0 +1,19 @@
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.6/phpunit.xsd"
+        bootstrap="vendor/autoload.php"
+        >
+    <testsuites>
+        <testsuite name="Integration Tests">
+            <directory>tests/integration</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <env name="db_type" value="Mysqli"/>
+        <env name="db_host" value="localhost" />
+        <env name="db_username" value="travis" />
+        <env name="db_password" value="" />
+        <env name="db_name" value="test" />
+        <env name="db_port" value=""/>
+    </php>
+</phpunit>

phpunit.postgresql.xml

@@ -0,0 +1,19 @@
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.6/phpunit.xsd"
+        bootstrap="vendor/autoload.php"
+        >
+    <testsuites>
+        <testsuite name="Integration Tests">
+            <directory>tests/integration</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <env name="db_type" value="Pdo_Pgsql"/>
+        <env name="db_host" value="localhost" />
+        <env name="db_username" value="postgres" />
+        <env name="db_password" value="" />
+        <env name="db_name" value="test" />
+        <env name="db_port" value="5432"/>
+    </php>
+</phpunit>

phpunit.sqlite.xml

@@ -0,0 +1,19 @@
+<phpunit
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.6/phpunit.xsd"
+        bootstrap="vendor/autoload.php"
+        >
+    <testsuites>
+        <testsuite name="Integration Tests">
+            <directory>tests/integration</directory>
+        </testsuite>
+    </testsuites>
+    <php>
+        <env name="db_type" value="Pdo_Sqlite"/>
+        <env name="db_host" value="" />
+        <env name="db_username" value="" />
+        <env name="db_password" value="" />
+        <env name="db_name" value="%BASE_DIR%/tests/integration/data/ignore/db.sqlite" />
+        <env name="db_port" value=""/>
+    </php>
+</phpunit>

phpunit.xml

@@ -0,0 +1,11 @@
+<phpunit
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.6/phpunit.xsd"
+         bootstrap="vendor/autoload.php"
+         >
+<testsuites>
+  <testsuite name="Unit Tests">
+    <directory>tests/unit</directory>
+  </testsuite>
+</testsuites>
+</phpunit>

src/ZfSimpleMigrations/Library/Migration.php

@@ -36,6 +36,14 @@ class Migration implements ServiceLocatorAwareInterface
      */
     protected $serviceLocator;
 
+    /**
+     * @return \ZfSimpleMigrations\Library\OutputWriter
+     */
+    public function getOutputWriter()
+    {
+        return $this->outputWriter;
+    }
+
     /**
      * @param \Zend\Db\Adapter\Adapter $adapter
      * @param array $config
@@ -288,12 +296,7 @@ protected function applyMigration(array $migration, $down = false, $fake = false
                 $sqlList = $down ? $migrationObject->getDownSql() : $migrationObject->getUpSql();
                 foreach ($sqlList as $sql) {
                     $this->outputWriter->writeLine("Execute query:\n\n" . $sql);
-                    /** @var \Zend\Db\Adapter\Driver\Pdo\Statement $statement */
-                    $statement = $this->connection->prepare($sql);
-                    $statement->execute();
-                    /** @var \PDOStatement $statement */
-                    $statement = $statement->getResource();
-                    while ($statement->nextRowset()) {/* https://bugs.php.net/bug.php?id=61613 */}
+                    $this->connection->execute($sql);
                 }
             }
 
@@ -305,12 +308,13 @@ protected function applyMigration(array $migration, $down = false, $fake = false
             $this->connection->commit();
         } catch (InvalidQueryException $e) {
             $this->connection->rollback();
-            $msg = sprintf('%s: "%s"; File: %s; Line #%d', $e->getMessage(), $e->getPrevious()->getMessage(), $e->getFile(), $e->getLine());
-            throw new MigrationException($msg);
+            $previousMessage = $e->getPrevious() ? $e->getPrevious()->getMessage() : null;
+            $msg = sprintf('%s: "%s"; File: %s; Line #%d', $e->getMessage(), $previousMessage, $e->getFile(), $e->getLine());
+            throw new MigrationException($msg, $e->getCode(), $e);
         } catch (\Exception $e) {
             $this->connection->rollback();
             $msg = sprintf('%s; File: %s; Line #%d', $e->getMessage(), $e->getFile(), $e->getLine());
-            throw new MigrationException($msg);
+            throw new MigrationException($msg, $e->getCode(), $e);
         }
     }
 

src/ZfSimpleMigrations/Library/MigrationAbstractFactory.php

@@ -22,7 +22,7 @@ class MigrationAbstractFactory implements AbstractFactoryInterface
      */
     public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
     {
-        return preg_match(self::FACTORY_PATTERN, $name);
+        return preg_match(self::FACTORY_PATTERN, $name) || preg_match(self::FACTORY_PATTERN, $requestedName);
     }
 
     /**
@@ -31,7 +31,7 @@ public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator
      * @param ServiceLocatorInterface $serviceLocator
      * @param $name
      * @param $requestedName
-     * @return mixed
+     * @return Migration
      */
     public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
     {
@@ -41,7 +41,9 @@ public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $
 
         $config = $serviceLocator->get('Config');
 
-        preg_match(self::FACTORY_PATTERN, $name, $matches);
+        preg_match(self::FACTORY_PATTERN, $name, $matches)
+        || preg_match(self::FACTORY_PATTERN, $requestedName, $matches);
+
         $name = $matches[1];
 
         if (! isset($config['migrations'][$name])) {

src/ZfSimpleMigrations/Library/MigrationSkeletonGeneratorAbstractFactory.php

@@ -22,7 +22,8 @@ class MigrationSkeletonGeneratorAbstractFactory implements AbstractFactoryInterf
      */
     public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
     {
-        return preg_match(self::FACTORY_PATTERN, $name);
+        return preg_match(self::FACTORY_PATTERN, $name)
+            || preg_match(self::FACTORY_PATTERN, $requestedName);
     }
 
     /**
@@ -39,7 +40,8 @@ public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $
             $serviceLocator = $serviceLocator->getServiceLocator();
         }
 
-        preg_match(self::FACTORY_PATTERN, $name, $matches);
+        preg_match(self::FACTORY_PATTERN, $name, $matches)
+            || preg_match(self::FACTORY_PATTERN, $requestedName, $matches);
         $migration_name = $matches[1];
 
 

src/ZfSimpleMigrations/Model/MigrationVersionTableAbstractFactory.php

@@ -21,7 +21,7 @@ class MigrationVersionTableAbstractFactory implements AbstractFactoryInterface
      */
     public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
     {
-        return preg_match(self::FACTORY_PATTERN, $name);
+        return preg_match(self::FACTORY_PATTERN, $name) || preg_match(self::FACTORY_PATTERN, $requestedName);
     }
 
     /**
@@ -34,7 +34,10 @@ public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator
      */
     public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
     {
-        preg_match(self::FACTORY_PATTERN, $name, $matches);
+        // $matches will be set by first preg_match if it matches, or second preg_match if it doesnt
+        preg_match(self::FACTORY_PATTERN, $name, $matches)
+        || preg_match(self::FACTORY_PATTERN, $requestedName, $matches);
+
         $adapter_name = $matches[1];
 
         /** @var $tableGateway TableGateway */

src/ZfSimpleMigrations/Model/MigrationVersionTableGatewayAbstractFactory.php

@@ -22,7 +22,8 @@ class MigrationVersionTableGatewayAbstractFactory implements AbstractFactoryInte
      */
     public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
     {
-        return preg_match(self::FACTORY_PATTERN, $name);
+        return preg_match(self::FACTORY_PATTERN, $name)
+            || preg_match(self::FACTORY_PATTERN, $requestedName);
     }
 
     /**
@@ -35,7 +36,8 @@ public function canCreateServiceWithName(ServiceLocatorInterface $serviceLocator
      */
     public function createServiceWithName(ServiceLocatorInterface $serviceLocator, $name, $requestedName)
     {
-        preg_match(self::FACTORY_PATTERN, $name, $matches);
+        preg_match(self::FACTORY_PATTERN, $name, $matches)
+            || preg_match(self::FACTORY_PATTERN, $requestedName, $matches);
         $adapter_name = $matches[1];
 
         /** @var $dbAdapter \Zend\Db\Adapter\Adapter */