From f365802ce7c827fb79a5e3565b5a24c72962f903 Mon Sep 17 00:00:00 2001
From: Naomi <naomi@naomi-DX4840.(none)>
Date: Fri, 8 Apr 2011 16:25:29 -0400
Subject: [PATCH] CC-2172 : Create Upgrade structure so that a user can upgrade
from any version of Airtime properly
---
install/include/AirtimeInstall.php | 4 ++--
install/upgrades/airtime-1.7/airtime-upgrade.php | 5 ++++-
install/upgrades/airtime-1.8/airtime-upgrade.php | 5 ++++-
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/install/include/AirtimeInstall.php b/install/include/AirtimeInstall.php
index 349bbf0d1..1ae3bce1f 100644
--- a/install/include/AirtimeInstall.php
+++ b/install/include/AirtimeInstall.php
@@ -147,12 +147,12 @@ class AirtimeInstall {
@exec($command, $output, $results);
}
- public static function MigrateTables($dir, $version)
+ public static function ExecuteDoctrineMigration($dir, $version)
{
$command = "php $dir/../../../library/doctrine/migrations/doctrine-migrations.phar ".
"--configuration=$dir/../../DoctrineMigrations/migrations.xml ".
"--db-configuration=$dir/../../../library/doctrine/migrations/migrations-db.php ".
- "--no-interaction migrations:migrate $version";
+ "--no-interaction migrations:execute $version";
system($command);
}
diff --git a/install/upgrades/airtime-1.7/airtime-upgrade.php b/install/upgrades/airtime-1.7/airtime-upgrade.php
index 05e862721..e5b9fd185 100644
--- a/install/upgrades/airtime-1.7/airtime-upgrade.php
+++ b/install/upgrades/airtime-1.7/airtime-upgrade.php
@@ -13,7 +13,10 @@ AirtimeIni::CreateIniFile();
AirtimeIni::UpdateIniFiles();
echo PHP_EOL."*** Updating Database Tables ***".PHP_EOL;
-AirtimeInstall::MigrateTables(__DIR__, '20110402164819');
+$migrations = array('20110312121200', '20110331111708', '20110402164819');
+foreach($migrations as $migration) {
+ AirtimeInstall::ExecuteDoctrineMigration(__DIR__, $migration);
+}
echo PHP_EOL."*** Updating Pypo ***".PHP_EOL;
system("python ".__DIR__."/../../../python_apps/pypo/install/pypo-install.py");
diff --git a/install/upgrades/airtime-1.8/airtime-upgrade.php b/install/upgrades/airtime-1.8/airtime-upgrade.php
index e432a9e15..686a2aad6 100644
--- a/install/upgrades/airtime-1.8/airtime-upgrade.php
+++ b/install/upgrades/airtime-1.8/airtime-upgrade.php
@@ -13,7 +13,10 @@ require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php');
AirtimeInstall::DbConnect(true);
echo PHP_EOL."*** Updating Database Tables ***".PHP_EOL;
-AirtimeInstall::MigrateTables(__DIR__, '20110406182005');
+$migrations = array('20110406182005');
+foreach($migrations as $migration) {
+ AirtimeInstall::ExecuteDoctrineMigration(__DIR__, $migration);
+}
//setting data for new aggregate show length column.
$sql = "SELECT id FROM cc_show_instances";