From b2418197998ea6e1d48f47561764bd8ccf08f1c2 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Thu, 29 Mar 2012 07:39:04 -0400
Subject: [PATCH] Improve dsn string logic

---
 sys/db/query_builder.php | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/sys/db/query_builder.php b/sys/db/query_builder.php
index 7f65199..0462c74 100644
--- a/sys/db/query_builder.php
+++ b/sys/db/query_builder.php
@@ -82,13 +82,11 @@ class Query_Builder {
 		switch($dbtype)
 		{
 			default:
+				$dsn = "host={$params->host};dbname={$params->database}";
+
 				if ( ! empty($params->port))
 				{
-					$dsn = "host={$params->host};port={$params->port};dbname={$params->database}";
-				}
-				else
-				{
-					$dsn = "host={$params->host};dbname={$params->database}";
+					$dsn .= ";port={$params->port}";
 				}
 			break;
 
@@ -102,7 +100,7 @@ class Query_Builder {
 		}
 
 		// Create the database connection
-		if ( ! empty($params->user) && $db_type !== 'sqlite')
+		if ( ! empty($params->user))
 		{
 			$this->db = new $dbtype($dsn, $params->user, $params->pass);
 		}