Merge pull request #1303 from mtmail/remove-deprecated-phpunit-config-key

[nominatim.git] / lib / db.php

diff --git a/lib/db.php b/lib/db.php
index 145c57d0b09847b1491bdfe5d72612d6ad192376..8dbe45355fd2ff7068fb37fc189703d998557463 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -8,7 +8,7 @@ function &getDB($bNew = false, $bPersistent = false)
     // Get the database object
     $oDB = chksql(
         DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent),
     // Get the database object
     $oDB = chksql(
         DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent),

-        "Failed to establish database connection"
+        'Failed to establish database connection'

     );
     $oDB->setFetchMode(DB_FETCHMODE_ASSOC);
     $oDB->query("SET DateStyle TO 'sql,european'");
     );
     $oDB->setFetchMode(DB_FETCHMODE_ASSOC);
     $oDB->query("SET DateStyle TO 'sql,european'");


@@ -23,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]);
 }