hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

make errors from psql in setup fatal

Browse Source
This commit is contained in:
Sarah Hoffmann
2014-04-12 13:16:30 +02:00
parent 369a0974bd
commit 090e9e7fb6
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
utils/setup.php
View File

@@ -164,6 +164,13 @@
{ {
pgsqlRunScript('update country_name set partition = 0'); pgsqlRunScript('update country_name set partition = 0');
} }
// the following will be needed by create_functions later but
// is only defined in the subsequently called create_tables.
// Create dummies here that will be overwritten by the proper
// versions in create-tables.
pgsqlRunScript('CREATE TABLE place_boundingbox ()');
pgsqlRunScript('create type wikipedia_article_match as ()');
} }
if ($aCMDResult['import-data'] || $aCMDResult['all']) if ($aCMDResult['import-data'] || $aCMDResult['all'])
@@ -723,7 +730,11 @@
} }
fclose($ahPipes[1]); fclose($ahPipes[1]);
proc_close($hProcess); $iReturn = proc_close($hProcess);
if ($iReturn > 0)
{
fail("pgsql returned with error code ($iReturn)");
}
if ($ahGzipPipes) if ($ahGzipPipes)
{ {
fclose($ahGzipPipes[1]); fclose($ahGzipPipes[1]);
@@ -738,6 +749,7 @@
$aDSNInfo = DB::parseDSN(CONST_Database_DSN); $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432; if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
$sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database']; $sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database'];
$sCMD .= ' -v ON_ERROR_STOP=1';
$aDescriptors = array( $aDescriptors = array(
0 => array('pipe', 'r'), 0 => array('pipe', 'r'),
1 => STDOUT, 1 => STDOUT,
@@ -753,7 +765,11 @@
$sScript = substr($sScript, $written); $sScript = substr($sScript, $written);
} }
fclose($ahPipes[0]); fclose($ahPipes[0]);
proc_close($hProcess); $iReturn = proc_close($hProcess);
if ($iReturn > 0)
{
fail("pgsql returned with error code ($iReturn)");
}
} }
function pgsqlRunRestoreData($sDumpFile) function pgsqlRunRestoreData($sDumpFile)
@@ -781,7 +797,11 @@
} }
fclose($ahPipes[1]); fclose($ahPipes[1]);
proc_close($hProcess); $iReturn = proc_close($hProcess);
if ($iReturn > 0)
{
fail("pgsql returned with error code ($iReturn)");
}
} }
function pgsqlRunDropAndRestore($sDumpFile) function pgsqlRunDropAndRestore($sDumpFile)
@@ -809,7 +829,11 @@
} }
fclose($ahPipes[1]); fclose($ahPipes[1]);
proc_close($hProcess); $iReturn = proc_close($hProcess);
if ($iReturn > 0)
{
fail("pgsql returned with error code ($iReturn)");
}
} }
function passthruCheckReturn($cmd) function passthruCheckReturn($cmd)