Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / DB.php

diff --git a/lib/DB.php b/lib/DB.php
index 6307d6ca2847bdf2a9d90354c33d79983c4c8077..0454a0ff6190567f57acd6d19f46817759ebf7b4 100644 (file)
--- a/lib/DB.php
+++ b/lib/DB.php
@@ -2,7 +2,7 @@
 
 namespace Nominatim;
 
 
 namespace Nominatim;
 

-require_once(CONST_BasePath.'/lib/DatabaseError.php');
+require_once(CONST_LibDir.'/DatabaseError.php');

 
 /**
  * Uses PDO to access the database specified in the CONST_Database_DSN
 
 /**
  * Uses PDO to access the database specified in the CONST_Database_DSN


@@ -12,9 +12,9 @@ class DB
 {
     protected $connection;
 
 {
     protected $connection;
 

-    public function __construct($sDSN = CONST_Database_DSN)
+    public function __construct($sDSN = null)

     {
     {

-        $this->sDSN = $sDSN;
+        $this->sDSN = $sDSN ?? getSetting('DATABASE_DSN');

     }
 
     public function connect($bNew = false, $bPersistent = true)
     }
 
     public function connect($bNew = false, $bPersistent = true)


@@ -240,6 +240,28 @@ class DB
         return ($this->getOne($sSQL, array(':tablename' => $sTableName)) == 1);
     }
 
         return ($this->getOne($sSQL, array(':tablename' => $sTableName)) == 1);
     }
 

+    /**
+    * Returns a list of table names in the database
+    *
+    * @return array[]
+    */
+    public function getListOfTables()
+    {
+        return $this->getCol("SELECT tablename FROM pg_tables WHERE schemaname='public'");
+    }
+
+    /**
+     * Deletes a table. Returns true if deleted or didn't exist.
+     *
+     * @param string  $sTableName
+     *
+     * @return boolean
+     */
+    public function deleteTable($sTableName)
+    {
+        return $this->exec('DROP TABLE IF EXISTS '.$sTableName.' CASCADE') == 0;
+    }
+

     /**
     * Check if an index exists in the database. Optional filtered by tablename
     *
     /**
     * Check if an index exists in the database. Optional filtered by tablename
     *


@@ -311,11 +333,11 @@ END;
     }
 
     /**
     }
 
     /**

-     * Since the DSN includes the database name, checks if the connection works.
+     * Tries to connect to the database but on failure doesn't throw an exception.

      *
      * @return boolean
      */
      *
      * @return boolean
      */

-    public function databaseExists()
+    public function checkConnection()

     {
         $bExists = true;
         try {
     {
         $bExists = true;
         try {


@@ -350,6 +372,13 @@ END;
         return (float) ($aMatches[1].'.'.$aMatches[2]);
     }
 
         return (float) ($aMatches[1].'.'.$aMatches[2]);
     }
 

+    /**
+     * Returns an associate array of postgresql database connection settings. Keys can
+     * be 'database', 'hostspec', 'port', 'username', 'password'.
+     * Returns empty array on failure, thus check if at least 'database' is set.
+     *
+     * @return array[]
+     */

     public static function parseDSN($sDSN)
     {
         // https://secure.php.net/manual/en/ref.pdo-pgsql.connection.php
     public static function parseDSN($sDSN)
     {
         // https://secure.php.net/manual/en/ref.pdo-pgsql.connection.php


@@ -365,4 +394,28 @@ END;
         }
         return $aInfo;
     }
         }
         return $aInfo;
     }

+
+    /**
+     * Takes an array of settings and return the DNS string. Key names can be
+     * 'database', 'hostspec', 'port', 'username', 'password' but aliases
+     * 'dbname', 'host' and 'user' are also supported.
+     *
+     * @return string
+     *
+     */
+    public static function generateDSN($aInfo)
+    {
+        $sDSN = sprintf(
+            'pgsql:host=%s;port=%s;dbname=%s;user=%s;password=%s;',
+            $aInfo['host'] ?? $aInfo['hostspec'] ?? '',
+            $aInfo['port'] ?? '',
+            $aInfo['dbname'] ?? $aInfo['database'] ?? '',
+            $aInfo['user'] ?? '',
+            $aInfo['password'] ?? ''
+        );
+        $sDSN = preg_replace('/\b\w+=;/', '', $sDSN);
+        $sDSN = preg_replace('/;\Z/', '', $sDSN);
+
+        return $sDSN;
+    }

 }
 }