X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/57583f09e3277c4297abf06d37e1f97982366564..2156fb1ad7978214577bfbd2d3d8d755d2c14049:/lib/db.php

diff --git a/lib/db.php b/lib/db.php
index a2bba81f..cc84bf9b 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -1,17 +1,21 @@
 <?php
 	require_once('DB.php');
 
-	function &getDB()
+	function &getDB($bNew = false, $bPersistent = false)
 	{
 		// Get the database object
-		$oDB =& DB::connect(CONST_Database_DSN, false);
+		$oDB = DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent);
 		if (PEAR::IsError($oDB))
 		{
-			fail($oDB->getMessage(), 'Unable to connect to the database');
+			var_dump(CONST_Database_DSN);
+			var_Dump($oDB);
+			fail($oDB->getMessage());
 		}
 		$oDB->setFetchMode(DB_FETCHMODE_ASSOC);
 		$oDB->query("SET DateStyle TO 'sql,european'");
 		$oDB->query("SET client_encoding TO 'utf-8'");
+		$iMaxExecution = ini_get('max_execution_time') * 1000;
+		if ($iMaxExecution > 0) $oDB->query("SET statement_timeout TO $iMaxExecution");
 		return $oDB;
 	}
 
@@ -20,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]);
+	}