makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17176] Do not always create a new connection in database tests

Browse source 
PHPBB3-17176
This commit is contained in:
Marc Alexander 2023-08-21 18:46:41 +02:00
parent 8a2199ed6c
commit eed92e766f
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/db/driver/postgres.php
View file

@ -431,8 +431,8 @@ class postgres extends \phpbb\db\driver\driver
*/
protected function _sql_close(): bool
{
// Released resources are already closed, return true in this case
if (!$this->db_connect_id instanceof \PgSql\Connection)
// Skip if connection is already closed or not persistent
if (!$this->persistency || !$this->db_connect_id instanceof \PgSql\Connection)
{
return true;
}

2
tests/test_framework/phpbb_database_test_case.php
View file

@ -305,7 +305,7 @@ abstract class phpbb_database_test_case extends TestCase
/** @var \phpbb\db\driver\driver_interface $db */
$db = new $config['dbms']();
$db->sql_connect($config['dbhost'], $config['dbuser'], $config['dbpasswd'], $config['dbname'], $config['dbport'], false, true);
$db->sql_connect($config['dbhost'], $config['dbuser'], $config['dbpasswd'], $config['dbname'], $config['dbport']);
$this->db_connections[] = $db;