From 66c21338d0f7ea4dd779ae607217c752af25b207 Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 17 Apr 2012 10:49:38 -0400
Subject: [PATCH] More accurate method of listing tables for postgres

---
 drivers/pgsql/pgsql_sql.php   |  11 ++++++-----
 tests/db_files/FB_TEST_DB.FDB | Bin 802816 -> 802816 bytes
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/drivers/pgsql/pgsql_sql.php b/drivers/pgsql/pgsql_sql.php
index 89dbb69..124b76a 100644
--- a/drivers/pgsql/pgsql_sql.php
+++ b/drivers/pgsql/pgsql_sql.php
@@ -173,10 +173,11 @@ SQL;
 	public function table_list()
 	{
 		return <<<SQL
-			SELECT "tablename" FROM "pg_tables"
-			WHERE "tablename" NOT LIKE 'pg_%'
-			AND "tablename" NOT LIKE 'sql_%'
-			ORDER BY "tablename" ASC
+			SELECT "table_name"
+  			FROM "information_schema"."tables"
+ 			WHERE "table_type" = 'BASE TABLE'
+   			AND "table_schema" NOT IN
+       			('pg_catalog', 'information_schema');
 SQL;
 	}
 
@@ -191,7 +192,7 @@ SQL;
 	{
 		return <<<SQL
 		 	SELECT "tablename" FROM "pg_tables"
-			WHERE "tablename" LIKE 'pg\_%'
+			WHERE "tablename" ~ '^(pg_|sql_)'
 SQL;
 	}
 
diff --git a/tests/db_files/FB_TEST_DB.FDB b/tests/db_files/FB_TEST_DB.FDB
index d1440b49339cfe940ac684116276b4b0bab3a55b..9455f7c9eb28948c9a03205c7368da3a0d6a6edd 100644
GIT binary patch
delta 735
zcmYk2O=wd=5XWbe_YpIcuGmV!Q1j6=MGz8HtRUFXLqI{%R}&>@+Efoc6<d0hhsYiU
zQ5evJs6~1d#pa~9-b6hY6cLj)X_~a)K?;KNHhCobc)Ro8-TD7!)^#(ko4G9DT>8y%
z=naW(u&cbaGzw7WA0Qx}ZvxDm{hG>+bS_8;@HeZ4;JGyVJ~sPq@PSlPC>c;PsHCB!
zsidW(tz<~aL+dhZNHJeAqv6-~lPPIb)>7e_kV=Qw(`dZCJ!y5k{W&j=z>t}Q8+H<g
zLQ%M5MPb#RfK_V%rmQ%8wiED_<A{}jKjs9utRJ%eW+q^b^Y-kxwld5CIB!<UKk=1u
z*lX&O-WH$>r{OAI5hc1?#c5s^nwX?7RUAj}W_QqwUzinhBz7@I<r>DbzKv%hAamN+
zhSq2F+j*ElPm90*iv3tKFN(BLV{DOzw-{Tbdo9M^-@<W@_gi>L+@gIx$@+Og?VDTj
zb%z@OUrT*%<_rBC<`-yXn>hvA*k(?F9=CCfPS!ESF>}V~dmE7^>v+`8EiEoDpSnpe
z>&*3i0@{~-y1tz{dRo`9cmbS#F8AwDvcX)3RvOH8y#8Xe*}xMVYwp5tuHiae-NEUY
tpX|eYtsgT2;LwL1{7BE*7@<c^Ow&ONkM%02gC<J4Si_M@d>4OQ`wwuxq2>Sp

delta 727
zcmZvYO=uHA6vy9eHcidTW=EuwL#g>%69ge)Eo)gMga`#I25ZPsLQ&9DzvxvK4|^1Q
z@d=*Ps|TstoYafG>cvx0>A|E;`ekn(6nwks&>Y-hXWoBj=Kp*D^}Mp@m2U``Dm^&|
zCyzuga;$>2J^?VxFMuYVZ2~l$FNIoaa6p2_qZJClbA94XrnP21l)e<c)O;E7rS8k9
zFGqYC^W~^7Pp!+iF2${OG#!5#YriVQ8>6c&-7m%0OQ^rTT^t!$tGOx8z*n?j%S^*U
z(t^B^hF{4d+%XIQBMT`r2Mw;jC35gKQG}<-99(7nnDxDc1=r1NX!QvV_=D}aEqtM$
zu5g|Y;b#Fs-xV6`U|m$`ZU<|;tRA98pF4P->!SnA)AvI}y4=IFvFWAx<z>4{VjnX!
z*TrmAnFUq?%9oVZLp=#fn}HU;|GLBQXj8bf(Pg+xW7`aOY4L#J54IWZ2Jjhig^qZq
zs_sQX-{~c#2V4!5mf?Q1=?rr?q(dt^%yDRAhdE9VGEWzKSm64<A*bkhkGaZ63w_z=
z*muy!i4OaiuYf(w<-9goedgM<(r2z6<jc@zA1`nna_|4-9wzDLF4i*YvVtic{>*Uz
go8Il>ds^$@I6d0Kk^uU+hck4oi>Y>YAAijL1Bg(bbpQYW