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

CC-3015: Upgrade: upgrade fails

Browse source 
-small fixes to template
This commit is contained in:
Martin Konecny 2011-11-03 15:16:36 -04:00
parent 9e5bcfb24b
commit d1c3563451
4 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
install_minimal/upgrades/airtime-2.0.0/UpgradeCommon.php
View file

@ -16,6 +16,8 @@ class UpgradeCommon{
const CONF_PYPO_GRP = "pypo"; const CONF_PYPO_GRP = "pypo";
const CONF_WWW_DATA_GRP = "www-data"; const CONF_WWW_DATA_GRP = "www-data";
const CONF_BACKUP_SUFFIX = "200";
const VERSION_NUMBER = "2.0";
public static function connectToDatabase($p_exitOnError = true) public static function connectToDatabase($p_exitOnError = true)
{ {
@ -84,7 +86,7 @@ class UpgradeCommon{
UpgradeCommon::CONF_FILE_API_CLIENT); UpgradeCommon::CONF_FILE_API_CLIENT);
// Backup the config files // Backup the config files
$suffix = date("Ymdhis")."-".VERSION_NUMBER; $suffix = date("Ymdhis")."-".UpgradeCommon::VERSION_NUMBER;
foreach ($configFiles as $conf) { foreach ($configFiles as $conf) {
// do not back up monit cfg // do not back up monit cfg
if (file_exists($conf)) { if (file_exists($conf)) {
@ -94,8 +96,7 @@ class UpgradeCommon{
} }
} }
$default_suffix = "200"; self::CreateIniFiles(UpgradeCommon::CONF_BACKUP_SUFFIX);
self::CreateIniFiles($default_suffix);
self::MergeConfigFiles($configFiles, $suffix); self::MergeConfigFiles($configFiles, $suffix);
} }

2
install_minimal/upgrades/airtime-2.0.0/airtime-upgrade.php
View file

@ -15,8 +15,6 @@
* format, and that's what this upgrade script will be for. * 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/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/models' . PATH_SEPARATOR . get_include_path());
set_include_path(__DIR__.'/../../../airtime_mvc/application/configs' . PATH_SEPARATOR . get_include_path()); set_include_path(__DIR__.'/../../../airtime_mvc/application/configs' . PATH_SEPARATOR . get_include_path());

14
install_minimal/upgrades/upgrade-template/UpgradeCommon.php
View file

@ -16,6 +16,8 @@ class UpgradeCommon{
const CONF_PYPO_GRP = "pypo"; const CONF_PYPO_GRP = "pypo";
const CONF_WWW_DATA_GRP = "www-data"; 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) public static function connectToDatabase($p_exitOnError = true)
{ {
@ -35,6 +37,7 @@ class UpgradeCommon{
} }
} }
public static function DbTableExists($p_name) public static function DbTableExists($p_name)
{ {
global $CC_DBC; global $CC_DBC;
@ -54,7 +57,8 @@ class UpgradeCommon{
public static function MigrateTablesToVersion($dir, $version) public static function MigrateTablesToVersion($dir, $version)
{ {
$appDir = self::GetAirtimeSrcDir(); $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 ". "--configuration=$dir/../../DoctrineMigrations/migrations.xml ".
"--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ". "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ".
"--no-interaction migrations:migrate $version"; "--no-interaction migrations:migrate $version";
@ -64,7 +68,8 @@ class UpgradeCommon{
public static function BypassMigrations($dir, $version) public static function BypassMigrations($dir, $version)
{ {
$appDir = self::GetAirtimeSrcDir(); $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 ". "--configuration=$dir/../../DoctrineMigrations/migrations.xml ".
"--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ". "--db-configuration=$appDir/library/doctrine/migrations/migrations-db.php ".
"--no-interaction --add migrations:version $version"; "--no-interaction --add migrations:version $version";
@ -81,7 +86,7 @@ class UpgradeCommon{
UpgradeCommon::CONF_FILE_API_CLIENT); UpgradeCommon::CONF_FILE_API_CLIENT);
// Backup the config files // Backup the config files
$suffix = date("Ymdhis")."-".VERSION_NUMBER; $suffix = date("Ymdhis")."-".UpgradeCommon::VERSION_NUMBER;
foreach ($configFiles as $conf) { foreach ($configFiles as $conf) {
// do not back up monit cfg // do not back up monit cfg
if (file_exists($conf)) { if (file_exists($conf)) {
@ -91,8 +96,7 @@ class UpgradeCommon{
} }
} }
$default_suffix = CONF_BACKUP_SUFFIX; self::CreateIniFiles(UpgradeCommon::CONF_BACKUP_SUFFIX);
self::CreateIniFiles($default_suffix);
self::MergeConfigFiles($configFiles, $suffix); self::MergeConfigFiles($configFiles, $suffix);
} }

3
install_minimal/upgrades/upgrade-template/airtime-upgrade.php
View file

@ -15,9 +15,6 @@
* format, and that's what this upgrade script will be for. * 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/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/models' . PATH_SEPARATOR . get_include_path());
set_include_path(__DIR__.'/../../../airtime_mvc/application/configs' . PATH_SEPARATOR . get_include_path()); set_include_path(__DIR__.'/../../../airtime_mvc/application/configs' . PATH_SEPARATOR . get_include_path());