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

CC-3072: Test upgrade to 2.0.0 from 1.8.0 and up (including minor versions, except 1.9.1)

This commit is contained in:
Martin Konecny 2011-11-29 15:01:08 -05:00
parent bd8df47ff6
commit d4c701dd6a
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
airtime_mvc/library/doctrine/migrations/migrations-db.php
View File

@ -1,9 +1,11 @@
<?php
$ini = parse_ini_file('/etc/airtime/airtime.conf', true);
return array(
'dbname' => 'airtime',
'user' => 'airtime',
'password' => 'airtime',
'dbname' => $ini['database']['dbname'],
'user' => $ini['database']['dbuser'],
'password' => $ini['database']['dbpass'],
'host' => 'localhost',
'driver' => 'pdo_pgsql',
);

14
install_minimal/upgrades/airtime-1.9.0/propel/airtime-conf.php
View File

@ -1,6 +1,14 @@
<?php
// This file generated by Propel 1.5.2 convert-conf target
// This file generated by Propel 1.5.2 convert-conf target - with modifications by Martin
// from XML runtime conf file /home/naomiaro/dev-campcaster/campcaster/build/runtime-conf.xml
$ini = parse_ini_file('/etc/airtime/airtime.conf', true);
$dbhost = $ini['database']['host'];
$dbname = $ini['database']['dbname'];
$dbuser = $ini['database']['dbuser'];
$dbpass = $ini['database']['dbpass'];
$conf = array (
'datasources' =>
array (
@ -9,7 +17,7 @@ $conf = array (
'adapter' => 'pgsql',
'connection' =>
array (
'dsn' => 'pgsql:host=localhost;port=5432;dbname=airtime;user=airtime;password=airtime',
'dsn' => "pgsql:host=$dbhost;port=5432;dbname=$dbname;user=$dbuser;password=$dbpass",
),
),
'default' => 'airtime',
@ -17,4 +25,4 @@ $conf = array (
'generator_version' => '1.5.2',
);
$conf['classmap'] = include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'classmap-airtime-conf.php');
return $conf;
return $conf;