Merge pull request #499 from mtmail/travis-ci

[nominatim.git] / lib / db.php

diff --git a/lib/db.php b/lib/db.php
index c50b3c404deb4223728b87aae90d6f926e071954..822acc37d4997f64bca66bc7ea506dcb3ab0f9e3 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -1,17 +1,16 @@
 <?php
        require_once('DB.php');
 
-       function &getDB($bNew = false)
+       function &getDB($bNew = false, $bPersistent = false)
        {
                // Get the database object
-               $oDB =& DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), false);
-               if (PEAR::IsError($oDB))
-               {
-                       fail($oDB->getMessage(), 'Unable to connect to the database');
-               }
+               $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;
        }
 
@@ -20,3 +19,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]);
+       }