add more tables and an experimental warning to new --drop function

[nominatim.git] / lib / db.php

diff --git a/lib/db.php b/lib/db.php
index acdb31c45272d08c66540e796ec67857de974a6c..d7c85e7b6df684f850c9e283bc3e2a29195689f9 100644 (file)
--- a/lib/db.php
+++ b/lib/db.php
@@ -1,10 +1,10 @@
 <?php
        require_once('DB.php');
 
 <?php
        require_once('DB.php');
 

-       function &getDB($bNew = false)
+       function &getDB($bNew = false, $bPersistent = false)

        {
                // Get the database object
        {
                // Get the database object

-               $oDB =& DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), false);
+               $oDB =& DB::connect(CONST_Database_DSN.($bNew?'?new_link=true':''), $bPersistent);

                if (PEAR::IsError($oDB))
                {
                        var_dump(CONST_Database_DSN);
                if (PEAR::IsError($oDB))
                {
                        var_dump(CONST_Database_DSN);


@@ -14,6 +14,8 @@
                $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'");

+               $iMaxExecution = ini_get('max_execution_time') * 1000;
+               if ($iMaxExecution > 0) $oDB->query("SET statement_timeout TO $iMaxExecution");

                return $oDB;
        }
 
                return $oDB;
        }