Congegni
/
sintonia
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CC-3015: Upgrade: upgrade fails 

-fixed
This commit is contained in:
Martin Konecny 2011-11-03 14:16:43 -04:00
parent b99d0f97ce
commit 6741adebef
6 changed files with 50 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev_tools/gen_doctrine_migration.php
View File

@ -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);

21
install_minimal/DoctrineMigrations/Version20111103141311.php Normal file
View File

@ -0,0 +1,21 @@
<?php
namespace DoctrineMigrations;
use Doctrine\DBAL\Migrations\AbstractMigration,
Doctrine\DBAL\Schema\Schema;
class Version20111103141311 extends AbstractMigration
{
public function up(Schema $schema)
{
// add timezone column to cc_show_days
$cc_subjs = $schema->getTable('cc_show_days');
$cc_subjs->addColumn('timezone', 'string', array('required' => true));
}
public function down(Schema $schema)
{
}
}

6
install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php
View File

@ -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";

7
install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
View File

@ -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()

21
install_minimal/upgrades/upgrade-template/UpgradeCommon.php
View File

@ -1,5 +1,8 @@
<?php
set_include_path(__DIR__.'/../../airtime_mvc/library/pear' . PATH_SEPARATOR . get_include_path());
require_once('DB.php');
/* These are helper functions that are common to each upgrade such as
* creating connections to a database, backing up config files etc.
*/
@ -14,6 +17,24 @@ class UpgradeCommon{
const CONF_PYPO_GRP = "pypo";
const CONF_WWW_DATA_GRP = "www-data";
public static function connectToDatabase($p_exitOnError = true)
{
global $CC_DBC, $CC_CONFIG;
$CC_DBC = DB::connect($CC_CONFIG['dsn'], FALSE);
if (PEAR::isError($CC_DBC)) {
echo $CC_DBC->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;

2
install_minimal/upgrades/upgrade-template/airtime-upgrade.php
View File

@ -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");