From eb5d30ab2101960b2d8a6f1120846b3d72327b86 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 8 May 2012 15:37:36 -0400
Subject: [PATCH] Improve 'type_list' methods

---
 classes/query_builder.php                |   2 +-
 drivers/firebird/firebird_sql.php        |   4 +++-
 drivers/pgsql/pgsql_sql.php              |   2 +-
 tests/databases/firebird/firebird-qb.php |  12 ++++++++++++
 tests/db_files/FB_TEST_DB.FDB            | Bin 802816 -> 802816 bytes
 5 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/classes/query_builder.php b/classes/query_builder.php
index 0ab4a7f..5e006f6 100644
--- a/classes/query_builder.php
+++ b/classes/query_builder.php
@@ -116,7 +116,7 @@ class Query_Builder {
 	 *
 	 * @var DB_PDO
 	 */
-	private $sql;
+	public $sql;
 
 	/** 
 	 * Query component order mapping
diff --git a/drivers/firebird/firebird_sql.php b/drivers/firebird/firebird_sql.php
index 97f43e3..5535884 100644
--- a/drivers/firebird/firebird_sql.php
+++ b/drivers/firebird/firebird_sql.php
@@ -248,7 +248,9 @@ SQL;
 	public function type_list()
 	{
 		return <<<SQL
-			SELECT "RDB\$FIELD_TYPE" FROM "RDB\$FIELDS"
+			SELECT "RDB\$TYPE_NAME", "RDB\$FIELD_NAME" FROM "RDB\$TYPES"
+			WHERE "RDB\$FIELD_NAME" IN ('RDB\$FIELD_TYPE', 'RDB\$FIELD_SUB_TYPE')
+			ORDER BY "RDB\$FIELD_NAME" DESC, "RDB\$TYPE_NAME" ASC
 SQL;
 	}
 
diff --git a/drivers/pgsql/pgsql_sql.php b/drivers/pgsql/pgsql_sql.php
index ac97752..2293dcb 100644
--- a/drivers/pgsql/pgsql_sql.php
+++ b/drivers/pgsql/pgsql_sql.php
@@ -222,7 +222,7 @@ SQL;
 		return <<<SQL
 			SELECT "typname" FROM "pg_catalog"."pg_type"
 			WHERE "typname" !~ '^pg_|_'
-			AND "typtype" != 'c'
+			AND "typtype" = 'b'
 			ORDER BY "typname"
 SQL;
 	}
diff --git a/tests/databases/firebird/firebird-qb.php b/tests/databases/firebird/firebird-qb.php
index a3b01f1..a202ab0 100644
--- a/tests/databases/firebird/firebird-qb.php
+++ b/tests/databases/firebird/firebird-qb.php
@@ -35,4 +35,16 @@ class FirebirdQBTest extends QBTest {
 		
 		// echo '<hr /> Firebird Queries <hr />';
 	}
+	
+	public function TestTypeList()
+	{
+		$sql = $this->db->sql->type_list();
+		$query = $this->db->query($sql);
+		
+		$this->assertIsA($query, 'PDOStatement');
+		
+		$res = $query->fetchAll(PDO::FETCH_ASSOC);
+		
+		$this->assertTrue(is_array($res));
+	}
 }
\ 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 b3b7c90f1401dd81c95fcf36b6baef2c183cf0b9..2953a58016cc87a824bb5207a648a96708de8d86 100644
GIT binary patch
delta 2033
zcmbVNU1(fI82x5)|MpIrPHS3Qt+JamKUj*{vZ3@z8-+lGP%td^sa0A^OXx!S(3iq4
zeYnpRALc<sAEd8}N{S$YQr|@16#BMHsEE3W5F{<#>iOnpHw`TWXSsLonVJ30`Ockh
zZmU&owW^DPPR*Pfqe0WEHRKWZqZOj(aS=)J;XR_IlRr;AIOG;+lK7psK;S-F`Lc5U
zi@i5>p+%u(p@#|`6*?|-Qs}hMS)og-I*+tGRJoIs^M&k#*L8m9%yfP`EoSo785Mor
z+{j$;aIcH!=x#DWOQmVbN)z-+X^cj*GTkkeX(Jt@rECw~D2>yP={S9wPE!m0n;4tH
z*gNS2)$q*it7H%TnM~Se78~Po{kzN88n01glcb0jn2$T^bTe@yJU~Kh^(e`aZuP|X
z6xZ?3sAp%~O_IjLdku~#ak;))<EY=-B?4pGvM?S35;VUO=B34$@asoNq!^0pR57b<
zRc>mqRckg9ZkeUiSi#SZE~BfBtH-Z5RxV%wVM4Rg;|ObO-#O(Yh{YmZV_CF(@du7I
zxMsJ-fH-rutELazD1GaCF*)m?@!q-`H>I|klCokJ*VRi+u^W3rx~$IXfbM}^^DAL~
zznz!#sO;up4}Ni-v1`!Cuc#E^#a?P$S~fqmRo2`G5xaM75Y4~v|KZvo2D|prx;k(y
z?@?bSn+Lm}VdNw8cUK)1iOJh)Qam>8j(WK+kwd>dYo9SK8^^Y=kpa7r`IUh8+IdM^
z=KXb5IX2uQcFi{{4Sw-1*jXN1EbT4vkTq4_Mik$ypt9RJe&hF0B(*J!u^_v#u_FVv
z0>K%u6FA%3WI?Z*8(nooY+4)4*Bvz_{xPTTt2gF0w}(T10lSSuGGLdVu*cS5BQfSO
zT9oLMj+)~>|6MI8KHhw@MXwHS8~CH6PR;R(ej;EF*f~vcz^<a<y<gvd7oJ&rX7r0)
zRW>iIsaGU`t(?nisGR+-a?EFIYGN*gvHpQJU{4zb9B7Ak&<?wEL+mrZw$*V7c<?vm
zjoz|f>3|&o?33o3jyftwJo~>Lu!m@YJ>ZaZz^*O@Wu86QpFPPAXxY(&eL<oh92mJL
zK6f9)A&_%V_X9g2B*MHCBKqfPAda3S2K?nOHD-=<)r%<(?b!$;Y`_U+i!vO)fiCQY
zrxmHW)l~-$V}-!Avpf*CZ>0`V!y#{m+b}qBd7iZ2jj+V$6?joDPydeiBQ{QZ<PX@X
OT^_KU?&R$ab>=_7XFJ{i

delta 1413
zcmZ9MKWx)b5XSGlIF0S6kcYZ-;Ezd~CaO@CvQ%skwn(536+@>8bwOh6f`m}S;DL!C
zq&I*N6Ejo80xS%u3lWM?R7J=MiIY@O!@yd>*)L~Xu@&22&c5IIeRpm&wi}J@y9{nt
zcJdH!QZ!Nv6`W@dz#M-7oV`8)*xUJDny&>KKmy0T9$qs%&RYE!>8rVB{naz+O6E%L
z%9JY&SEgOL;>wIGO;=h+(l#Xj<Fr;ByJoib%l7+Bvu?W;`=}y}4-dbYVaDiipRK~7
zS%i;v5q3o$3{i%!mIH^vfp->aI}6uE0iIX|*t5z|!Si1$3!Ys7(<;IcuY>Kt%)%RU
zBg%WAu-sL3Yb@5d=cxU$aMbge*bKx|PZU&kBuaeXsAErDW?a>Mv0n8YfX|pB1q^oy
zqyvR(kRmNZ&7ilqA0n;p^%3OzVvF}2^|miAsT*Ul!FsCsTU=AeBdh=eTLY}%)0rr-
zU+T6muBhBZ6sweuhv{ULUY7%DitBP1beHg5CxJ&1<GUKaIYm4MLj2<?;!iaG%M|gH
zj_{<7upD5d3Ex@5canG%F}{;{dkn;H|1-efsZu5)lU|TH>D*$S+e_qjl8hoGzdXft
zZ)<YsJO+?lV?V-oW=wldxyW<Ux)w;2CeMSJ33`M)pC#ESqPONKu<dHW89T1V&%$PN
z)B|7StCU7BrVK|hZapw4uFGIBS;9_|SQHVKO%h&XAolt+;WecrJn6-Xr%4ljxP%`j
z@hD>aFyS=@Vy}JeHDw|)Y3ef4<TcG4tvAkZJYy&Vawc~USYSL$*>LbL(zE2P7k7hd
wkHos98+0*{QWF0SJ`q8qM30m81Kl|KW04r?3+j=NpP9v6bL+hIZ!XyGe}`9GtpET3