]> git.openstreetmap.org Git - nominatim.git/commitdiff
Simplify parsing of postgres and postgis versions
authorSarah Hoffmann <lonvia@denofr.de>
Sun, 18 Nov 2018 16:18:17 +0000 (17:18 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Sun, 18 Nov 2018 16:27:20 +0000 (17:27 +0100)
Switch to functions server_version_num and postgis_lib_version
which both only return the version string, so that no elaborate
string parsing is necessary anymore. The version string could
become especially cumbersome in pre-release versions.

lib/db.php
lib/setup/SetupClass.php

index 493d25f5f8860c489d81e2b8a2c6b8d53fd65933..8dbe45355fd2ff7068fb37fc189703d998557463 100644 (file)
@@ -30,14 +30,14 @@ function getArraySQL($a)
 
 function getPostgresVersion(&$oDB)
 {
 
 function getPostgresVersion(&$oDB)
 {
-    $sVersionString = $oDB->getOne('select version()');
-    preg_match('#PostgreSQL ([0-9]+)[.]([0-9]+)[^0-9]#', $sVersionString, $aMatches);
+    $sVersionString = $oDB->getOne('SHOW server_version_num');
+    preg_match('#([0-9]?[0-9])([0-9][0-9])[0-9][0-9]#', $sVersionString, $aMatches);
     return (float) ($aMatches[1].'.'.$aMatches[2]);
 }
 
 function getPostgisVersion(&$oDB)
 {
     return (float) ($aMatches[1].'.'.$aMatches[2]);
 }
 
 function getPostgisVersion(&$oDB)
 {
-    $sVersionString = $oDB->getOne('select postgis_full_version()');
-    preg_match('#POSTGIS="([0-9]+)[.]([0-9]+)[.]([0-9]+)( r([0-9]+))?"#', $sVersionString, $aMatches);
+    $sVersionString = $oDB->getOne('select postgis_lib_version()');
+    preg_match('#^([0-9]+)[.]([0-9]+)[.]#', $sVersionString, $aMatches);
     return (float) ($aMatches[1].'.'.$aMatches[2]);
 }
     return (float) ($aMatches[1].'.'.$aMatches[2]);
 }
index 5e5b16d6c04f08f68f648ba06d8f5f36d3516e51..4c7c0fdda8d50019d70e1ca8843a595369560050 100755 (executable)
@@ -102,7 +102,7 @@ class SetupFunctions
         $fPostgresVersion = getPostgresVersion($this->oDB);
         echo 'Postgres version found: '.$fPostgresVersion."\n";
 
         $fPostgresVersion = getPostgresVersion($this->oDB);
         echo 'Postgres version found: '.$fPostgresVersion."\n";
 
-        if ($fPostgresVersion < 9.1) {
+        if ($fPostgresVersion < 9.01) {
             fail('Minimum supported version of Postgresql is 9.1.');
         }
 
             fail('Minimum supported version of Postgresql is 9.1.');
         }