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

Merge pull request #4136 from marc1706/ticket/14425

Browse source 
[ticket/14425] Allow setting unix socket in database tests

* marc1706/ticket/14425:
  [ticket/14425] Allow setting unix socket in database tests
This commit is contained in:
Tristan Darricau 2016-01-24 17:59:04 +01:00
commit 9059864dac
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
tests/test_framework/phpbb_database_test_connection_manager.php
View file

@ -85,11 +85,18 @@ class phpbb_database_test_connection_manager
break;
default:
$dsn .= 'host=' . $this->config['dbhost'];
if ($this->config['dbport'])
if (!empty($this->config['dbport']) && !is_numeric($this->config['dbport']) && $this->dbms['PDO'] != 'pgsql')
{
$dsn .= ';port=' . $this->config['dbport'];
$dsn .= 'unix_socket=' . $this->config['dbport'];
}
else
{
$dsn .= 'host=' . $this->config['dbhost'];
if ($this->config['dbport'])
{
$dsn .= ';port=' . $this->config['dbport'];
}
}
if ($use_db)