Merge pull request #436 from lonvia/remove-location-property-tables

[nominatim.git] / lib / db.php

diff --git a/lib/db.php b/lib/db.php
index b6dc89c49157ddd16072a829221f5d6193c9ef5b..ab578e4b2673f73d00e2b526c304f42f1b08258c 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -14,6 +14,8 @@
                $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;
        }
 
@@ -22,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]);
+       }