From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 3 Jan 2023 09:58:50 +0000 (+0100)
Subject: Merge pull request #2856 from t-tomek/patch-1
X-Git-Tag: v4.3.0~119
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/90b29aa8080ffae08084cf556b45e05f9f2d3198?hp=860c6ecbcc38bb4146992acf3fae7361e39c8904

Merge pull request #2856 from t-tomek/patch-1

Update DB.php
---

diff --git a/lib-php/DB.php b/lib-php/DB.php
index 6b6326b0..553d9452 100644
--- a/lib-php/DB.php
+++ b/lib-php/DB.php
@@ -38,23 +38,25 @@ class DB
 
         // https://secure.php.net/manual/en/ref.pdo-pgsql.connection.php
         try {
-            $conn = new \PDO($this->sDSN, null, null, $aConnOptions);
+            $this->connection = new \PDO($this->sDSN, null, null, $aConnOptions);
         } catch (\PDOException $e) {
             $sMsg = 'Failed to establish database connection:' . $e->getMessage();
             throw new \Nominatim\DatabaseError($sMsg, 500, null, $e->getMessage());
         }
 
-        $conn->exec("SET DateStyle TO 'sql,european'");
-        $conn->exec("SET client_encoding TO 'utf-8'");
+        $this->connection->exec("SET DateStyle TO 'sql,european'");
+        $this->connection->exec("SET client_encoding TO 'utf-8'");
         // Disable JIT and parallel workers. They interfere badly with search SQL.
-        $conn->exec("UPDATE pg_settings SET setting = -1 WHERE name = 'jit_above_cost'");
-        $conn->exec("UPDATE pg_settings SET setting = 0 WHERE name = 'max_parallel_workers_per_gather'");
+        $this->connection->exec('SET max_parallel_workers_per_gather TO 0');
+        if ($this->getPostgresVersion() >= 11) {
+            $this->connection->exec('SET jit_above_cost TO -1');
+        }
+        
         $iMaxExecution = ini_get('max_execution_time');
         if ($iMaxExecution > 0) {
-            $conn->setAttribute(\PDO::ATTR_TIMEOUT, $iMaxExecution); // seconds
+            $this->connection->setAttribute(\PDO::ATTR_TIMEOUT, $iMaxExecution); // seconds
         }
 
-        $this->connection = $conn;
         return true;
     }