From 6974a04ffde2b9a134292dc7d1140ca5af2900ea Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Thu, 22 Mar 2012 16:46:47 -0400
Subject: [PATCH] fix pgsql tests

---
 drivers/pgsql.php             |   9 ++++++++-
 tests/databases/pgsql.php     |  19 +++++++++++++++----
 tests/test_dbs/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/drivers/pgsql.php b/drivers/pgsql.php
index a5d2250..d61f43f 100644
--- a/drivers/pgsql.php
+++ b/drivers/pgsql.php
@@ -89,8 +89,15 @@ SQL;
 		$res = $this->query($sql);
 
 		$tables = $res->fetchAll(PDO::FETCH_ASSOC);
+		
+		$good_tables = array();
+		
+		foreach($tables as $t)
+		{
+			$good_tables[] = $t['tablename'];
+		}
 
-		return $tables;
+		return $good_tables;
 	}
 	
 	// --------------------------------------------------------------------------
diff --git a/tests/databases/pgsql.php b/tests/databases/pgsql.php
index 1c4fedd..7dc4224 100644
--- a/tests/databases/pgsql.php
+++ b/tests/databases/pgsql.php
@@ -52,9 +52,16 @@ class PgTest extends DBTest {
 		$this->assertIsA($this->db, 'PgSQL');
 	}
 
-	/*function TestCreateTable()
+	function TestCreateTable()
 	{
 		if (empty($this->db))  return; 
+		
+		// Drop the table(s) if they exist
+		$sql = 'DROP TABLE IF EXISTS "create_test"';
+		$this->db->query($sql);
+		$sql = 'DROP TABLE IF EXISTS "create_join"';
+		$this->db->query($sql);
+		
 	
 		//Attempt to create the table
 		$sql = $this->db->sql->create_table('create_test', 
@@ -83,12 +90,16 @@ class PgTest extends DBTest {
 		);
 		$this->db->query($sql);
 		
-		echo $sql.'<br />';
+		//echo $sql.'<br />';
+		
+		//Reset
+		unset($this->db);
+		$this->setUp();
 
 		//Check
 		$dbs = $this->db->get_tables();
-		
+		print_r($dbs);
 		$this->assertTrue(in_array('create_test', $dbs));
 	
-	}*/
+	}
 }
\ No newline at end of file
diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB
index 9f4bf1c3390d6991ffed2946cc384f24465d803d..872677244be954b8ade6c8ac0413fdbc6e58e0a6 100755
GIT binary patch
delta 1096
zcmZvbPiPZC6vp37w@JEB?NDmbY;BX~U#Up5kRqbcq87w}SQL-ag9i~w!HWkk(ZeF*
zK~Z?1cTqtQmDYoZ7W5!k6?;*nB<a=`DKsZ3V#L|qyd;FqvODu*X1?#uo43WHT`bxs
z1RTf~`k~nr7CY+X^(hNrM85!1-2V=6djF@)!M<RD0;!*AAB6s<tmpCRXWiG7qlBZR
zqdFXAII7c8AxDKB6>(J8tTGKH_gZtInE5JnXF~PQ&8N+wE+=cwX3=;$e#i*K`Flnn
zOqeMjv*vcVg)z8@LvRce5W`_OZ>IgZzh(j!&D8CwINfz|m#ESc7smw9#tQBf8}z7z
zd9hBDD|p2I6$N;$cS#WX83SgIgxIVxLohEY^kr4=F4NlzCh1!lGh&IRerly3ZA#3n
z#LP;IbaffywBX{1`0B~!#b*)~9H1+!n6ekz<d|8GndROGfxT-9Y(5C=O`8%kD>1Xu
z%SK>1`cT2c;zcv8x$7(V(CG2Xz{^^&Me4GksEbLVXxzpAZiql(rm*kw%%yXiH9dF1
z#le)0f|~%Phjz}Zl;%4I!xo(_;c=O<=&{!)E&5%;(Mj#*EtA3Wn$%l|>Jj+&rlpzv
zL$%D;4+T++mew#vH_A97cUv^DruF+Q+Odp#Xt07kTbcB>nJ}{nGn;JlO_Fr4f@z5s
zEi7Y#K9(>eBfit<(Jf9AYBOPG6J|E~=Uq=;)LJh3k9R@wQ{kFUkl&=AVAYy6ojp6Z
m*;)#E%<Ox08VwG-AY5&fLT~f;@k@2RSrc^A#n^)?p8OA!N#<Mt

delta 1054
zcmZ9KKWGzC9LImZ>$^0$r|qMnwx@<9ZT?^@<}gv}qST5)K&xoBO27^dlA;})gu~$w
zoI1UslZ!Ywh}uS~6dYaD!O20AMwiw<9jj3By?gn^Gk4sd5BIyzeSg1uzVG?IcL8Ct
z_~!up+XVOfI;5}5F2Jff04!Yk1aRfV`+R$^DG*?(y%qwh^RoLqU3)foPXq!3VFjWu
z5G)XOAYy^&4@5i=i51~6VZCx2v6S;V*7%%rGKt07!Jz1@6ghi(iZSD+a}_xZvuucQ
zwi|BPDVVl1kg`W%n-$<R%Z1NAvQc=#vWu5Sa6;Z~@~r&5!E-n+-!^&0D!8(~$&bp}
zHs9mrR6A?xB?}O61b|qP+PxAngj|NCeArgL<PYULBwOozO#W)|Ji0Qy&NFi98y_&@
z;T|zDiHS)pv^XsXzVpL4sKpiBrJYInV3Q9Sr_<vkCMPjDtw>nxhTT7;|DkR=tXo((
zw(82M4b_QCpEwI~5S?eB?sW~6;!vNjAGtGsdk#A*AS?mI?H#b0swuqzyQ)fY2cQhH
z`ID#cr5=7+uC@3+Y?$G{2#24R7ge*3`(OEECO@<|!&}{Wd93Tc&v-YZ-6|(>*sc05
zai?3HGZTFGMNRO!nPAOKu%dpMcdbW9OgduHRkf~yS0lkLn_x3NCSo!Xlj(dU*f|qy
yIudNEM@LLLV$z*7!6qZYj+<bm|4h(NOeSJ7O_*Tenj1I43MN>0%{|)UGk*br<LG4o