From 8ab78e74ead301c98228a27d7593a5baa2f03266 Mon Sep 17 00:00:00 2001 From: Naomi Date: Fri, 8 Apr 2011 16:07:41 -0400 Subject: [PATCH] CC-2172 : Create Upgrade structure so that a user can upgrade from any version of Airtime properly --- install/include/AirtimeInstall.php | 8 ++++---- install/upgrades/airtime-1.8/airtime-upgrade.php | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/install/include/AirtimeInstall.php b/install/include/AirtimeInstall.php index 8efd04ff6..349bbf0d1 100644 --- a/install/include/AirtimeInstall.php +++ b/install/include/AirtimeInstall.php @@ -149,10 +149,10 @@ class AirtimeInstall { public static function MigrateTables($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"; + $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"; system($command); } diff --git a/install/upgrades/airtime-1.8/airtime-upgrade.php b/install/upgrades/airtime-1.8/airtime-upgrade.php index dab8fb04d..e432a9e15 100644 --- a/install/upgrades/airtime-1.8/airtime-upgrade.php +++ b/install/upgrades/airtime-1.8/airtime-upgrade.php @@ -10,12 +10,12 @@ set_include_path(__DIR__.'/../../../library' . PATH_SEPARATOR . get_include_path require_once __DIR__.'/../../../application/configs/conf.php'; require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php'); +AirtimeInstall::DbConnect(true); + echo PHP_EOL."*** Updating Database Tables ***".PHP_EOL; AirtimeInstall::MigrateTables(__DIR__, '20110406182005'); //setting data for new aggregate show length column. -AirtimeInstall::DbConnect(true); - $sql = "SELECT id FROM cc_show_instances"; $show_instances = $CC_DBC->GetAll($sql);