From 29e85621911c65e5a6c768959eafd99f45ca4459 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Fri, 6 Apr 2012 20:05:30 -0400
Subject: [PATCH] Firebird corrections

---
 sys/db/drivers/firebird.php   |  29 ++++++++++++++++++-----------
 tests/test_dbs/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/sys/db/drivers/firebird.php b/sys/db/drivers/firebird.php
index df261a9..72703c0 100644
--- a/sys/db/drivers/firebird.php
+++ b/sys/db/drivers/firebird.php
@@ -74,7 +74,6 @@ class firebird extends DB_PDO {
 	 * Wrapper public function to better match PDO
 	 *
 	 * @param string $sql
-	 * @param  array $params
 	 * @return $this
 	 */
 	public function query($sql)
@@ -135,7 +134,7 @@ class firebird extends DB_PDO {
 			SELECT "RDB\$RELATION_NAME" FROM "RDB\$RELATIONS"
 			WHERE "RDB\$RELATION_NAME" NOT LIKE 'RDB$%'
 			AND "RDB\$RELATION_NAME" NOT LIKE 'MON$%'
-			AND RDB\$VIEW_CONTEXT IS NULL
+			AND "RDB\$VIEW_BLR" IS NOT NULL
 			ORDER BY "RDB\$RELATION_NAME" ASC
 SQL;
 
@@ -183,7 +182,7 @@ SQL;
 		$sql = <<<SQL
 			SELECT "RDB\$GENERATOR_NAME"
 			FROM "RDB\$GENERATORS"
-			WHERE "RDB\$SYSTEM_FLAG"=0;
+			WHERE "RDB\$SYSTEM_FLAG" = 0
 SQL;
 		$res = $this->query($sql);
 
@@ -199,8 +198,13 @@ SQL;
 	 */
 	public function get_functions()
 	{
-		// @todo Implement
-		return FALSE;
+		$sql = <<<SQL
+			SELECT * FROM "RDB\$TRIGGERS"
+			WHERE "RDB\$SYSTEM_FLAG" = 0
+SQL;
+		$res = $this->query($sql);
+
+		return $res->fetchAll(PDO::FETCH_ASSOC);
 	}
 
 	// --------------------------------------------------------------------------
@@ -212,8 +216,13 @@ SQL;
 	 */
 	public function get_triggers()
 	{
-		// @todo Implement
-		return FALSE;
+		$sql = <<<SQL
+			SELECT * FROM "RDB\$FUNCTIONS"
+			WHERE "RDB\$SYSTEM_FLAG" = 0
+SQL;
+		$res = $this->query($sql);
+
+		return $res->fetchAll(PDO::FETCH_ASSOC);
 	}
 
 	// --------------------------------------------------------------------------
@@ -318,8 +327,6 @@ SQL;
 		return fbird_rollback($this->trans);
 	}
 
-
-
 	// --------------------------------------------------------------------------
 
 	/**
@@ -347,7 +354,7 @@ SQL;
 	 * @param string $str
 	 * @return string
 	 */
-	public function quote($str)
+	public function quote($str, $param_type = NULL)
 	{
 		if(is_numeric($str))
 		{
@@ -379,7 +386,7 @@ SQL;
 	 *
 	 * @return FALSE
 	 */
-	public function prepare_query()
+	public function prepare_query($sql, $params)
 	{
 		// You can't bind query statements before execution with
 		// the firebird database
diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB
index c578805548e490cb1ef66b503d29c377ce8365cb..4f26ea572b2b3f22e286ec2d614a983e4a7eeb29 100755
GIT binary patch
delta 437
zcmZ9GF-yZh6vyACNm}zPo?Ag%8cVH|4hbkyT!c<iPzpuY`T@Fi=-?0>ZqY>qU!jg-
zQ7Tx4b`!sWyMtH}63n23i=g18Z4kW2-Q&mI{odbkY{#)T85FIL6#OlYPGmws?<4`b
zasw!={RmK9eaICP;|ClRS+x-`d3KVwX6<HXp9{_eR|Jm;t_rRRt_vO&JSO;5pBpM?
zR|73=)T77iJkBD$iW3u-(YH{&UaN+~$0J~y8K7#}5q+w0sOo93^aYsKGw`Y{!M&D&
zmb@=$i$|3#dGDAQ>^);soefgoO|mhWvr9=Aw^*0zE|%CO^;|5o3;GG#Ic<1Yvd<=8
z6kx#S0Ya7}%U%u{M!W*2H1yG=ClB+iO{OnREizv)MF&1+?UR4HkV9R_p{^O|%Jl7`
XL3tnN=xc~M)}Y-tEDa7lZ0!63humKk

delta 448
zcmZ9IJ4*vW5P)Yc7w^0=xOM@PkeHVU!d)RE7AcZK5R`zAHa|eS1VU6eEVk0ZY6~m>
zK~zY<B88=h305H><Y6?OtwIF%avp*^>@FWO^X;&<ZP~W9g|KEeBJj5u*}h+L?ot?_
zA~%47mmPqe)n+;nbPE_LG71wwd6vSrvBJ&lDdP+|Q#kW+rgG-zY>G3DGo7>P8Z%Ue
zM|FSHIMgt6oj=#PY1B+otLr)MVOI}(Xh29yPH098z=0lx4SfL;dK|{uBDA$QRAoM=
zr7rSGG5Vlj{kThIRkV7f;*03@X%jnQc|cjK9Rg@bl>#VZ1w3{L@$=hbaP!y_R|DDI
zbR-G!)uS{%I;M!o^eJgQ{L^{t={)vy_l_<mo?a<6=lrKLiknlQBK$+z#){Y-QWneN
eq$?}$hO{Kc?_`MQF3r0G6ovIh+4|Xtiu*tPzi7k&