From 539dcb0b2968a2d83c16b42a20252011152f2e65 Mon Sep 17 00:00:00 2001
From: "Cloudmanic Labs, LLC" <github@cloudmanic.com>
Date: Sun, 18 Sep 2011 12:08:56 -0700
Subject: Added support to select the name of the database table you are going
 to use in Migrations

---
 system/libraries/Migration.php | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'system/libraries/Migration.php')

diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php
index 3734e18f5..682d90752 100644
--- a/system/libraries/Migration.php
+++ b/system/libraries/Migration.php
@@ -32,7 +32,8 @@ class CI_Migration {
 	protected $_migration_enabled = FALSE;
 	protected $_migration_path = NULL;
 	protected $_migration_version = 0;
-
+	protected $_migration_table = 'migrations';
+	
 	protected $_error_string = '';
 
 	public function __construct($config = array())
@@ -68,16 +69,22 @@ class CI_Migration {
 		// They'll probably be using dbforge
 		$this->load->dbforge();
 
+		// Make sure the migration table name was set.
+		if ( (! isset($this->_migration_table)) OR (empty($this->_migration_table)))
+		{
+			show_error('Migrations configuration file (migration.php) must have "migration_table" set.');			
+		}
+
 		// If the migrations table is missing, make it
-		if ( ! $this->db->table_exists('migrations'))
+		if ( ! $this->db->table_exists($this->_migration_table))
 		{
 			$this->dbforge->add_field(array(
 				'version' => array('type' => 'INT', 'constraint' => 3),
 			));
 
-			$this->dbforge->create_table('migrations', TRUE);
+			$this->dbforge->create_table($this->_migration_table, TRUE);
 
-			$this->db->insert('migrations', array('version' => 0));
+			$this->db->insert($this->_migration_table, array('version' => 0));
 		}
 	}
 
@@ -299,7 +306,7 @@ class CI_Migration {
 	 */
 	protected function _get_version()
 	{
-		$row = $this->db->get('migrations')->row();
+		$row = $this->db->get($this->_migration_table)->row();
 		return $row ? $row->version : 0;
 	}
 
@@ -314,7 +321,7 @@ class CI_Migration {
 	 */
 	protected function _update_version($migrations)
 	{
-		return $this->db->update('migrations', array(
+		return $this->db->update($this->_migration_table, array(
 			'version' => $migrations
 		));
 	}
-- 
cgit v1.2.3-24-g4f1b


From d1ba8f790eb91deb2898ff19d7827ce86e40ee7c Mon Sep 17 00:00:00 2001
From: "Cloudmanic Labs, LLC" <github@cloudmanic.com>
Date: Sun, 18 Sep 2011 12:23:00 -0700
Subject: Migrations: Added a config that allows the system to migration to the
 latest migration when you load the library. This way you do not have to call
 migrations anywhere else in your code and can always be at the latest
 migration

---
 system/libraries/Migration.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

(limited to 'system/libraries/Migration.php')

diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php
index 682d90752..28b1dd69f 100644
--- a/system/libraries/Migration.php
+++ b/system/libraries/Migration.php
@@ -33,6 +33,7 @@ class CI_Migration {
 	protected $_migration_path = NULL;
 	protected $_migration_version = 0;
 	protected $_migration_table = 'migrations';
+	protected $_migration_auto_latest = FALSE;
 	
 	protected $_error_string = '';
 
@@ -86,6 +87,15 @@ class CI_Migration {
 
 			$this->db->insert($this->_migration_table, array('version' => 0));
 		}
+		
+		// Do we auto migrate to the latest migration?
+		if ( $this->_migration_auto_latest == TRUE )
+		{
+			if ( ! $this->latest() )
+			{
+				show_error($this->error_string());
+			}
+		}
 	}
 
 	// --------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b


From 63b61e3bedd2a5729bef15b79ea64fa0a9d54893 Mon Sep 17 00:00:00 2001
From: "Cloudmanic Labs, LLC" <github@cloudmanic.com>
Date: Mon, 19 Sep 2011 09:35:05 -0700
Subject: Fixed style guide suggestion from philsturgeon on code review

---
 system/libraries/Migration.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'system/libraries/Migration.php')

diff --git a/system/libraries/Migration.php b/system/libraries/Migration.php
index 28b1dd69f..840cefe08 100644
--- a/system/libraries/Migration.php
+++ b/system/libraries/Migration.php
@@ -71,7 +71,7 @@ class CI_Migration {
 		$this->load->dbforge();
 
 		// Make sure the migration table name was set.
-		if ( (! isset($this->_migration_table)) OR (empty($this->_migration_table)))
+		if (empty($this->_migration_table))
 		{
 			show_error('Migrations configuration file (migration.php) must have "migration_table" set.');			
 		}
-- 
cgit v1.2.3-24-g4f1b