X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/1ee636461c3fe1925731691985161a19cea64247..d4b633bfc50188f36e3c4a8b2b99c3a0e6a7f12e:/lib/cmd.php diff --git a/lib/cmd.php b/lib/cmd.php index 10186810..43669069 100644 --- a/lib/cmd.php +++ b/lib/cmd.php @@ -122,10 +122,6 @@ function showUsage($aSpec, $bExit = false, $sError = false) function chksql($oSql, $sMsg = false) { - if (PEAR::isError($oSql)) { - fail($sMsg || $oSql->getMessage(), $oSql->userinfo); - } - return $oSql; } @@ -155,7 +151,7 @@ function repeatWarnings() 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']) { @@ -186,7 +182,7 @@ function runSQLScript($sScript, $bfatal = true, $bVerbose = false, $bIgnoreError } if (!$bVerbose) { - fwrite($ahPipes[0], "set client_min_messages to WARNING;"); + fwrite($ahPipes[0], 'set client_min_messages to WARNING;'); } while (strlen($sScript)) {