From: Sarah Hoffmann <lonvia@denofr.de>
Date: Mon, 1 Mar 2021 20:28:39 +0000 (+0100)
Subject: do not depend on cmdline parameter for creating partition tables
X-Git-Tag: v3.7.0~25^2~3
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/bf4320a7d61fbe85253bad756679655a81352001

do not depend on cmdline parameter for creating partition tables

The partition numbers in use only depend on the entries in search_name.
---

diff --git a/lib-php/setup/SetupClass.php b/lib-php/setup/SetupClass.php
index b0081fd8..75168619 100755
--- a/lib-php/setup/SetupClass.php
+++ b/lib-php/setup/SetupClass.php
@@ -13,7 +13,6 @@ class SetupFunctions
     protected $sIgnoreErrors;
     protected $bEnableDiffUpdates;
     protected $bEnableDebugStatements;
-    protected $bNoPartitions;
     protected $bDrop;
     protected $oDB = null;
     protected $oNominatimCmd;
@@ -51,11 +50,6 @@ class SetupFunctions
         } else {
             $this->bEnableDebugStatements = false;
         }
-        if (isset($aCMDResult['no-partitions'])) {
-            $this->bNoPartitions = $aCMDResult['no-partitions'];
-        } else {
-            $this->bNoPartitions = false;
-        }
         if (isset($aCMDResult['enable-diff-updates'])) {
             $this->bEnableDiffUpdates = $aCMDResult['enable-diff-updates'];
         } else {
@@ -350,9 +344,9 @@ class SetupFunctions
 
     private function pgsqlRunPartitionScript($sTemplate)
     {
-        $sSQL = 'select distinct partition from country_name';
+        $sSQL = 'select distinct partition from country_name order by partition';
         $aPartitions = $this->db()->getCol($sSQL);
-        if (!$this->bNoPartitions) $aPartitions[] = 0;
+        if ($aPartitions[0] != 0) $aPartitions[] = 0;
 
         preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
         foreach ($aMatches as $aMatch) {