Merge branch 'tetris' of https://github.com/roques/Nominatim into roques-tetris

diff --combined utils/setup.php
index fae200cc71fa92f2659c1ee01822bba8673f800d,c61c43e3c6bb062568056f6140bb297a328c6dd7..6a809c733f0cf729eb73efd1cecc01acc4687523
--- 1/utils/setup.php
--- 2/utils/setup.php
+++ b/utils/setup.php
@@@ -360,18 -360,16 +360,18 @@@ if ($aCMDResult['load-data'] || $aCMDRe
      }
  
      echo "Load Data\n";
+     $sColumns = 'osm_type, osm_id, class, type, name, admin_level, address, extratags, geometry';
+ 
      $aDBInstances = array();
      $iLoadThreads = max(1, $iInstances - 1);
      for ($i = 0; $i < $iLoadThreads; $i++) {
          $aDBInstances[$i] =& getDB(true);
-         $sSQL = 'insert into placex (osm_type, osm_id, class, type, name, admin_level, ';
-         $sSQL .= '                   address, extratags, geometry) ';
-         $sSQL .= 'select * from place where osm_id % '.$iLoadThreads.' = '.$i;
+         $sSQL = "INSERT INTO placex ($sColumns) SELECT $sColumns FROM place WHERE osm_id % $iLoadThreads = $i";
          $sSQL .= " and not (class='place' and type='houses' and osm_type='W' and ST_GeometryType(geometry) = 'ST_LineString')";
          if ($aCMDResult['verbose']) echo "$sSQL\n";
 -        if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($oDB->connection));
 +        if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) {
 +            fail(pg_last_error($aDBInstances[$i]->connection));
 +        }
      }
      // last thread for interpolation lines
      $aDBInstances[$iLoadThreads] =& getDB(true);
@@@ -380,9 -378,7 +380,9 @@@
      $sSQL .= ' SELECT osm_id, address, geometry from place where ';
      $sSQL .= "class='place' and type='houses' and osm_type='W' and ST_GeometryType(geometry) = 'ST_LineString'";
      if ($aCMDResult['verbose']) echo "$sSQL\n";
 -    if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($oDB->connection));
 +    if (!pg_send_query($aDBInstances[$iLoadThreads]->connection, $sSQL)) {
 +        fail(pg_last_error($aDBInstances[$iLoadThreads]->connection));
 +    }
  
      $bAnyBusy = true;
      while ($bAnyBusy) {