Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / db.php

diff --git a/lib/db.php b/lib/db.php
index 87868e5e5d2c36b38a1ca81a7efbae69d31976e9..493d25f5f8860c489d81e2b8a2c6b8d53fd65933 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -2,11 +2,14 @@
 
 require_once('DB.php');
 
 
 require_once('DB.php');
 

+

 function &getDB($bNew = false, $bPersistent = false)
 {
     // Get the database object
 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 = 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'");
     $oDB->setFetchMode(DB_FETCHMODE_ASSOC);
     $oDB->query("SET DateStyle TO 'sql,european'");
     $oDB->query("SET client_encoding TO 'utf-8'");


@@ -20,6 +23,11 @@ function getDBQuoted($s)
     return "'".pg_escape_string($s)."'";
 }
 
     return "'".pg_escape_string($s)."'";
 }
 

+function getArraySQL($a)
+{
+    return 'ARRAY['.join(',', $a).']';
+}
+

 function getPostgresVersion(&$oDB)
 {
     $sVersionString = $oDB->getOne('select version()');
 function getPostgresVersion(&$oDB)
 {
     $sVersionString = $oDB->getOne('select version()');