From 5d5588c9095c3dee73e7678a2bddf1c7995a88e6 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Wed, 18 Apr 2012 16:28:12 -0400
Subject: [PATCH] Various tweaks

---
 classes/db_pdo.php                    |   4 ++--
 classes/db_util.php                   |  18 ++++++++++++++++++
 drivers/firebird/firebird_util.php    |  13 ++++++++-----
 drivers/mysql/mysql_util.php          |   5 ++++-
 tests/core/db_test.php                |   5 +++++
 tests/databases/firebird/firebird.php |   1 -
 tests/db_files/FB_TEST_DB.FDB         | Bin 802816 -> 802816 bytes
 7 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/classes/db_pdo.php b/classes/db_pdo.php
index 3c4f240..6e58163 100644
--- a/classes/db_pdo.php
+++ b/classes/db_pdo.php
@@ -171,9 +171,9 @@ abstract class DB_PDO extends PDO {
 	 */
 	public function get_last_error()
 	{
-		$info = $this->errorInfo();
+		list($i1, $i2, $i3) = $this->errorInfo();
 
-		echo "Error: <pre>{$info[0]}:{$info[1]}\n{$info[2]}</pre>";
+		echo "Error: <pre>{$i1}:{$i2}\n{$i3}</pre>";
 	}
 
 	// --------------------------------------------------------------------------
diff --git a/classes/db_util.php b/classes/db_util.php
index d6503a4..34993ef 100644
--- a/classes/db_util.php
+++ b/classes/db_util.php
@@ -27,6 +27,24 @@ abstract class DB_Util {
 		$this->conn =& $conn; 
 	}
 	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Enable calling driver methods
+	 *
+	 * @param string $method
+	 * @param array $args
+	 */
+	public function __call($method, $args)
+	{
+		if (method_exists($this->conn, $method))
+		{
+			return call_user_func_array(array($this->conn, $method), $args);
+		}
+		
+		return NULL;
+	}
+	
 	// --------------------------------------------------------------------------
 	// ! Abstract Methods
 	// --------------------------------------------------------------------------
diff --git a/drivers/firebird/firebird_util.php b/drivers/firebird/firebird_util.php
index 804e749..a0dc334 100644
--- a/drivers/firebird/firebird_util.php
+++ b/drivers/firebird/firebird_util.php
@@ -140,9 +140,12 @@ class Firebird_Util extends DB_Util {
 		{
 			$sql = 'SELECT * FROM "'.trim($t).'"';
 			$res = $this->query($sql);
-			$obj_res = $this->fetchAll(PDO::FETCH_ASSOC);
-
-			unset($res);
+			$obj_res = $res->fetchAll(PDO::FETCH_ASSOC);
+			
+			// Don't add to the file if the table is empty
+			if (count($obj_res) < 1) continue;
+			
+			$res = NULL;
 
 			// Nab the column names by getting the keys of the first row
 			$columns = @array_keys($obj_res[0]);
@@ -163,12 +166,12 @@ class Firebird_Util extends DB_Util {
 
 				$row_string = 'INSERT INTO "'.trim($t).'" ("'.implode('","', $columns).'") VALUES ('.implode(',', $row).');';
 
-				unset($row);
+				$row = NULL;
 
 				$insert_rows[] = $row_string;
 			}
 
-			unset($obj_res);
+			$obj_res = NULL;
 
 			$output_sql .= "\n\nSET TRANSACTION;\n".implode("\n", $insert_rows)."\nCOMMIT;";
 		}
diff --git a/drivers/mysql/mysql_util.php b/drivers/mysql/mysql_util.php
index 283ae8c..4c197b1 100644
--- a/drivers/mysql/mysql_util.php
+++ b/drivers/mysql/mysql_util.php
@@ -121,10 +121,13 @@ class MySQL_Util extends DB_Util {
 	/**
 	 * Create an SQL backup file for the current database's data
 	 *
+	 * @param array $exclude
 	 * @return string
 	 */
-	public function backup_data()
+	public function backup_data($exclude=array())
 	{
+		$tables = $this->get_tables();
+	
 		// @todo Implement Backup function
 		return '';
 	}
diff --git a/tests/core/db_test.php b/tests/core/db_test.php
index 3e698c2..22b0587 100644
--- a/tests/core/db_test.php
+++ b/tests/core/db_test.php
@@ -48,5 +48,10 @@ abstract class DBTest extends UnitTestCase {
 		$res = $this->db->beginTransaction();
 		$this->assertTrue($res);
 	}
+	
+	function TestBackupData()
+	{
+		$this->assertTrue(is_string($this->db->util->backup_data()));
+	}
 }
 // End of db_test.php
\ No newline at end of file
diff --git a/tests/databases/firebird/firebird.php b/tests/databases/firebird/firebird.php
index abb48f6..9252908 100644
--- a/tests/databases/firebird/firebird.php
+++ b/tests/databases/firebird/firebird.php
@@ -187,5 +187,4 @@ SQL;
 	{
 		$this->assertTrue(is_array($this->db->get_triggers()));
 	}
-
 }
\ 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 a7da6afd7787ab75bf5870d68d651a93c78f2c15..83122eda73c023987676d6b16780adf71c9d6e82 100644
GIT binary patch
delta 1197
zcmZ9LO=uHQ5Xa{w*=(9e=_^)HkTh)?QamLHir}H4AV|SgqOK)qYGVl!KTf>|(Y+~%
z!XRFY=uH&Ui+J-Qie9{UYEn~0?8m{2C!OuvzYW<XJN$Vw^UHj^R;$!%l};-<UTkM+
z?=iX+k5p)z<3u;*M-)>}z7m}~_Nj3HfORkwlXqcPDET(WUrj8$9Jy@*qXH8POgu1&
zz&L?P2F49cDlkKBlTH|QYt_l7JMP07Gqk!<NROt1V!B<_i5Hhox;8hy7t}r)bMkaG
znWYtXnl8F|8cStqCOJtf$zeK_%+YUWnm)KWdL+6f_Op|tXA*NqbolJJlaz3V>4d|J
zYx=12`SF^b6VnULJeN9pw(LuhZ^b!Aid2ROIzFJ~boaax`4cq1?r2X{*y-w7F{iqc
zyTbRjb%Eb>^^`i#9XTl@4jkwN@<e&T@dh}a<%n4qj>mu2h2w>sDgL;n3+gOC_$D00
zfddT=^hm@F2OZXrdYYEg<fWc)nqkW(_<c_w)}d$g@ZX*;s~celGhExy`7+X=ZP54|
z&?dq*2Cxl_ZSel@f^FFH8hzzm3)`4suOl!7qgT*?LjztPfYmLm&hLH*tZrvk@0;0@
zof+c5fkrQ(!Kn>!YL-*u<)6Z-*`jKFMP0EoLmW8J;6P($)d5b`a;lvFC7dch@5ydd
zE$85d?8YTlo3a~-L!Y3*g~pI@7qA;X-`$j5_xX!t8^tNA_icSXFK_81;)K<l`|k<P
Y{N612`nJwS_r>0xg1s@hr#t%0Kc?vS1^@s6

delta 1171
zcmZ9LPiPZC6vp4=-)1wEPEkQGZEPA+2$F=TO9&FeDoYKhha#Rd2p$Bly?F>i_vWEq
z9^%D=cozS(7x7eYiYG6gn$%X2w5dmLzU}O%VRzYm`|Z3pKjwWigF$03Xk1g&sy`{x
z|I6q>I#y8(7KpCOLzGg_z7ef@Un=XTZGxec-2G#r<Q*)$Iop3d`^bbwg(el6bZ9c6
z$%ZBu8YeXQ(72nXkTI&al`R&A&eo(-n9FbU-LPKRtn19H+l!8!8t<Fx1a0Taly}SY
z++CzqcbQJ+i?r<)>BteCpP`3ti9R_cdf_b7K;mWjSC@acoHCu4@927)o1t-z@9yY}
z%HyXyx+h^T3N3C7wcqt*jUOa2MT*os5p+7CW%PKw8Rru;zZ>f7s>#`r_9d*0WbP(E
zp6Cj{AL%7^frm2EMIAWM8O#&U3r;P;sacMMUE$RD&#rK45od`%AL@!~@WyxHpbi{p
zaG+;nZZ*NFT27Vk?FpyK_s7DiTF#k$;hc-sGtYPSb-9aTGz%JVXcNPtO%*j8%?m6n
z;8Q;Y7Fd4*>(7ey2PNnWG?36h`U!+@5k7zXDG1;C<4^f>#rlIfaG=pQXmC0SPRDXO
zy!J~t9qUhL%Ac<F2X){;g98nJ+6hkEa@t%T3#V=UX;1lciPeGZ1Jt2U(BMMD8ti*m
z<MH}|>}!v|%4~BO#p*q~K9AQ9byJeC4SWAG!D;bt@s=M<bTK{__K;NU!6>~v(l`DB
DZfE1*