fixed bug related to issue 1

Author: Dave

config/EMPTY

@@ -0,0 +1,13 @@
+<?php
+
+$db_config = (object) array();
+$db_config->host = 'localhost';
+$db_config->port = '3306';
+$db_config->user = 'root';
+$db_config->pass = 'almond';
+$db_config->name = 'mpm_test';
+$db_config->db_path = '/home/dave/Projects/mysql-php-migrations/db/';
+$db_config->method = 2;
+$db_config->migrations_table = 'mpm_migrations';
+
+?>

config/db_config.php

@@ -0,0 +1,52 @@
+<?php
+/**
+ * This file houses the MpmInitialSchema class.
+ *
+ * This file may be deleted if you do not wish to use the build command or build on init features.
+ *
+ * @package    mysql_php_migrations
+ * @subpackage Classes
+ * @license    http://www.opensource.org/licenses/bsd-license.php  The New BSD License
+ * @link       http://code.google.com/p/mysql-php-migrations/
+ */
+
+/**
+ * The MpmInitialSchema class is used to build an initial database structure.
+ *
+ * @package    mysql_php_migrations
+ * @subpackage Classes
+ */
+class MpmInitialSchema extends MpmSchema
+{
+
+	public function __construct()
+	{
+		parent::__construct();
+
+		/* If you build your initial schema having already executed a number of migrations,
+		* you should set the initial migration timestamp.
+		*
+		* The initial migration timestamp will be set to active and this migration and all
+		* previous will be ignored when the build command is used.
+		*
+		* EX:
+		*
+		* $this->initialMigrationTimestamp = '2009-08-01 15:23:44';
+		*/
+		$this->initialMigrationTimestamp = null;
+	}
+
+	public function build()
+ 	{
+		/* Add the queries needed to build the initial structure of your database.
+		*
+		* EX:
+		*
+		* $this->dbObj->exec('CREATE TABLE `testing` ( `id` INT(11) AUTO_INCREMENT NOT NULL, `vals` INT(11) NOT NULL, PRIMARY KEY ( `id` ))');
+		*/
+ 		$this->dbObj->exec('CREATE TABLE `testing` (`id` INT(11) AUTO_INCREMENT NOT NULL, `vals` INT(11) NOT NULL, PRIMARY KEY ( `id`)) ENGINE=InnoDB');
+	}
+
+}
+
+?>

db/schema.php

@@ -0,0 +1,35 @@
+<?php
+/**
+ * This file houses the MpmTestData class.
+ *
+ * This file may be deleted if you do not wish to add test data to your database after a build.
+ *
+ * @package    mysql_php_migrations
+ * @subpackage Classes
+ * @license    http://www.opensource.org/licenses/bsd-license.php  The New BSD License
+ * @link       http://code.google.com/p/mysql-php-migrations/
+ */
+
+/**
+ * The MpmTestData class is used to add test data after successfully building an initial database structure.
+ *
+ * @package    mysql_php_migrations
+ * @subpackage Classes
+ */
+class MpmTestData extends MpmSchema
+{
+
+	public function build()
+ 	{
+		/* Add the queries needed to insert test data into the initial build of your database.
+		*
+		* EX:
+		*
+		* $this->dbObj->exec("INSERT INTO `testing` (id, username, password) VALUES (1, 'my_username', 'my_password')");
+		*/
+ 		$this->dbObj->exec("INSERT INTO `testing` (id, vals) VALUES (1, 1234434)");
+	}
+
+}
+
+?>

db/templates/EMPTY

@@ -161,8 +161,25 @@ public function build($with_data)
 		echo "\n", 'Building initial database schema... ';
 	    $obj->build();
 		echo 'done.', "\n\n", 'Applying migrations... ';
-		$obj = new MpmLatestController();
-		$obj->doAction(true);
+		try
+		{
+			$total_migrations = MpmMigrationHelper::getMigrationCount();
+			if ($total_migrations == 0)
+			{
+				echo "no migrations exist.";
+			}
+			else
+			{
+				$to_id = MpmMigrationHelper::getLatestMigration();
+				$obj = new MpmUpController('up', array ( $to_id, $forced ));
+	    		$obj->doAction($quiet);
+			}
+		}
+		catch (Exception $e)
+		{
+			echo "\n\nERROR: " . $e->getMessage() . "\n\n";
+			exit;
+		}
 		if ($with_data)
 		{
 	    	require_once(MPM_DB_PATH . 'test_data.php');
@@ -198,8 +215,10 @@ public function displayHelp()
 		$obj->addText(' ');
 		$obj->addText('WARNING: THIS IS A DESTRUCTIVE ACTION!!  BEFORE THE DATABASE IS BUILT, ALL TABLES CURRENTLY IN THE DATABASE ARE REMOVED!');
 		$obj->addText(' ');
-		$obj->addText('Valid Example:');
-		$obj->addText('./migrate.php add', 4);
+		$obj->addText('Valid Examples:');
+		$obj->addText('./migrate.php build add', 4);
+		$obj->addText('./migrate.php build with_data', 4);
+		$obj->addText('./migrate.php build with_data --force', 4);
 		$obj->write();
 	}
 

db/test_data.php

@@ -16,7 +16,7 @@
  */
 class MpmLatestController extends MpmController
 {
-	
+
 	/**
 	 * Determines what action should be performed and takes that action.
 	 *
@@ -26,7 +26,7 @@ class MpmLatestController extends MpmController
 	 * @uses MpmCommandLineWriter::getInstance()
 	 * @uses MpmMigrationHelper::getLatestMigration()
 	 * @uses MpmUpController::doAction()
-	 * 
+	 *
 	 * @param bool $quiet supresses certain text when true
 	 *
 	 * @return void
@@ -35,14 +35,14 @@ public function doAction($quiet = false)
 	{
 		// make sure we're init'd
 		MpmDbHelper::test();
-		
+
 		// are we forcing this?
 		$forced = '';
 		if (isset($this->arguments[0]) && strcasecmp($this->arguments[0], '--force') == 0)
 		{
 		    $forced = '--force';
 		}
-		
+
 		try
 		{
 			$total_migrations = MpmMigrationHelper::getMigrationCount();
@@ -51,26 +51,28 @@ public function doAction($quiet = false)
 				$clw = MpmCommandLineWriter::getInstance();
 				$clw->addText('No migrations exist.');
 				$clw->write();
-				exit;
 			}
-			$to_id = MpmMigrationHelper::getLatestMigration();
-			$obj = new MpmUpController('up', array ( $to_id, $forced ));
-    		$obj->doAction($quiet);
+			else
+			{
+				$to_id = MpmMigrationHelper::getLatestMigration();
+				$obj = new MpmUpController('up', array ( $to_id, $forced ));
+	    		$obj->doAction($quiet);
+			}
 		}
 		catch (Exception $e)
 		{
 			echo "\n\nERROR: " . $e->getMessage() . "\n\n";
 			exit;
 		}
 	}
-	
+
 	/**
 	 * Displays the help page for this controller.
-	 * 
+	 *
 	 * @uses MpmCommandLineWriter::getInstance()
 	 * @uses MpmCommandLineWriter::addText()
 	 * @uses MpmCommandLineWriter::write()
-	 * 
+	 *
 	 * @return void
 	 */
 	public function displayHelp()
@@ -87,7 +89,7 @@ public function displayHelp()
 		$obj->addText('./migrate.php latest --force', 4);
 		$obj->write();
 	}
-	
+
 }
 
 ?>

lib/controllers/build_controller.php

@@ -46,7 +46,16 @@ static public function getTemplateAsArrayOfLines($file, $vars = array())
 	 */
 	static public function getTemplate($file, $vars = array())
 	{
-		$db_config = $GLOBALS['db_config'];
+		if (isset($GLOBALS['db_config']))
+		{
+			$db_config = $GLOBALS['db_config'];
+		}
+		else
+		{
+			$db_config = new stdClass();
+			$db_config->db_path = MPM_PATH . '/lib/templates/';
+		}
+
 		// has the file been customized?
 		if (file_exists($db_config->db_path . $file))
 		{