hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-08 02:54:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1484 from mtmail/ignore-errors-on-setup-drop

Browse Source 
on --drop warn on non-existing tables, dont croak
This commit is contained in:
Sarah Hoffmann
2019-10-15 00:37:33 +02:00
committed by GitHub
parent 452324cf01 573fba55af
commit a7b24627b5
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/setup/SetupClass.php
View File

@@ -725,9 +725,7 @@ class SetupFunctions
} }
foreach ($aDropTables as $sDrop) { foreach ($aDropTables as $sDrop) {
if ($this->bVerbose) echo "Dropping table $sDrop\n"; if ($this->bVerbose) echo "Dropping table $sDrop\n";
$this->oDB->exec("DROP TABLE $sDrop CASCADE"); $this->oDB->exec("DROP TABLE IF EXISTS $sDrop CASCADE");
// ignore warnings/errors as they might be caused by a table having
// been deleted already by CASCADE
} }
if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) { if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {