From 9a34fcffb23d9e18c216608040543c423b26264c Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Thu, 12 Apr 2012 13:44:31 -0400
Subject: [PATCH] Minor filestructure re-arrangement

---
 autoload.php                                  |   4 +-
 db_pdo.php => classes/db_pdo.php              |   0
 classes/db_reg.php                            |  83 ++++++++++++++++
 db_sql.php => classes/db_sql.php              |   0
 .../query_builder.php                         |  20 +++-
 drivers/firebird/firebird_driver.php          |  11 ---
 drivers/firebird/firebird_result.php          |  14 +++
 drivers/firebird/firebird_sql.php             |  91 +++++++++++++++---
 drivers/mysql/mysql_driver.php                |   4 +
 drivers/pgsql/pgsql_sql.php                   |  25 ++++-
 tests/db_files/FB_TEST_DB.FDB                 | Bin 802816 -> 802816 bytes
 tests/db_files/test_sqlite.db                 | Bin 3072 -> 3072 bytes
 12 files changed, 220 insertions(+), 32 deletions(-)
 rename db_pdo.php => classes/db_pdo.php (100%)
 create mode 100644 classes/db_reg.php
 rename db_sql.php => classes/db_sql.php (100%)
 rename query_builder.php => classes/query_builder.php (98%)

diff --git a/autoload.php b/autoload.php
index 5d8f021..9465614 100644
--- a/autoload.php
+++ b/autoload.php
@@ -26,9 +26,7 @@ function do_include($path)
 }
 
 // Load base classes
-require_once(BASE_PATH.'db_pdo.php');
-require_once(BASE_PATH.'db_sql.php');
-require_once(BASE_PATH.'query_builder.php');
+array_map('do_include', glob(BASE_PATH.'classes/*.php'));
 
 // Load PDO Drivers
 foreach(pdo_drivers() as $d)
diff --git a/db_pdo.php b/classes/db_pdo.php
similarity index 100%
rename from db_pdo.php
rename to classes/db_pdo.php
diff --git a/classes/db_reg.php b/classes/db_reg.php
new file mode 100644
index 0000000..8456370
--- /dev/null
+++ b/classes/db_reg.php
@@ -0,0 +1,83 @@
+<?php
+/**
+ * Query
+ *
+ * Free Query Builder / Database Abstraction Layer
+ *
+ * @author 		Timothy J. Warren
+ * @copyright	Copyright (c) 2012
+ * @link 		https://github.com/aviat4ion/Query
+ * @license 	http://philsturgeon.co.uk/code/dbad-license 
+ */
+
+// --------------------------------------------------------------------------
+
+/**
+ * Connection registry
+ *
+ * Decouples the Settings class from the query builder
+ * and organizes database connections
+ */
+class DB_Reg {
+
+	private static $instance=array();
+
+	/**
+	 * Registry access method
+	 *
+	 * @param string $key
+	 * @return object
+	 */
+	public static function &get_db($key)
+	{
+		if ( ! isset(self::$instance[$key]))
+		{
+			// The constructor sets the instance
+			new DB_Reg($key);
+		}
+
+		return self::$instance[$key];
+	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Private constructor
+	 *
+	 * @param string $key
+	 */
+	private function __construct($key)
+	{
+		// Get the db connection parameters for the current database
+		$db_params = Settings::get_instance()->get_db($key);
+
+		// Set the current key in the registry
+		self::$instance[$key] = new Query_Builder($db_params);
+	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Return exiting connections
+	 *
+	 * @return array
+	 */
+	public static function get_connections()
+	{
+		return array_keys(self::$instance);
+	}
+
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Remove a database connection
+	 *
+	 * @param string $key
+	 * @return void
+	 */
+	public static function remove_db($key)
+	{
+		unset(self::$instance[$key]);
+	}
+}
+// End of dbreg.php
\ No newline at end of file
diff --git a/db_sql.php b/classes/db_sql.php
similarity index 100%
rename from db_sql.php
rename to classes/db_sql.php
diff --git a/query_builder.php b/classes/query_builder.php
similarity index 98%
rename from query_builder.php
rename to classes/query_builder.php
index 1e19d2c..3b8ed3a 100644
--- a/query_builder.php
+++ b/classes/query_builder.php
@@ -53,6 +53,9 @@ class Query_Builder {
 	// )
 	private $query_map;
 
+	// Convenience property for connection management
+	public $conn_name = "";
+
 	/**
 	 * Constructor
 	 *
@@ -72,6 +75,11 @@ class Query_Builder {
 
 			$params = $p;
 		}
+		
+		// Let the connection work with 'conn_db' or 'database'		
+		$params->conn_db = ( ! isset($params->database))
+			? @$params->conn_db
+			: @$params->database;
 
 		$params->type = strtolower($params->type);
 		$dbtype = ($params->type !== 'postgresql') ? $params->type : 'pgsql';
@@ -80,7 +88,7 @@ class Query_Builder {
 		switch($dbtype)
 		{
 			default:
-				$dsn = "dbname={$params->database}";
+				$dsn = "dbname={$params->conn_db}";
 
 				if ( ! empty($params->host))
 				{
@@ -91,6 +99,7 @@ class Query_Builder {
 				{
 					$dsn .= ";port={$params->port}";
 				}
+				
 			break;
 
 			case "sqlite":
@@ -102,6 +111,9 @@ class Query_Builder {
 			break;
 		}
 
+		// Set the charset
+		//$dsn .= ";charset=utf-8";
+
 		// Create the database connection
 		if ( ! empty($params->user))
 		{
@@ -112,6 +124,12 @@ class Query_Builder {
 			$this->db = new $dbtype($dsn);
 		}
 
+		if (isset($params->name))
+		{
+			$this->conn_name = $params->name;
+		}
+
+
 		// Make things just slightly shorter
 		$this->sql =& $this->db->sql;
 	}
diff --git a/drivers/firebird/firebird_driver.php b/drivers/firebird/firebird_driver.php
index e454fff..f46899a 100644
--- a/drivers/firebird/firebird_driver.php
+++ b/drivers/firebird/firebird_driver.php
@@ -45,17 +45,6 @@ class firebird extends DB_PDO {
 
 	// --------------------------------------------------------------------------
 
-	/**
-	 * Close the link to the database and any existing results
-	 */
-	public function __destruct()
-	{
-		@fbird_close();
-		@fbird_free_result($this->statement);
-	}
-
-	// --------------------------------------------------------------------------
-
 	/**
 	 * Doesn't apply to Firebird
 	 */
diff --git a/drivers/firebird/firebird_result.php b/drivers/firebird/firebird_result.php
index fe6994b..3d08fa4 100644
--- a/drivers/firebird/firebird_result.php
+++ b/drivers/firebird/firebird_result.php
@@ -85,6 +85,20 @@ class Firebird_Result {
 
 		return $all;
 	}
+	
+	// --------------------------------------------------------------------------
+
+	/**
+	 * Emulate PDOStatement::fetchColumn
+	 * 
+	 * @param int $colum_num
+	 * @return mixed 
+	 */
+	public function fetchColumn($column_num=0)
+	{
+		$row = $this->fetch(PDO::FETCH_NUM);
+		return $row[$column_num];
+	}
 
 	// --------------------------------------------------------------------------
 
diff --git a/drivers/firebird/firebird_sql.php b/drivers/firebird/firebird_sql.php
index e632f17..66491a1 100644
--- a/drivers/firebird/firebird_sql.php
+++ b/drivers/firebird/firebird_sql.php
@@ -232,10 +232,9 @@ class Firebird_SQL extends DB_SQL {
 	public function table_list()
 	{
 		return <<<SQL
-			SELECT "RDB\$RELATION_NAME" FROM "RDB\$RELATIONS"
-			WHERE "RDB\$RELATION_NAME" NOT LIKE 'RDB$%'
-			AND "RDB\$RELATION_NAME" NOT LIKE 'MON$%'
-			AND "RDB\$VIEW_BLR" IS NOT NULL
+			SELECT "RDB\$RELATION_NAME"
+			FROM "RDB\$RELATIONS"
+			WHERE "RDB\$SYSTEM_FLAG"=0
 			ORDER BY "RDB\$RELATION_NAME" ASC
 SQL;
 	}
@@ -250,9 +249,10 @@ SQL;
 	public function system_table_list()
 	{
 		return <<<SQL
-			SELECT "RDB\$RELATION_NAME" FROM "RDB\$RELATIONS"
-			WHERE "RDB\$RELATION_NAME" LIKE 'RDB$%'
-			OR "RDB\$RELATION_NAME" LIKE 'MON$%';
+			SELECT "RDB\$RELATION_NAME"
+			FROM "RDB\$RELATIONS"
+			WHERE "RDB\$SYSTEM_FLAG"=1
+			ORDER BY "RDB\$RELATION_NAME" ASC
 SQL;
 	}
 	
@@ -266,10 +266,8 @@ SQL;
 	public function view_list()
 	{
 		return <<<SQL
-			SELECT "RDB\$RELATION_NAME"
-			FROM "RDB\$RELATIONS"
-			WHERE "RDB\$VIEW_BLR" IS NOT NULL
-			AND ("RDB\$SYSTEM_FLAG" IS NULL OR "RDB\$SYSTEM_FLAG" = 0)
+			SELECT DISTINCT "RDB\$VIEW_NAME"
+			FROM "RDB\$VIEW_RELATIONS"
 SQL;
 	}
 	
@@ -297,10 +295,7 @@ SQL;
 	 */
 	public function function_list()
 	{
-		return <<<SQL
-			SELECT * FROM "RDB\$FUNCTIONS"
-			WHERE "RDB\$SYSTEM_FLAG" = 0
-SQL;
+		return 'SELECT * FROM "RDB$FUNCTIONS"';
 	}
 	
 	// --------------------------------------------------------------------------
@@ -312,7 +307,23 @@ SQL;
 	 */
 	public function procedure_list()
 	{
-		return 'SELECT * FROM "RDB$PROCEDURES"';
+		return <<<SQL
+			SELECT "RDB\$PROCEDURE_NAME",
+				"RDB\$PROCEDURE_ID",
+				"RDB\$PROCEDURE_INPUTS",
+				"RDB\$PROCEDURE_OUTPUTS",
+				"RDB\$DESCRIPTION",
+				"RDB\$PROCEDURE_SOURCE",
+				"RDB\$SECURITY_CLASS",
+				"RDB\$OWNER_NAME",
+				"RDB\$RUNTIME",
+				"RDB\$SYSTEM_FLAG",
+				"RDB\$PROCEDURE_TYPE",
+				"RDB\$VALID_BLR"
+			FROM "RDB\$PROCEDURES"
+			ORDER BY "RDB\$PROCEDURE_NAME" ASC
+SQL;
+
 	}
 	
 	// --------------------------------------------------------------------------
@@ -330,5 +341,53 @@ SQL;
 			WHERE "RDB\$SYSTEM_FLAG" = 0
 SQL;
 	}
+	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Return sql to list columns of the specified table
+	 * 
+	 * @param string $table
+	 * @return string 
+	 */
+	public function column_list($table)
+	{
+		return <<<SQL
+			SELECT r.RDB\$FIELD_NAME AS field_name,
+				r.RDB\$DESCRIPTION AS field_description,
+				r.RDB\$DEFAULT_VALUE AS field_default_value,
+				r.RDB\$NULL_FLAG AS field_not_null_constraint,
+				f.RDB\$FIELD_LENGTH AS field_length,
+				f.RDB\$FIELD_PRECISION AS field_precision,
+				f.RDB\$FIELD_SCALE AS field_scale,
+				CASE f.RDB\$FIELD_TYPE
+					WHEN 261 THEN 'BLOB'
+					WHEN 14 THEN 'CHAR'
+					WHEN 40 THEN 'CSTRING'
+					WHEN 11 THEN 'D_FLOAT'
+					WHEN 27 THEN 'DOUBLE'
+					WHEN 10 THEN 'FLOAT'
+					WHEN 16 THEN 'INT64'
+					WHEN 8 THEN 'INTEGER'
+					WHEN 9 THEN 'QUAD'
+					WHEN 7 THEN 'SMALLINT'
+					WHEN 12 THEN 'DATE'
+					WHEN 13 THEN 'TIME'
+					WHEN 35 THEN 'TIMESTAMP'
+					WHEN 37 THEN 'VARCHAR'
+				ELSE 'UNKNOWN'
+				END AS field_type,
+				f.RDB\$FIELD_SUB_TYPE AS field_subtype,
+				coll.RDB\$COLLATION_NAME AS field_collation,
+				cset.RDB\$CHARACTER_SET_NAME AS field_charset
+			FROM RDB\$RELATION_FIELDS r
+			LEFT JOIN RDB\$FIELDS f ON r.RDB\$FIELD_SOURCE = f.RDB\$FIELD_NAME
+			LEFT JOIN RDB\$COLLATIONS coll ON f.RDB\$COLLATION_ID = coll.RDB\$COLLATION_ID
+			LEFT JOIN RDB\$CHARACTER_SETS cset ON f.RDB\$CHARACTER_SET_ID = cset.RDB\$CHARACTER_SET_ID
+			WHERE r.RDB\$RELATION_NAME='{$table}'
+			ORDER BY r.RDB\$FIELD_POSITION
+SQL;
+	}
+
 }
 //End of firebird_sql.php
\ No newline at end of file
diff --git a/drivers/mysql/mysql_driver.php b/drivers/mysql/mysql_driver.php
index 49ce5b4..ffa8114 100644
--- a/drivers/mysql/mysql_driver.php
+++ b/drivers/mysql/mysql_driver.php
@@ -31,6 +31,10 @@ class MySQL extends DB_PDO {
 	 */
 	public function __construct($dsn, $username=null, $password=null, $options=array())
 	{
+		$options = array_merge($options, array(
+			PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES UTF-8 COLLATE 'UTF-8'",
+		));
+			
 		parent::__construct("mysql:$dsn", $username, $password, $options);
 
 		$class = __CLASS__.'_sql';
diff --git a/drivers/pgsql/pgsql_sql.php b/drivers/pgsql/pgsql_sql.php
index 4553c9c..79becfd 100644
--- a/drivers/pgsql/pgsql_sql.php
+++ b/drivers/pgsql/pgsql_sql.php
@@ -277,6 +277,29 @@ SQL;
 			ORDER BY "relname" ASC
 SQL;
 	}
-
+	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Return sql to list columns of the specified table
+	 * 
+	 * @param string $table
+	 * @return string 
+	 */
+	public function column_list($table)
+	{
+		return <<<SQL
+			SELECT ordinal_position,
+				column_name,
+				data_type,
+				column_default,
+				is_nullable,
+				character_maximum_length,
+				numeric_precision
+			FROM information_schema.columns
+			WHERE table_name = '{$table}'
+			ORDER BY ordinal_position;
+SQL;
+	}
 }
 //End of pgsql_manip.php
\ No newline at end of file
diff --git a/tests/db_files/FB_TEST_DB.FDB b/tests/db_files/FB_TEST_DB.FDB
index 5e7cf0fa87b50e820e7887a331977dcdf3a266d2..ebd17b8f453dd90714818796ccd47e580b02f124 100755
GIT binary patch
delta 2863
zcmaKuKWyA|6vv-^_T_TFre{)yD)g!&N0JH!$fai?7TN(6sRIJ3I#s~X&_vggBNjQK
z6GGslNM2w-V(`F@m=J}kY)BxLfdLqpm`-YzmeO?Ski`=3kKft%C;gpl-}CSHd++@|
z{{Eib?>GAW#%mV5wD#L+$eL&Rh18;JSOvI_2Y_vT{SUy!7yn$ToRk3`*!a85hK1*_
z`s34=f2dsdBF~CEJMs#V=R}?xdBw<^iM&$e&EE3Lj%R;X{i#?hZ_Ipk-dnNG-FV~k
zQnXgSwPu{}!%MC>*K^A{0b7M7c;udeZ`~!>D%Rk9aS?7hHTcq5gh$RCoGR9#<J935
z=M3zl{g+#Z8rpy3|3jQh?P6gLz9=k<Tk9~Pgz3;`gGYZuzG>q>>a?NJY~$*G=KmJn
z+w7=K7L8GxW>Ei?bbKZ4CtI2g76yh{2V7_e?auaXa9il&i3B7#4!a6aN)2*e!b7gR
z!R~XtU~lU%$sA%IIdmNy)BHu8RT4NQ;pl9!uSS!6WQPw|s_}RGrWW73Yo4{ycyPyD
zu(zx6^LI=&4)2-yS21gvkdjD<gsu$N0Tu>PTS#R6G}8hf-bTOo(eGRAzaIZLFe~<@
zYP|ced4Y5_?!Sfi=swYAAF0hIW-^`Ld?H!OD2BJwy-mI+;d$(zM!rm^NqXLhGp5(x
z-pj~QT0T07KN$$UCr>ukshd<Q*Ue5hI7dT%ADFr|8$TGB<?vHniZ+f~ER(p_f0c*k
zV%T95CH4Yxm&dPY7(e!?&G<1(wMh*$_als%q7+rr4QWTQBqcW1b=2d92ubE|8cGx*
zYDRpaSVW0FXGYn{;iD5);_5LR-U~Fe%evj{(5NxAGy~;Yw@QrG{x}sB2BXpWt*Zot
zSfi=72-Y7Gn#XMDsq_#K5#z0kTa#>Qj{~;Zp)v2$Nr+Lnq56Un=+?C$b9fZ7jXm;1
zO@N6nfd!~Eztu~Dm2-Rv5|%H<JOK=&3b3L8`%t!d=p^vY5IBp@B%FC3p(3GtEZEpn
zTaenkB0?re-Bve`5bu*MZ5&~kD}T9)B?#qNPHy15!=n&tKt)K`;em?sC8_wvzNy;B
zlKB3>ES7lJp6!lG>jNfL3u(SI*_-lEQcMArMqM_=q0wp!rp#tcSRR5D({UP)$|GAN
zaDB+XB*KZegeq-=OVcE#G6ztX>~Q2IaXisJy0X$z?PRF@p^y0HzFAl$z0s1TvEI@;
zJGMb_-iY4b&-A9V$rHV9rFQ1^reGAL+64lIIjZfY_D%|NE@w-WBlU)b2@}^;rWCo{
zmW6}@XqyB%mjG7YVLvZws5MN9{`<f_SZ_t#Vz}yf^}sx3aMQ}mVkZSQBOCO+6quFd
zDxv_BikJtc02mnNqV@>_g7MYn8i%%iu5gX(cF&S6Z5-H}xecmg@Hz!pGhgE}hnUi|
z&l3a^4-QPtZgVBOKvyd0@_lek_T2pBhgbaYu6d@S`SVT!hz|y4>9pQt2nbcvWoXs-
ij{~!?AOLB^=u0B~6e{7P#3tWD%lU61_nU|2_5T4k+pHb{

delta 1847
zcma)-&ubGw6vy9AlBU^5?I5*^UCK6TYbl~hjfkbFJ&2`X@kgmp1#|LL6#WBqv1N}E
z1Um;I2Px`NYl-MVK|~4)Uc9KKl2&iJ=}i#>&d$zjw~NKykllP|XWwT&*_~O(DL77H
z%z(rBzE0TKI64WP{Ns`Z@Kt^Rm~r<L!1$r}dn!AF4jh>LlvFU}e#v^$Rhn<T$z5)^
zoVh&V@}$dCE^l&q+U3nI&s4dY<m{XEw8=J4q>aSm)AP-4-mK;^`RH6a6%?lZgwYC9
zm<1dA;Dgx%Wwhb7*#aY&g9Uk<F>NTBS@>h-U{2;Cd2BQLU@en_#Y_*C5kG%m7n`xf
z?^U$LpoeXu@*P{mc@Hx<t>jc!amB;o8_q@p7{;##G?~(}Fz^ae6Vfu#04P#r1{^^4
z_wAYd%40+JEnb&xFI1Z$+YSO{KlwE&`&Y>G#<g`O6QYhC;)sX6?5ZWIH5_G^EwNn3
zuCxEePDQYk2}_x<B}?3@2Y*RFyJ(3^o}^u{#J1Hqw8;pKGSMg#ZA{U+1GkgfZ8Wai
zNQ6e2Xq1U|EbMkvyA8#48;sB>6OA&_2EuLy?Y1wj+ujI`GSMg#tvl?N({6TLx6TNS
zGSMg#tv&3vL%VH{>&7EA%0#0~wC1o|TDv6!w*#AJK!<<L=84B5v@dGX7e%Fp?YJyY
z>P@_?;V^y<HQ);N9+x><@ng86BvMx6ms6dx9zVR(<DXr@e)d+6e^HHp|G(<LiPWb|
z^(j;R=c<0MDA%x?J=1ris_sVi4C!sPE-gf0lnF+eU=PDG546nO)-v}Z^(j+*%2a<g
zEOST8+*UI7cv`Ns!KQTNQX9HA{*qiQhjH>ZWra&6*K>e_w0s57dKY>HuxTyk1W#G(
T=BLaOlXcuZ>*22ZYk2A}PNX}i

diff --git a/tests/db_files/test_sqlite.db b/tests/db_files/test_sqlite.db
index 0f0f59bbcf56b4cfff0f22cd708f9d9bda8f0b18..fdc78a932ef284562811c45e8ae6ac74f4f538e6 100755
GIT binary patch
delta 19
ZcmZpWXpop7#l$2wQN{^KZcJFf4FE2%1iAnK

delta 19
ZcmZpWXpop7#l*OFqKp%e+?cR{8vr;C1?B(%