From: marc tobias <mtmail@gmx.net>
Date: Sun, 1 Sep 2019 23:03:28 +0000 (+0200)
Subject: SetupClass: on --drop check if table exists first
X-Git-Tag: v3.4.0~7^2
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/573fba55af5185e0d6113a062628043d2c87bc76

SetupClass: on --drop check if table exists first
---

diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index b6705968..48955248 100755
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -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) {