diff options
| author | Patrick Webster <noxwizard@phpbb.com> | 2012-05-08 04:35:47 -0500 |
|---|---|---|
| committer | Patrick Webster <noxwizard@phpbb.com> | 2012-05-08 04:35:47 -0500 |
| commit | 1496a4198a930e3f9412f6beb6c0307ddeeb6dda (patch) | |
| tree | b4f09af12e13085030d83e7cad7cde73a69f7792 /tests/test_framework | |
| parent | 711d09633a17ef40e9efe67433f2285fa11f0608 (diff) | |
| download | forums-1496a4198a930e3f9412f6beb6c0307ddeeb6dda.tar forums-1496a4198a930e3f9412f6beb6c0307ddeeb6dda.tar.gz forums-1496a4198a930e3f9412f6beb6c0307ddeeb6dda.tar.bz2 forums-1496a4198a930e3f9412f6beb6c0307ddeeb6dda.tar.xz forums-1496a4198a930e3f9412f6beb6c0307ddeeb6dda.zip | |
[ticket/10678] Add port handling for MSSQL tests
PHPBB3-10678
Diffstat (limited to 'tests/test_framework')
| -rw-r--r-- | tests/test_framework/phpbb_database_test_connection_manager.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/test_framework/phpbb_database_test_connection_manager.php b/tests/test_framework/phpbb_database_test_connection_manager.php index 0335c0de36..2e93b6799c 100644 --- a/tests/test_framework/phpbb_database_test_connection_manager.php +++ b/tests/test_framework/phpbb_database_test_connection_manager.php @@ -63,6 +63,13 @@ class phpbb_database_test_connection_manager // e.g. Driver={SQL Server Native Client 10.0};Server=(local)\SQLExpress; $dsn .= $this->config['dbhost']; + // Primarily for MSSQL Native/Azure as ODBC needs it in $dbhost, attached to the Server param + if ($this->config['dbport']) + { + $port_delimiter = (defined('PHP_OS') && substr(PHP_OS, 0, 3) === 'WIN') ? ',' : ':'; + $dsn .= $port_delimiter . $this->config['dbport']; + } + if ($use_db) { $dsn .= ';Database=' . $this->config['dbname']; |