Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / db.php

diff --git a/lib/db.php b/lib/db.php
index ab578e4b2673f73d00e2b526c304f42f1b08258c..493d25f5f8860c489d81e2b8a2c6b8d53fd65933 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -1,39 +1,43 @@
 <?php
-       require_once('DB.php');
 
-       function &getDB($bNew = false, $bPersistent = false)
-       {
-               // Get the database object
-               $oDB =& DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent);
-               if (PEAR::IsError($oDB))
-               {
-                       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;
-       }
+require_once('DB.php');
 
-       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 &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 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]);
-       }
+function getDBQuoted($s)
+{
+    return "'".pg_escape_string($s)."'";
+}
+
+function getArraySQL($a)
+{
+    return 'ARRAY['.join(',', $a).']';
+}
+
+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]);
+}