Merge pull request #12 from joegreen88/master

1.1.0

Author: joegreen88

README.md

@@ -55,8 +55,9 @@ respectively. Each configuration requires a `host`, `user`, `password` and `data
     buildtime.database = "buzz"
 
 ## Versioning
-Your database versions will be stored in `<project_root>/db/versions`. The sql for each version is stored in a directory
-directly under this directory. So the directories are named `db/versions/1`, `db/versions/2` and so on.
+Your database versions will be stored in `<project_root>/db/versions` by default.
+The sql for each version is stored in a directory directly under this directory.
+So the directories are named `db/versions/1`, `db/versions/2` and so on.
 Each version must contain at least one of the following files:
 
  - `schema.sql` - always runs first, contains `CREATE TABLE IF NOT EXISTS` and `ALTER` statements.
@@ -77,6 +78,12 @@ from the current version.
 If this is the first run on the given environment, then a table called `db_config` is created and used to store the
 current database version.
 
+You can use the flag `--no-schema` to skip the schema files. This can be useful if you use an ORM to build the database
+schema.
+
+You can also use the option `--versions-path`, or `-p` for short, to provide a custom versions path.
+This allows you to override the default versions path which is `<project_root>/db/versions`.
+
 ### teardown
 Run `vendor/bin/teardown <environment>` to tear down the tables on the given environment.
 

src/Smrtr/MysqlVersionControl/TeardownCommand.php

@@ -68,14 +68,16 @@ protected function execute(InputInterface $input, OutputInterface $output)
                 false
             );
             if (!$answer) {
-                exit;
+                return 0;
             }
         }
 
         foreach ($tables as $table) {
             $con->exec("DROP TABLE IF EXISTS `$table`");
             $output->writeln("Dropped table $table");
         }
+
+        return 0;
     }
 
 }

src/Smrtr/MysqlVersionControl/UpCommand.php

@@ -34,6 +34,18 @@ protected function configure()
                 InputArgument::OPTIONAL,
                 'Where is the MySQL binary located?'
             )
+            ->addOption(
+                'no-schema',
+                null,
+                InputOption::VALUE_NONE,
+                'Skip execution of the schema files'
+            )
+            ->addOption(
+                'versions-path',
+                'p',
+                InputOption::VALUE_REQUIRED,
+                'Optional custom path to database versions directory'
+            )
         ;
     }
 
@@ -59,7 +71,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if (!$buildConf instanceof \PDO) {
             $output->writeln('<error>Failed: unable to obtain a database connection.</error>');
-            return false;
+            return 1;
         }
 
         if ($buildConf->query("SHOW TABLES LIKE 'db_config'")->rowCount()) {
@@ -84,14 +96,29 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
             if (!$result) {
                 $output->writeln('<error>Installing version control failed.</error>');
-                return false;
+                return 1;
             }
 
             $output->writeln('<info>Installed version control successfully.</info>');
         }
 
         // 2. Check for current version and available version
 
+        // what is the versions path?
+        if ($input->getOption('versions-path')) {
+            $versionsPath = $input->getOption('versions-path');
+        } else {
+            $versionsPath = realpath(dirname(__FILE__).'/../../../../../../db/versions');
+        }
+        if (!is_readable($versionsPath)) {
+            $output->writeln('<error>Versions path is not readable: '.$versionsPath.'</error>');
+            return 1;
+        }
+        if (!is_dir($versionsPath)) {
+            $output->writeln('<error>Versions path is not a directory: '.$versionsPath.'</error>');
+            return 1;
+        }
+
         // what is the current version?
         $query = $runConf->query("SELECT `value` FROM `db_config` WHERE `key`='version'");
         if ($query->rowCount()) {
@@ -100,19 +127,20 @@ protected function execute(InputInterface $input, OutputInterface $output)
         } else {
             $currentVersion = 0;
         }
+        $output->writeln('Current version: '.$currentVersion);
 
         // what is the available version?
         $availableVersion = 0;
-        $versionsPath = realpath(dirname(__FILE__).'/../../../../../../db/versions');
         foreach (scandir($versionsPath) as $path) {
             if (preg_match("/^(\\d)+$/", $path) && (int) $path > $availableVersion) {
                 $availableVersion = (int) $path;
             }
         }
+        $output->writeln('Available version: '.$availableVersion);
 
         if ($currentVersion >= $availableVersion) {
             $output->writeln('<info>Database version is already up to date.</info>');
-            return true;
+            return 0;
         }
 
         $noun = ($availableVersion - $currentVersion > 1) ? 'updates' : 'update';
@@ -122,7 +150,9 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         // go from current to latest version, building stack of SQL files
         $filesToLookFor = [];
-        $filesToLookFor[] = 'schema.sql';           // structural changes, alters, creates, drops
+        if (!$input->getOption('no-schema')) {
+            $filesToLookFor[] = 'schema.sql';       // structural changes, alters, creates, drops
+        }
         $filesToLookFor[] = 'data.sql';             // core data, inserts, replaces, updates, deletes
         if (in_array($this->env, DbConfig::getTestingEnvironments())) {
             $filesToLookFor[] = 'testing.sql';      // extra data on top of data.sql for the testing environment(s)
@@ -225,11 +255,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         if ($result) {
             $output->writeln('<info>Database updates installed successfully.</info>');
-            return true;
+            return 0;
 
         } else {
             $output->writeln('<error>Installing database updates failed.</error>');
-            return false;
+            return 1;
         }
     }
 }