README: tiny markdown syntax error

[nominatim.git] / lib / db.php

diff --git a/lib/db.php b/lib/db.php
index a2bba81f587be2d40260efa45d8c2c154d04d23f..8dbe45355fd2ff7068fb37fc189703d998557463 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -1,22 +1,43 @@
 <?php
 <?php

-       require_once('DB.php');

 
 

-       function &getDB()
-       {
-               // Get the database object
-               $oDB =& DB::connect(CONST_Database_DSN, false);
-               if (PEAR::IsError($oDB))
-               {
-                       fail($oDB->getMessage(), 'Unable to connect to the database');
-               }
-               $oDB->setFetchMode(DB_FETCHMODE_ASSOC);
-               $oDB->query("SET DateStyle TO 'sql,european'");
-               $oDB->query("SET client_encoding TO 'utf-8'");
-               return $oDB;
-       }
+require_once('DB.php');

 
 

-       function getDBQuoted($s)
-       {
-               return "'".pg_escape_string($s)."'";
-       }

 
 

+function &getDB($bNew = false, $bPersistent = false)
+{
+    // 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;
+}
+
+function getDBQuoted($s)
+{
+    return "'".pg_escape_string($s)."'";
+}
+
+function getArraySQL($a)
+{
+    return 'ARRAY['.join(',', $a).']';
+}
+
+function getPostgresVersion(&$oDB)
+{
+    $sVersionString = $oDB->getOne('SHOW server_version_num');
+    preg_match('#([0-9]?[0-9])([0-9][0-9])[0-9][0-9]#', $sVersionString, $aMatches);
+    return (float) ($aMatches[1].'.'.$aMatches[2]);
+}
+
+function getPostgisVersion(&$oDB)
+{
+    $sVersionString = $oDB->getOne('select postgis_lib_version()');
+    preg_match('#^([0-9]+)[.]([0-9]+)[.]#', $sVersionString, $aMatches);
+    return (float) ($aMatches[1].'.'.$aMatches[2]);
+}