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

CC-1927: Remove PEAR DB

Browse source 
Fixed all install/upgrade scripts.
This commit is contained in:
paul.baranowski 2012-04-01 23:39:15 -04:00 • committed by Martin Konecny
parent 7f78a7f663
commit 95d69a3bbe
17 changed files with 351 additions and 2140 deletions
Download patch file Download diff file Expand all files Collapse all files

14
airtime_mvc/application/Bootstrap.php
View file

@ -17,7 +17,7 @@ require_once "DateHelper.php";
require_once "OsPath.php";
require_once __DIR__.'/controllers/plugins/RabbitMqPlugin.php';
global $CC_CONFIG, $CC_DBC;
global $CC_CONFIG; //, $CC_DBC;
$dsn = $CC_CONFIG['dsn'];
// ******************************************************************
@ -27,6 +27,7 @@ $dsn = $CC_CONFIG['dsn'];
// PDO returns false
// ******************************************************************
// $CC_DBC = DB::connect($dsn, FALSE);
// if (PEAR::isError($CC_DBC)) {
// echo "ERROR: ".$CC_DBC->getMessage()." ".$CC_DBC->getUserInfo()."\n";
@ -41,9 +42,14 @@ $dsn = $CC_CONFIG['dsn'];
// $result = $CC_DBC->GetOne($sql);
// var_dump($result);
// $con = Propel::getConnection();
// $q = $con->query($sql);
// //var_dump($q);
// $sql = "SELECT 1";
// try {
// $con = Propel::getConnection();
// //$q = $con->query($sql);
// } catch (Exception $e) {
// var_dump($e);
// }
// var_dump($q);
// //var_dump($q->fetchAll());
// var_dump($q->fetchColumn(0));

8
airtime_mvc/application/configs/airtime-conf-production.php
View file

@ -7,7 +7,7 @@
* our custom changes requires the database parameters to be loaded from /etc/airtime/airtime.conf so
* that the user can customize these.
*/
global $CC_CONFIG;
@ -17,12 +17,12 @@ $dbuser = $CC_CONFIG['dsn']['username'];
$dbpass = $CC_CONFIG['dsn']['password'];
$conf = array (
'datasources' =>
'datasources' =>
array (
'airtime' =>
'airtime' =>
array (
'adapter' => 'pgsql',
'connection' =>
'connection' =>
array (
'dsn' => "pgsql:host=$dbhost;port=5432;dbname=$dbname;user=$dbuser;password=$dbpass",
),