Switch to configurable style for osm2pgsql

[nominatim.git] / lib / db.php

diff --git a/lib/db.php b/lib/db.php
index 87868e5e5d2c36b38a1ca81a7efbae69d31976e9..8dbe45355fd2ff7068fb37fc189703d998557463 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,16 +23,21 @@ function getDBQuoted($s)
     return "'".pg_escape_string($s)."'";
 }
 
     return "'".pg_escape_string($s)."'";
 }
 

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

 function getPostgresVersion(&$oDB)
 {
 function getPostgresVersion(&$oDB)
 {

-    $sVersionString = $oDB->getOne('select version()');
-    preg_match('#PostgreSQL ([0-9]+)[.]([0-9]+)[^0-9]#', $sVersionString, $aMatches);
+    $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)
 {
     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);
+    $sVersionString = $oDB->getOne('select postgis_lib_version()');
+    preg_match('#^([0-9]+)[.]([0-9]+)[.]#', $sVersionString, $aMatches);

     return (float) ($aMatches[1].'.'.$aMatches[2]);
 }
     return (float) ($aMatches[1].'.'.$aMatches[2]);
 }