From: Sarah Hoffmann Date: Tue, 13 May 2014 21:23:31 +0000 (+0200) Subject: add setup option to ignore SQL errors X-Git-Tag: v2.3.0~32 X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/71883fc3410127b97ae0524ca07a187e125d7801?hp=08b6fffc3638a06ee1dc7fe67fd8f7c708babeac add setup option to ignore SQL errors needed when restoring partial backups --- diff --git a/utils/setup.php b/utils/setup.php index e256289c..a1d8ae5d 100755 --- a/utils/setup.php +++ b/utils/setup.php @@ -22,6 +22,7 @@ array('create-functions', '', 0, 1, 0, 0, 'bool', 'Create functions'), array('enable-diff-updates', '', 0, 1, 0, 0, 'bool', 'Turn on the code required to make diff updates work'), array('enable-debug-statements', '', 0, 1, 0, 0, 'bool', 'Include debug warning statements in pgsql commands'), + array('ignore-errors', '', 0, 1, 0, 0, 'bool', 'Continue import even when errors in SQL are present (EXPERT)'), array('create-minimal-tables', '', 0, 1, 0, 0, 'bool', 'Create minimal main tables'), array('create-tables', '', 0, 1, 0, 0, 'bool', 'Create main tables'), array('create-partition-tables', '', 0, 1, 0, 0, 'bool', 'Create required partition tables'), @@ -745,11 +746,13 @@ function pgsqlRunScript($sScript) { + global $aCMDResult; // Convert database DSN to psql parameters $aDSNInfo = DB::parseDSN(CONST_Database_DSN); if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432; $sCMD = 'psql -p '.$aDSNInfo['port'].' -d '.$aDSNInfo['database']; - $sCMD .= ' -v ON_ERROR_STOP=1'; + if (!$aCMDResult['ignore-errors']) + $sCMD .= ' -v ON_ERROR_STOP=1'; $aDescriptors = array( 0 => array('pipe', 'r'), 1 => STDOUT,