From d1c3563451e660a732687f0ee4f81348b9a2fc34 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 3 Nov 2011 15:16:36 -0400 Subject: [PATCH] CC-3015: Upgrade: upgrade fails -small fixes to template --- .../upgrades/airtime-2.0.0/UpgradeCommon.php | 7 ++++--- .../upgrades/airtime-2.0.0/airtime-upgrade.php | 2 -- .../upgrades/upgrade-template/UpgradeCommon.php | 14 +++++++++----- .../upgrades/upgrade-template/airtime-upgrade.php | 3 --- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php b/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php index b58ec9ed2..0fed1e104 100644 --- a/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php +++ b/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php @@ -16,6 +16,8 @@ class UpgradeCommon{ const CONF_PYPO_GRP = "pypo"; const CONF_WWW_DATA_GRP = "www-data"; + const CONF_BACKUP_SUFFIX = "200"; + const VERSION_NUMBER = "2.0"; public static function connectToDatabase($p_exitOnError = true) { @@ -84,7 +86,7 @@ class UpgradeCommon{ UpgradeCommon::CONF_FILE_API_CLIENT); // Backup the config files - $suffix = date("Ymdhis")."-".VERSION_NUMBER; + $suffix = date("Ymdhis")."-".UpgradeCommon::VERSION_NUMBER; foreach ($configFiles as $conf) { // do not back up monit cfg if (file_exists($conf)) { @@ -94,8 +96,7 @@ class UpgradeCommon{ } } - $default_suffix = "200"; - self::CreateIniFiles($default_suffix); + self::CreateIniFiles(UpgradeCommon::CONF_BACKUP_SUFFIX); self::MergeConfigFiles($configFiles, $suffix); } diff --git a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php index 6a5c98a21..fd815d745 100644 --- a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php @@ -15,8 +15,6 @@ * format, and that's what this upgrade script will be for. */ -const VERSION_NUMBER = "2.0"; - set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path()); set_include_path(__DIR__.'/../../../airtime_mvc/application/models' . PATH_SEPARATOR . get_include_path()); set_include_path(__DIR__.'/../../../airtime_mvc/application/configs' . PATH_SEPARATOR . get_include_path()); diff --git a/install_minimal/upgrades/upgrade-template/UpgradeCommon.php b/install_minimal/upgrades/upgrade-template/UpgradeCommon.php index 9de2017d7..8c55de9fa 100644 --- a/install_minimal/upgrades/upgrade-template/UpgradeCommon.php +++ b/install_minimal/upgrades/upgrade-template/UpgradeCommon.php @@ -16,6 +16,8 @@ class UpgradeCommon{ const CONF_PYPO_GRP = "pypo"; const CONF_WWW_DATA_GRP = "www-data"; + const CONF_BACKUP_SUFFIX = "200"; + const VERSION_NUMBER = "2.0.0"; public static function connectToDatabase($p_exitOnError = true) { @@ -34,6 +36,7 @@ class UpgradeCommon{ $CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC); } } + public static function DbTableExists($p_name) { @@ -54,7 +57,8 @@ class UpgradeCommon{ public static function MigrateTablesToVersion($dir, $version) { $appDir = self::GetAirtimeSrcDir(); - $command = "php $appDir/library/doctrine/migrations/doctrine-migrations.phar ". + $command = "php --php-ini $dir/../../airtime-php.ini ". + "$appDir/library/doctrine/migrations/doctrine-migrations.phar ". "--configuration=$dir/../../DoctrineMigrations/migrations.xml ". "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ". "--no-interaction migrations:migrate $version"; @@ -64,7 +68,8 @@ class UpgradeCommon{ public static function BypassMigrations($dir, $version) { $appDir = self::GetAirtimeSrcDir(); - $command = "php $appDir/library/doctrine/migrations/doctrine-migrations.phar ". + $command = "php --php-ini $dir/../../airtime-php.ini ". + "$appDir/library/doctrine/migrations/doctrine-migrations.phar ". "--configuration=$dir/../../DoctrineMigrations/migrations.xml ". "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ". "--no-interaction --add migrations:version $version"; @@ -81,7 +86,7 @@ class UpgradeCommon{ UpgradeCommon::CONF_FILE_API_CLIENT); // Backup the config files - $suffix = date("Ymdhis")."-".VERSION_NUMBER; + $suffix = date("Ymdhis")."-".UpgradeCommon::VERSION_NUMBER; foreach ($configFiles as $conf) { // do not back up monit cfg if (file_exists($conf)) { @@ -91,8 +96,7 @@ class UpgradeCommon{ } } - $default_suffix = CONF_BACKUP_SUFFIX; - self::CreateIniFiles($default_suffix); + self::CreateIniFiles(UpgradeCommon::CONF_BACKUP_SUFFIX); self::MergeConfigFiles($configFiles, $suffix); } diff --git a/install_minimal/upgrades/upgrade-template/airtime-upgrade.php b/install_minimal/upgrades/upgrade-template/airtime-upgrade.php index bc8bfbd18..dbe5c7589 100644 --- a/install_minimal/upgrades/upgrade-template/airtime-upgrade.php +++ b/install_minimal/upgrades/upgrade-template/airtime-upgrade.php @@ -15,9 +15,6 @@ * format, and that's what this upgrade script will be for. */ -const VERSION_NUMBER = "2.0.0"; -const CONF_BACKUP_SUFFIX = "200"; - set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path()); set_include_path(__DIR__.'/../../../airtime_mvc/application/models' . PATH_SEPARATOR . get_include_path()); set_include_path(__DIR__.'/../../../airtime_mvc/application/configs' . PATH_SEPARATOR . get_include_path());