safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Nominatim::DB tests against separate postgresql database

Browse Source
This commit is contained in:
marc tobias
2020-04-13 17:48:20 +02:00
parent 553d8a828c
commit 38c21de0ee
6 changed files with 200 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/setup/SetupClass.php
View File

@@ -84,7 +84,7 @@ class SetupFunctions
info('Create DB');
$oDB = new \Nominatim\DB;
if ($oDB->databaseExists()) {
if ($oDB->checkConnection()) {
fail('database already exists ('.CONST_Database_DSN.')');
}
@@ -651,7 +651,7 @@ class SetupFunctions
);
$aDropTables = array();
$aHaveTables = $this->oDB->getCol("SELECT tablename FROM pg_tables WHERE schemaname='public'");
$aHaveTables = $this->oDB->getListOfTables();
foreach ($aHaveTables as $sTable) {
$bFound = false;
@@ -858,7 +858,7 @@ class SetupFunctions
private function dropTable($sName)
{
if ($this->bVerbose) echo "Dropping table $sName\n";
$this->oDB->exec('DROP TABLE IF EXISTS '.$sName.' CASCADE');
$this->oDB->deleteTable($sName);
}
/**