From 6741adebef658e3c5dcf41f4dbbe295ee56440a1 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Thu, 3 Nov 2011 14:16:43 -0400 Subject: [PATCH] CC-3015: Upgrade: upgrade fails -fixed --- dev_tools/gen_doctrine_migration.php | 2 +- .../Version20111103141311.php | 21 +++++++++++++++++++ .../upgrades/airtime-2.0.0/UpgradeCommon.php | 6 ++++-- .../airtime-2.0.0/airtime-upgrade.php | 7 +++---- .../upgrade-template/UpgradeCommon.php | 21 +++++++++++++++++++ .../upgrade-template/airtime-upgrade.php | 2 -- 6 files changed, 50 insertions(+), 9 deletions(-) create mode 100644 install_minimal/DoctrineMigrations/Version20111103141311.php diff --git a/dev_tools/gen_doctrine_migration.php b/dev_tools/gen_doctrine_migration.php index e54c6ad53..b2e8f2156 100644 --- a/dev_tools/gen_doctrine_migration.php +++ b/dev_tools/gen_doctrine_migration.php @@ -5,5 +5,5 @@ */ $dir = __DIR__; - $command = "php $dir/../airtime_mvc/library/doctrine/migrations/doctrine-migrations.phar --configuration=$dir/../install_minimal/DoctrineMigrations/migrations.xml --db-configuration=$dir/../airtime_mvc/library/doctrine/migrations/migrations-db.php --no-interaction migrations:generate"; + $command = "php --php-ini $dir/../install_minimal/airtime-php.ini $dir/../airtime_mvc/library/doctrine/migrations/doctrine-migrations.phar --configuration=$dir/../install_minimal/DoctrineMigrations/migrations.xml --db-configuration=$dir/../airtime_mvc/library/doctrine/migrations/migrations-db.php --no-interaction migrations:generate"; system($command); diff --git a/install_minimal/DoctrineMigrations/Version20111103141311.php b/install_minimal/DoctrineMigrations/Version20111103141311.php new file mode 100644 index 000000000..970880e57 --- /dev/null +++ b/install_minimal/DoctrineMigrations/Version20111103141311.php @@ -0,0 +1,21 @@ +getTable('cc_show_days'); + $cc_subjs->addColumn('timezone', 'string', array('required' => true)); + } + + public function down(Schema $schema) + { + + } +} diff --git a/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php b/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php index 25e628bf2..b58ec9ed2 100644 --- a/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php +++ b/install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php @@ -55,7 +55,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"; @@ -65,7 +66,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"; 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 35a342bc0..6a5c98a21 100644 --- a/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php +++ b/install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php @@ -18,11 +18,9 @@ const VERSION_NUMBER = "2.0"; set_include_path(__DIR__.'/../../../airtime_mvc/library' . PATH_SEPARATOR . get_include_path()); -set_include_path(__DIR__.'/../../../airtime_mvc/library/pear' . 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()); require_once 'conf.php'; -require_once 'DB.php'; require_once 'propel/runtime/lib/Propel.php'; Propel::init(__DIR__."/../../../airtime_mvc/application/configs/airtime-conf.php"); @@ -34,6 +32,8 @@ require_once 'UpgradeCommon.php'; class AirtimeDatabaseUpgrade{ public static function start(){ + self::doDbMigration(); + self::SetDefaultTimezone(); self::setPhpDefaultTimeZoneToSystemTimezone(); self::convert_cc_playlist(); @@ -41,7 +41,6 @@ class AirtimeDatabaseUpgrade{ self::convert_cc_show_days(); self::convert_cc_show_instances(); - self::doDbMigration(); self::SetDefaultStreamSetting(); self::GetOldLiquidsoapCfgAndUpdate(); } @@ -144,7 +143,7 @@ class AirtimeDatabaseUpgrade{ } } - UpgradeCommon::MigrateTablesToVersion(__DIR__, '20110929184401'); + UpgradeCommon::MigrateTablesToVersion(__DIR__, '20111103141311'); } private static function SetDefaultStreamSetting() diff --git a/install_minimal/upgrades/upgrade-template/UpgradeCommon.php b/install_minimal/upgrades/upgrade-template/UpgradeCommon.php index c106ee4b0..9de2017d7 100644 --- a/install_minimal/upgrades/upgrade-template/UpgradeCommon.php +++ b/install_minimal/upgrades/upgrade-template/UpgradeCommon.php @@ -1,5 +1,8 @@ getMessage().PHP_EOL; + echo $CC_DBC->getUserInfo().PHP_EOL; + echo "Database connection problem.".PHP_EOL; + echo "Check if database '{$CC_CONFIG['dsn']['database']}' exists". + " with corresponding permissions.".PHP_EOL; + if ($p_exitOnError) { + exit(1); + } + } else { + $CC_DBC->setFetchMode(DB_FETCHMODE_ASSOC); + } + } + public static function DbTableExists($p_name) { global $CC_DBC; diff --git a/install_minimal/upgrades/upgrade-template/airtime-upgrade.php b/install_minimal/upgrades/upgrade-template/airtime-upgrade.php index 69860376d..bc8bfbd18 100644 --- a/install_minimal/upgrades/upgrade-template/airtime-upgrade.php +++ b/install_minimal/upgrades/upgrade-template/airtime-upgrade.php @@ -19,11 +19,9 @@ 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/library/pear' . 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()); require_once 'conf.php'; -require_once 'DB.php'; require_once 'propel/runtime/lib/Propel.php'; Propel::init(__DIR__."/../../../airtime_mvc/application/configs/airtime-conf.php");