Merge remote-tracking branch 'p/ticket/11295' into develop-olympus

* p/ticket/11295:
  [ticket/11295] Drop tables rather than database for postgres in test suite.

1 files changed, 25 insertions, 2 deletions

diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php
index d7c2804aa7..3b8c2e99ae 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -186,6 +186,16 @@ class phpbb_database_test_connection_manager
 				$this->purge_extras();
 			break;
 
+			case 'postgres':
+				$this->connect();
+				// Drop all of the tables
+				foreach ($this->get_tables() as $table)
+				{
+					$this->pdo->exec('DROP TABLE ' . $table . ' CASCADE');
+				}
+				$this->purge_extras();
+			break;
+
 			default:
 				$this->connect(false);
 
@@ -293,7 +303,7 @@ class phpbb_database_test_connection_manager
 	protected function load_schema_from_file($directory)
 	{
 		$schema = $this->dbms['SCHEMA'];
-		
+
 		if ($this->config['dbms'] == 'mysql')
 		{
 			$sth = $this->pdo->query('SELECT VERSION() AS version');
@@ -313,7 +323,7 @@ class phpbb_database_test_connection_manager
 
 		$queries = file_get_contents($filename);
 		$sql = phpbb_remove_comments($queries);
-		
+
 		$sql = split_sql_file($sql, $this->dbms['DELIM']);
 
 		foreach ($sql as $query)
@@ -419,6 +429,19 @@ class phpbb_database_test_connection_manager
 					$queries[] = 'DROP SEQUENCE ' . current($row);
 				}
 			break;
+
+			case 'postgres':
+				$sql = 'SELECT sequence_name
+					FROM information_schema.sequences';
+				$result = $this->pdo->query($sql);
+
+				while ($row = $result->fetch(PDO::FETCH_NUM))
+				{
+					$queries[] = 'DROP SEQUENCE ' . current($row);
+				}
+
+				$queries[] = 'DROP TYPE IF EXISTS varchar_ci CASCADE';
+			break;
 		}
 
 		foreach ($queries as $query)