mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
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.
This commit is contained in:
commit
9a0992f6a0
1 changed files with 25 additions and 2 deletions
|
@ -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);
|
||||||
|
|
||||||
|
@ -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)
|
||||||
|
|
Loading…
Add table
Reference in a new issue