From cb2787143b81ae133330114ddaa5ca9981ab9ae3 Mon Sep 17 00:00:00 2001 From: Naomi Date: Fri, 8 Apr 2011 15:41:31 -0400 Subject: [PATCH] CC-2172 : Create Upgrade structure so that a user can upgrade from any version of Airtime properly telling doctrine to upgrade to only a specified version --- install/include/AirtimeInstall.php | 7 +++++-- install/upgrades/airtime-1.7/airtime-upgrade.php | 2 +- install/upgrades/airtime-1.8/airtime-upgrade.php | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/install/include/AirtimeInstall.php b/install/include/AirtimeInstall.php index bd3a568c2..8efd04ff6 100644 --- a/install/include/AirtimeInstall.php +++ b/install/include/AirtimeInstall.php @@ -147,9 +147,12 @@ class AirtimeInstall { @exec($command, $output, $results); } - public static function MigrateTables($dir) + 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"; + $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.7/airtime-upgrade.php b/install/upgrades/airtime-1.7/airtime-upgrade.php index ea674a8db..05e862721 100644 --- a/install/upgrades/airtime-1.7/airtime-upgrade.php +++ b/install/upgrades/airtime-1.7/airtime-upgrade.php @@ -13,7 +13,7 @@ AirtimeIni::CreateIniFile(); AirtimeIni::UpdateIniFiles(); echo PHP_EOL."*** Updating Database Tables ***".PHP_EOL; -AirtimeInstall::MigrateTables(__DIR__); +AirtimeInstall::MigrateTables(__DIR__, '20110402164819'); 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 c4589ac8b..dab8fb04d 100644 --- a/install/upgrades/airtime-1.8/airtime-upgrade.php +++ b/install/upgrades/airtime-1.8/airtime-upgrade.php @@ -11,7 +11,7 @@ require_once __DIR__.'/../../../application/configs/conf.php'; require_once(dirname(__FILE__).'/../../include/AirtimeInstall.php'); echo PHP_EOL."*** Updating Database Tables ***".PHP_EOL; -AirtimeInstall::MigrateTables(__DIR__); +AirtimeInstall::MigrateTables(__DIR__, '20110406182005'); //setting data for new aggregate show length column. AirtimeInstall::DbConnect(true);