X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/87a109d0e9e63e6ca4530706f2d822459e0cf4dc..b01a836d1ecce5c7cc1aceedf19535eeda9058af:/lib-php/DB.php?ds=sidebyside diff --git a/lib-php/DB.php b/lib-php/DB.php index 63733cc7..553d9452 100644 --- a/lib-php/DB.php +++ b/lib-php/DB.php @@ -43,23 +43,20 @@ class DB $sMsg = 'Failed to establish database connection:' . $e->getMessage(); throw new \Nominatim\DatabaseError($sMsg, 500, null, $e->getMessage()); } - + $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. - if ($this->getPostgresVersion() < 11) { - $this->connection->exec("UPDATE pg_settings SET setting = -1 WHERE name = 'jit_above_cost'"); - $this->connection->exec("UPDATE pg_settings SET setting = 0 WHERE name = 'max_parallel_workers_per_gather'"); - } else { - $this->connection->exec("SET jit_above_cost TO -1"); - $this->connection->exec("SET max_parallel_workers_per_gather TO 0"); + $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 } - + return true; }