X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/d72c8633531c859ebf20ed366f1d6976853ffe0d..d9e0ef0ebfbc2860e7c0b7e7510a4014300074be:/lib/db.php diff --git a/lib/db.php b/lib/db.php index 01fc344b..8dbe4535 100644 --- a/lib/db.php +++ b/lib/db.php @@ -8,7 +8,7 @@ function &getDB($bNew = false, $bPersistent = false) // Get the database object $oDB = chksql( DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent), - "Failed to establish database connection" + 'Failed to establish database connection' ); $oDB->setFetchMode(DB_FETCHMODE_ASSOC); $oDB->query("SET DateStyle TO 'sql,european'"); @@ -30,14 +30,14 @@ function getArraySQL($a) 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) { - $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]); }