replace database abstraction DB with PDO

[nominatim.git] / lib / cmd.php

diff --git a/lib/cmd.php b/lib/cmd.php
index 101868109c8f2cd9cca82810583e6a9962799820..436690696b96c4ee6dbddea0faf9b1dd9793ea98 100644 (file)
--- a/lib/cmd.php
+++ b/lib/cmd.php
@@ -122,10 +122,6 @@ function showUsage($aSpec, $bExit = false, $sError = false)
 
 function chksql($oSql, $sMsg = false)
 {
 
 function chksql($oSql, $sMsg = false)
 {

-    if (PEAR::isError($oSql)) {
-        fail($sMsg || $oSql->getMessage(), $oSql->userinfo);
-    }
-

     return $oSql;
 }
 
     return $oSql;
 }
 


@@ -155,7 +151,7 @@ function repeatWarnings()
 function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreErrors = false)
 {
     // Convert database DSN to psql parameters
 function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreErrors = false)
 {
     // Convert database DSN to psql parameters

-    $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
+    $aDSNInfo = \Nominatim\DB::parseDSN(CONST_Database_DSN);

     if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
     $sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database'];
     if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) {
     if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
     $sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database'];
     if (isset($aDSNInfo['hostspec']) && $aDSNInfo['hostspec']) {


@@ -186,7 +182,7 @@ function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreError
     }
 
     if (!$bVerbose) {
     }
 
     if (!$bVerbose) {

-        fwrite($ahPipes[0], "set client_min_messages to WARNING;");
+        fwrite($ahPipes[0], 'set client_min_messages to WARNING;');

     }
 
     while (strlen($sScript)) {
     }
 
     while (strlen($sScript)) {