hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify parsing of postgres and postgis versions

Browse Source 
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.
This commit is contained in:
Sarah Hoffmann
2018-11-18 17:18:17 +01:00
parent fb796d14ec
commit 9cf85f90fb
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/db.php
View File

@@ -30,14 +30,14 @@ function getArraySQL($a)
function getPostgresVersion(&$oDB) function getPostgresVersion(&$oDB)
{ {
$sVersionString = $oDB->getOne('select version()'); $sVersionString = $oDB->getOne('SHOW server_version_num');
preg_match('#PostgreSQL ([0-9]+)[.]([0-9]+)[^0-9]#', $sVersionString, $aMatches); preg_match('#([0-9]?[0-9])([0-9][0-9])[0-9][0-9]#', $sVersionString, $aMatches);
return (float) ($aMatches[1].'.'.$aMatches[2]); return (float) ($aMatches[1].'.'.$aMatches[2]);
} }
function getPostgisVersion(&$oDB) function getPostgisVersion(&$oDB)
{ {
$sVersionString = $oDB->getOne('select postgis_full_version()'); $sVersionString = $oDB->getOne('select postgis_lib_version()');
preg_match('#POSTGIS="([0-9]+)[.]([0-9]+)[.]([0-9]+)( r([0-9]+))?"#', $sVersionString, $aMatches); preg_match('#^([0-9]+)[.]([0-9]+)[.]#', $sVersionString, $aMatches);
return (float) ($aMatches[1].'.'.$aMatches[2]); return (float) ($aMatches[1].'.'.$aMatches[2]);
} }

2
lib/setup/SetupClass.php
View File

@@ -102,7 +102,7 @@ class SetupFunctions
$fPostgresVersion = getPostgresVersion($this->oDB); $fPostgresVersion = getPostgresVersion($this->oDB);
echo 'Postgres version found: '.$fPostgresVersion."\n"; 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.');
} }