From d4c701dd6ae9898d1d3f8725f5dce0b2e4b55c33 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Tue, 29 Nov 2011 15:01:08 -0500
Subject: [PATCH] CC-3072: Test upgrade to 2.0.0 from 1.8.0 and up (including
 minor versions, except 1.9.1)

---
 .../library/doctrine/migrations/migrations-db.php  |  8 +++++---
 .../upgrades/airtime-1.9.0/propel/airtime-conf.php | 14 +++++++++++---
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/airtime_mvc/library/doctrine/migrations/migrations-db.php b/airtime_mvc/library/doctrine/migrations/migrations-db.php
index 18d72a6c7..803d0bb40 100644
--- a/airtime_mvc/library/doctrine/migrations/migrations-db.php
+++ b/airtime_mvc/library/doctrine/migrations/migrations-db.php
@@ -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',
 );
diff --git a/install_minimal/upgrades/airtime-1.9.0/propel/airtime-conf.php b/install_minimal/upgrades/airtime-1.9.0/propel/airtime-conf.php
index 1fe0ecb7e..a25701479 100644
--- a/install_minimal/upgrades/airtime-1.9.0/propel/airtime-conf.php
+++ b/install_minimal/upgrades/airtime-1.9.0/propel/airtime-conf.php
@@ -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;
\ No newline at end of file
+return $conf;