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

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

View File

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