From ff3fba3e3745ec1466099d43a92f8cb9c533e2d4 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Wed, 28 Mar 2012 20:32:33 -0400
Subject: [PATCH] Improved Query Builder

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

diff --git a/sys/db/query_builder.php b/sys/db/query_builder.php
index 3de70ec..26c2ad0 100644
--- a/sys/db/query_builder.php
+++ b/sys/db/query_builder.php
@@ -78,27 +78,37 @@ class Query_Builder {
 		$params->type = strtolower($params->type);
 		$dbtype = ($params->type !== 'postgresql') ? $params->type : 'pgsql';
 
-		// Initiate the constructor for the selected database
+		// Create the dsn for the database to connect to
 		switch($dbtype)
 		{
 			default:
-				$this->db = new $dbtype("host={$params->host};port={$params->port};dbname={$params->database}", $params->user, $params->pass);
-			break;
-
-			case "sqlite":
-				if ( ! empty($params->user) &&  ! empty($params->pass))
+				if ( ! empty($params->port))
 				{
-					$this->db = new $dbtype($params->file, $params->user, $params->pass);
+					$dsn = "host={$params->host};dbname={$params->database}";
 				}
 				else
 				{
-					$this->db = new $dbtype($params->file);
+					$dsn = "host={$params->host};port={$params->port};dbname={$params->database}";
 				}
 			break;
 
-			case "firebird":
-				$this->db = new $dbtype("{$params->host}:{$params->file}", $params->user, $params->pass);
+			case "sqlite":
+				$dsn = $params->file;
 			break;
+
+			case "firebird":
+				$dsn = "{$params->host}:{$params->file}";
+			break;
+		}
+
+		// Create the database connection
+		if ( ! empty($params->user) &&  ! empty($params->pass))
+		{
+			$this->db = new $dbtype($dsn, $params->user, $params->pass);
+		}
+		else
+		{
+			$this->db = new $dbtype($dsn);
 		}
 		
 		// Make things just slightly shorter