makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
* p/ticket/11295:
  [ticket/11295] Drop tables rather than database for postgres in test suite.
This commit is contained in:
Andreas Fischer 2013-01-23 15:45:18 +01:00
commit 9a0992f6a0
1 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
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);
@ -293,7 +303,7 @@ class phpbb_database_test_connection_manager
protected function load_schema_from_file($directory) protected function load_schema_from_file($directory)
{ {
$schema = $this->dbms['SCHEMA']; $schema = $this->dbms['SCHEMA'];
if ($this->config['dbms'] == 'mysql') if ($this->config['dbms'] == 'mysql')
{ {
$sth = $this->pdo->query('SELECT VERSION() AS version'); $sth = $this->pdo->query('SELECT VERSION() AS version');
@ -313,7 +323,7 @@ class phpbb_database_test_connection_manager
$queries = file_get_contents($filename); $queries = file_get_contents($filename);
$sql = phpbb_remove_comments($queries); $sql = phpbb_remove_comments($queries);
$sql = split_sql_file($sql, $this->dbms['DELIM']); $sql = split_sql_file($sql, $this->dbms['DELIM']);
foreach ($sql as $query) foreach ($sql as $query)
@ -419,6 +429,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)