From 57842a44b4bc490bc0a046bc7be4b45b4d51b18b Mon Sep 17 00:00:00 2001
From: Timothy Warren <tim@timshomepage.net>
Date: Tue, 10 Apr 2012 08:04:38 -0400
Subject: [PATCH] Fix posgres tests

---
 sys/db/db_sql.php                     |  56 ++++++++++++++++++++++++++
 sys/db/drivers/pgsql/pgsql_driver.php |  18 +++++++++
 sys/db/drivers/pgsql/pgsql_sql.php    |  15 +++++++
 tests/test_dbs/FB_TEST_DB.FDB         | Bin 802816 -> 802816 bytes
 4 files changed, 89 insertions(+)

diff --git a/sys/db/db_sql.php b/sys/db/db_sql.php
index 43d95cf..0801e17 100644
--- a/sys/db/db_sql.php
+++ b/sys/db/db_sql.php
@@ -72,5 +72,61 @@ abstract class DB_SQL {
 	 * @return string
 	 */
 	abstract public function backup_data();
+	
+	/**
+	 * Returns sql to list other databases
+	 *
+	 * @return string
+	 */
+	abstract public function db_list();
+
+	/**
+	 * Returns sql to list tables
+	 *
+	 * @return string
+	 */
+	abstract public function table_list();
+
+	/**
+	 * Returns sql to list system tables
+	 *
+	 * @return string
+	 */
+	abstract public function system_table_list();
+
+	/**
+	 * Returns sql to list views
+	 *
+	 * @return string
+	 */
+	abstract public function view_list();
+
+	/**
+	 * Returns sql to list triggers
+	 *
+	 * @return string
+	 */
+	abstract public function trigger_list();
+
+	/**
+	 * Return sql to list functions
+	 *
+	 * @return FALSE
+	 */
+	abstract public function function_list();
+
+	/**
+	 * Return sql to list stored procedures
+	 *
+	 * @return string
+	 */
+	abstract public function procedure_list();
+
+	/**
+	 * Return sql to list sequences
+	 *
+	 * @return string
+	 */
+	abstract public function sequence_list();
 }
 // End of db_sql.php
\ No newline at end of file
diff --git a/sys/db/drivers/pgsql/pgsql_driver.php b/sys/db/drivers/pgsql/pgsql_driver.php
index 8845509..cc125fb 100644
--- a/sys/db/drivers/pgsql/pgsql_driver.php
+++ b/sys/db/drivers/pgsql/pgsql_driver.php
@@ -73,5 +73,23 @@ class pgSQL extends DB_PDO {
 	{
 		return (isset($this->statement)) ? $this->statement->rowCount : FALSE;
 	}
+	
+	// --------------------------------------------------------------------------
+	
+	/**
+	 * Get a list of schemas for the current connection
+	 *
+	 * @return array
+	 */
+	public function get_schemas()
+	{
+		$sql = <<<SQL
+			SELECT DISTINCT "schemaname" FROM "pg_tables"
+			WHERE "schemaname" NOT LIKE 'pg\_%'
+			AND "schemaname" != 'information_schema'
+SQL;
+
+		return $this->driver_query($sql);
+	}
 }
 //End of pgsql_driver.php
\ No newline at end of file
diff --git a/sys/db/drivers/pgsql/pgsql_sql.php b/sys/db/drivers/pgsql/pgsql_sql.php
index 1a728ae..422b04b 100644
--- a/sys/db/drivers/pgsql/pgsql_sql.php
+++ b/sys/db/drivers/pgsql/pgsql_sql.php
@@ -17,6 +17,15 @@
  */
 class pgSQL_SQL extends DB_SQL {
 
+	/**
+	 * Database-specific method to create a new table
+	 *
+	 * @param string $name
+	 * @param array $columns
+	 * @param array $constraints
+	 * @param array $indexes
+	 * @return string
+	 */
 	public function create_table($name, $columns, array $constraints=array(), array $indexes=array())
 	{
 		$column_array = array();
@@ -67,6 +76,12 @@ class pgSQL_SQL extends DB_SQL {
 
 	// --------------------------------------------------------------------------
 
+	/**
+	 * Database-specific SQL for dropping a table
+	 *
+	 * @param string $name
+	 * @return string
+	 */
 	public function delete_table($name)
 	{
 		return 'DROP TABLE "'.$name.'"';
diff --git a/tests/test_dbs/FB_TEST_DB.FDB b/tests/test_dbs/FB_TEST_DB.FDB
index bcf4d295496c0d5e965f53019eedc7c100b42478..6956ea4884729e66b987e857b02a0a7b4ba90a1d 100755
GIT binary patch
delta 584
zcmZ9Hu}d656o=m%*Sp<&UTzT1LNV^<ygLyLw;E9!k!T@ALnI-PCfL}DVCt}1OdUz!
zg;@Fz#Kr>)LF@!cl|r#NPZJ@xXRCo6WM<<;l3ixrelu^s`ArmsQ54Q2OjKS4aQ8@x
z+HT3z4j&+|2Y|rM6Mz?EU&=$>h5;l9{VpcosOOIA*}L|>+{WUEb*UsODU@te(owQq
z$&`|5C0!-G9hq^Y=<=&6Ka+CbPsuFiwimvqRVA}iA?I^p$w`!dr<a(6S+|(*xSNF)
zx3sa44?cQ6yzw5uGp_&x-T*kdp5C^Z-Yv$Mg6i8E?WQ};9rh9f0<Nx(<b7Ulkk4Zm
zl;zC^1wyavHR!R(`TV*@{XE>HlDOyd)0hf;RHL%c?Vn=m<%1@5&S;;xv(Q7=mVoe)
z&Xb%W^a{c#ST=-s)3R*-(EHfpwR0-+<Q0|h7w^~gp~q)b#-F@>MbqJR-@iJ`R%hAj
z8b%lJ!zK;l52Jg6myC6~Zvq#?Z~y5mTb*UAJHAWDb1`N3uueUH0)9;bR!?K<fBqYS
C1A~eH

delta 562
zcmZ9J&ntvM7{{NPUAyaj-ep<`Mc#MUT10B!kmN=#Y_gHlDtB(2^>UbtQc6AIpYWsX
zMamz56Gh5v*J0Z>9Ne^J-giypoo1dsZ!@3y&W!6iuItP(7|*6t@cRjLLqFu#dmG?c
zbpXze9sw4|Zu_94F+l)VZ6yGv#(VoLwQ}0JEu>&la4AAkgr#VbA|gdpikKA5=fVgJ
z?%Bmi(ul-P@}E(eHO{jbKAxBlH?(?OVg{^XCcpy5;lfP9f!PfkW*Ty4KlG~#W(M}L
zcQ4;nEO_`7rH>aBEJdt@Q;w~2U#jIC7%&S!vm(`;5zP?rD74X58B?_B;Q&j}RS9QV
zt8cPsu#6ce{!gb_>ojW}^L4Wfd{YlSykH-%Thvm<F0xCQm{y7WTjQ#$TIVX!m-_cN
zv1Yx6X1&F`MZ2#!!{02rDPx+hJ#0_-&*e*kN$cyw&o<3eFv*%}wSq%j;b8?Q*#j+m
h>a<1`2PjuVgHAo{3}WJ4@Zf=hcB(jDe5zs3!Z*D6bZP(q