Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 624c49a381c145f867c62582c01071a866b45d54..8663019624087bee395b8e27b7a4b6f5c5ee0476 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -541,8 +541,10 @@ if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {
         $sSQL .= "        (SELECT postcode FROM location_postcode";
         $sSQL .= "          WHERE country_code = 'us')";
 
         $sSQL .= "        (SELECT postcode FROM location_postcode";
         $sSQL .= "          WHERE country_code = 'us')";
 

-        if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
+    } else {
+        $sSQL .= "TRUNCATE TABLE us_postcode";

     }
     }

+    if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));

 
     // add missing postcodes for GB (if available)
     $sSQL  = "INSERT INTO location_postcode";
 
     // add missing postcodes for GB (if available)
     $sSQL  = "INSERT INTO location_postcode";