From b6ba6a3a8ef3d594ff3f32f2d128a8211f1d2db3 Mon Sep 17 00:00:00 2001
From: Rick Ellis <rick.ellis@ellislab.com>
Date: Tue, 7 Oct 2008 00:44:41 +0000
Subject: Added support for empty connection strings, based on bug # 3135

---
 system/database/drivers/postgre/postgre_driver.php | 39 ++++++++++++++++++----
 1 file changed, 32 insertions(+), 7 deletions(-)

(limited to 'system')

diff --git a/system/database/drivers/postgre/postgre_driver.php b/system/database/drivers/postgre/postgre_driver.php
index 55f650280..aada164d0 100644
--- a/system/database/drivers/postgre/postgre_driver.php
+++ b/system/database/drivers/postgre/postgre_driver.php
@@ -38,6 +38,35 @@ class CI_DB_postgre_driver extends CI_DB {
 	var $_count_string = "SELECT COUNT(*) AS ";
 	var $_random_keyword = ' RANDOM()'; // database specific random keyword
 
+	/**
+	 * Connection String
+	 *
+	 * @access	private
+	 * @return	string
+	 */	
+	function _connect_string()
+	{
+		$components = array(
+								'hostname'	=> 'host',
+								'port'		=> 'port',
+								'database'	=> 'dbname',
+								'username'	=> 'user',
+								'password'	=> 'password'
+							);
+		
+		$connect_string = "";
+		foreach ($components as $key => $val)
+		{
+			if (isset($this->$key) && $this->$key != '')
+			{
+				$connect_string .= " $val=".$this->$key;
+			}
+		}
+		return trim($connect_string);
+	}
+
+	// --------------------------------------------------------------------
+
 	/**
 	 * Non-persistent database connection
 	 *
@@ -45,10 +74,8 @@ class CI_DB_postgre_driver extends CI_DB {
 	 * @return	resource
 	 */	
 	function db_connect()
-	{
-		$port = ($this->port == '') ? '' : " port=".$this->port;
-		
-		return @pg_connect("host=".$this->hostname.$port." dbname=".$this->database." user=".$this->username." password=".$this->password);
+	{		
+		return @pg_connect($this->_connect_string());
 	}
 
 	// --------------------------------------------------------------------
@@ -61,9 +88,7 @@ class CI_DB_postgre_driver extends CI_DB {
 	 */	
 	function db_pconnect()
 	{
-		$port = ($this->port == '') ? '' : " port=".$this->port;
-
-		return @pg_pconnect("host=".$this->hostname.$port." dbname=".$this->database." user=".$this->username." password=".$this->password);
+		return @pg_pconnect($this->_connect_string());
 	}
 	
 	// --------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b