replace database settings with dotenv variant

[nominatim.git] / lib / setup / AddressLevelParser.php

diff --git a/lib/setup/AddressLevelParser.php b/lib/setup/AddressLevelParser.php
index 920924287342dfb8b83eda50dcfdb299b6b6e862..a399c955ae49a81e50f16d951ad8a22400b104ab 100644 (file)
--- a/lib/setup/AddressLevelParser.php
+++ b/lib/setup/AddressLevelParser.php
@@ -53,14 +53,14 @@ class AddressLevelParser
      */
     public function createTable($oDB, $sTable)
     {
      */
     public function createTable($oDB, $sTable)
     {

-        chksql($oDB->exec('DROP TABLE IF EXISTS '.$sTable));
+        $oDB->exec('DROP TABLE IF EXISTS '.$sTable);

         $sSql = 'CREATE TABLE '.$sTable;
         $sSql .= '(country_code varchar(2), class TEXT, type TEXT,';
         $sSql .= ' rank_search SMALLINT, rank_address SMALLINT)';
         $sSql = 'CREATE TABLE '.$sTable;
         $sSql .= '(country_code varchar(2), class TEXT, type TEXT,';
         $sSql .= ' rank_search SMALLINT, rank_address SMALLINT)';

-        chksql($oDB->exec($sSql));
+        $oDB->exec($sSql);

 
 

-        $sSql = 'CREATE UNIQUE INDEX ON '.$sTable.'(country_code, class, type)';
-        chksql($oDB->exec($sSql));
+        $sSql = 'CREATE UNIQUE INDEX ON '.$sTable.' (country_code, class, type)';
+        $oDB->exec($sSql);

 
         $sSql = 'INSERT INTO '.$sTable.' VALUES ';
         foreach ($this->aLevels as $aLevel) {
 
         $sSql = 'INSERT INTO '.$sTable.' VALUES ';
         foreach ($this->aLevels as $aLevel) {


@@ -93,6 +93,6 @@ class AddressLevelParser
                 }
             }
         }
                 }
             }
         }

-        chksql($oDB->exec(rtrim($sSql, ',')));
+        $oDB->exec(rtrim($sSql, ','));

     }
 }
     }
 }