X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/15266a9fdd6630a3ce767d5e4a33ff670948a600..163b488591181e05a1ca0f80923ff7d5d309c71b:/utils/setup.php?ds=sidebyside

diff --git a/utils/setup.php b/utils/setup.php
index b96e4e7e..edf0b14d 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -164,6 +164,13 @@
 		{
 			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'])
@@ -724,7 +731,11 @@
 		}
 		fclose($ahPipes[1]);
 
-		proc_close($hProcess);
+		$iReturn = proc_close($hProcess);
+		if ($iReturn > 0)
+		{
+			fail("pgsql returned with error code ($iReturn)");
+		}
 		if ($ahGzipPipes)
 		{
 			fclose($ahGzipPipes[1]);
@@ -739,6 +750,7 @@
 		$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';
 		$aDescriptors = array(
 			0 => array('pipe', 'r'),
 			1 => STDOUT, 
@@ -754,7 +766,11 @@
 			$sScript = substr($sScript, $written);
 		}
 		fclose($ahPipes[0]);
-		proc_close($hProcess);
+		$iReturn = proc_close($hProcess);
+		if ($iReturn > 0)
+		{
+			fail("pgsql returned with error code ($iReturn)");
+		}
 	}
 
 	function pgsqlRunRestoreData($sDumpFile)
@@ -782,7 +798,11 @@
 		}
 		fclose($ahPipes[1]);
 
-		proc_close($hProcess);
+		$iReturn = proc_close($hProcess);
+		if ($iReturn > 0)
+		{
+			fail("pgsql returned with error code ($iReturn)");
+		}
 	}
 
 	function pgsqlRunDropAndRestore($sDumpFile)
@@ -810,7 +830,11 @@
 		}
 		fclose($ahPipes[1]);
 
-		proc_close($hProcess);
+		$iReturn = proc_close($hProcess);
+		if ($iReturn > 0)
+		{
+			fail("pgsql returned with error code ($iReturn)");
+		}
 	}
 
 	function passthruCheckReturn($cmd)