diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2016-01-21 12:20:35 +0100 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2016-01-21 12:20:35 +0100 |
| commit | 57b226ec764c981204dd63efe9e05e1a8a9ef161 (patch) | |
| tree | 76c885041572b8416ec9605a6646c0ce1f39ea61 /tests/test_framework | |
| parent | 0c34641abd8f17331fa00b9d847549ce1e5d99e9 (diff) | |
| download | forums-57b226ec764c981204dd63efe9e05e1a8a9ef161.tar forums-57b226ec764c981204dd63efe9e05e1a8a9ef161.tar.gz forums-57b226ec764c981204dd63efe9e05e1a8a9ef161.tar.bz2 forums-57b226ec764c981204dd63efe9e05e1a8a9ef161.tar.xz forums-57b226ec764c981204dd63efe9e05e1a8a9ef161.zip | |
[ticket/14425] Allow setting unix socket in database tests
PHPBB3-14425
Diffstat (limited to 'tests/test_framework')
| -rw-r--r-- | tests/test_framework/phpbb_database_test_connection_manager.php | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php index 5d643e43e2..3b5bab749e 100644 --- a/tests/test_framework/phpbb_database_test_connection_manager.php +++ b/tests/test_framework/phpbb_database_test_connection_manager.php @@ -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 .= 'unix_socket=' . $this->config['dbport']; + } + else { - $dsn .= ';port=' . $this->config['dbport']; + $dsn .= 'host=' . $this->config['dbhost']; + + if ($this->config['dbport']) + { + $dsn .= ';port=' . $this->config['dbport']; + } } if ($use_db) |