X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/ab6a99677293c9ddb96a717f03b8a009e98ab955..5c187e131a372d0cbdbba3372668862e3f1c47f9:/lib/db.php

diff --git a/lib/db.php b/lib/db.php
index 4f7336c1..822acc37 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -1,18 +1,34 @@
 <?php
 	require_once('DB.php');
 
-	// Get the database object
-	$oDB =& DB::connect(CONST_Database_DSN, false);
-	if (PEAR::IsError($oDB))
+	function &getDB($bNew = false, $bPersistent = false)
 	{
-		fail($oDB->getMessage(), 'Unable to connect to the database');
+		// Get the database object
+		$oDB = chksql(DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent),
+		              "Failed to establish database connection");
+		$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;
 	}
-	$oDB->setFetchMode(DB_FETCHMODE_ASSOC);
-	$oDB->query("SET DateStyle TO 'sql,european'");
-	$oDB->query("SET client_encoding TO 'utf-8'");
 
 	function getDBQuoted($s)
 	{
 		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]);
+	}