PHP unit test failed after change in c0b4411

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 7706b60b36387927611ef9271b110047d7528aa1..d08f3bd780af824849b2991acaa7e5cda25837d2 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -124,8 +124,12 @@ if ($aCMDResult['setup-db'] || $aCMDResult['all']) {
     echo 'Postgis version found: '.$fPostgisVersion."\n";
 
     if ($fPostgisVersion < 2.1) {
     echo 'Postgis version found: '.$fPostgisVersion."\n";
 
     if ($fPostgisVersion < 2.1) {

-        // Function was renamed in 2.1 and throws an annoying deprecation warning
+        // Functions were renamed in 2.1 and throw an annoying deprecation warning

         pgsqlRunScript('ALTER FUNCTION st_line_interpolate_point(geometry, double precision) RENAME TO ST_LineInterpolatePoint');
         pgsqlRunScript('ALTER FUNCTION st_line_interpolate_point(geometry, double precision) RENAME TO ST_LineInterpolatePoint');

+        pgsqlRunScript('ALTER FUNCTION ST_Line_Locate_Point(geometry, double precision) RENAME TO ST_LineLocatePoint');
+    }
+    if ($fPostgisVersion < 2.2) {
+        pgsqlRunScript('ALTER FUNCTION ST_Distance_Spheroid(geometry, double precision) RENAME TO ST_DistanceSpheroid');

     }
 
     pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
     }
 
     pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');


@@ -159,7 +163,8 @@ if ($aCMDResult['import-data'] || $aCMDResult['all']) {
 
     $osm2pgsql = CONST_Osm2pgsql_Binary;
     if (!file_exists($osm2pgsql)) {
 
     $osm2pgsql = CONST_Osm2pgsql_Binary;
     if (!file_exists($osm2pgsql)) {

-        echo "Please download and build osm2pgsql.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";
+        echo "Check CONST_Osm2pgsql_Binary in your local settings file.\n";
+        echo "Normally you should not need to set this manually.\n";

         fail("osm2pgsql not found in '$osm2pgsql'");
     }
 
         fail("osm2pgsql not found in '$osm2pgsql'");
     }
 


@@ -341,7 +346,11 @@ if ($aCMDResult['load-data'] || $aCMDResult['all']) {
     }
 
     // used by getorcreate_word_id to ignore frequent partial words
     }
 
     // used by getorcreate_word_id to ignore frequent partial words

-    if (!pg_query($oDB->connection, 'CREATE OR REPLACE FUNCTION get_maxwordfreq() RETURNS integer AS $$ SELECT '.CONST_Max_Word_Frequency.' as maxwordfreq; $$ LANGUAGE SQL IMMUTABLE')) fail(pg_last_error($oDB->connection));
+    $sSQL = 'CREATE OR REPLACE FUNCTION get_maxwordfreq() RETURNS integer AS ';
+    $sSQL .= '$$ SELECT '.CONST_Max_Word_Frequency.' as maxwordfreq; $$ LANGUAGE SQL IMMUTABLE';
+    if (!pg_query($oDB->connection, $sSQL)) {
+        fail(pg_last_error($oDB->connection));
+    }

     echo ".\n";
 
     // pre-create the word list
     echo ".\n";
 
     // pre-create the word list