mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-08 19:03:02 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* develop-olympus:
  [ticket/11295] Drop tables rather than database for postgres in test suite.

Conflicts:
	tests/test_framework/phpbb_database_test_connection_manager.php
This commit is contained in:
Andreas Fischer
2013-01-23 15:47:28 +01:00
parent 85611150c4 9a0992f6a0
commit ec97e60e17
1 changed files with 23 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
tests/test_framework/phpbb_database_test_connection_manager.php
View File

@ -186,6 +186,16 @@ class phpbb_database_test_connection_manager
$this->purge_extras(); $this->purge_extras();
break; 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: default:
$this->connect(false); $this->connect(false);
@ -418,6 +428,19 @@ class phpbb_database_test_connection_manager
$queries[] = 'DROP SEQUENCE ' . current($row); $queries[] = 'DROP SEQUENCE ' . current($row);
} }
break; 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) foreach ($queries as $query)