X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/68596436b10edf588cca2356823dfdd11146e02d..2156fb1ad7978214577bfbd2d3d8d755d2c14049:/lib/db.php?ds=sidebyside

diff --git a/lib/db.php b/lib/db.php
index d7c85e7b..cc84bf9b 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -4,7 +4,7 @@
 	function &getDB($bNew = false, $bPersistent = false)
 	{
 		// Get the database object
-		$oDB =& DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent);
+		$oDB = DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent);
 		if (PEAR::IsError($oDB))
 		{
 			var_dump(CONST_Database_DSN);
@@ -24,3 +24,16 @@
 		return "'".pg_escape_string($s)."'";
 	}
 
+	function getPostgresVersion(&$oDB)
+	{
+		$sVersionString = $oDB->getOne('select version()');
+		preg_match('#PostgreSQL ([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);
+		return (float) ($aMatches[1].'.'.$aMatches[2]);
+	}