aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNils Adermann <naderman@naderman.de>2012-06-12 00:44:59 +0200
committerNils Adermann <naderman@naderman.de>2012-06-12 00:44:59 +0200
commit4ebcb5319eb419d63b4ac89a7e70bff26ad0b566 (patch)
tree17825f122f6ba4fcd9cf00780791999ec3d06e74
parent118c5d90daa783ff55319e6121c0fc77166fe58c (diff)
parent9fa7ab62ad45abf3a5035cc792748893d6cd8a4d (diff)
downloadforums-4ebcb5319eb419d63b4ac89a7e70bff26ad0b566.tar
forums-4ebcb5319eb419d63b4ac89a7e70bff26ad0b566.tar.gz
forums-4ebcb5319eb419d63b4ac89a7e70bff26ad0b566.tar.bz2
forums-4ebcb5319eb419d63b4ac89a7e70bff26ad0b566.tar.xz
forums-4ebcb5319eb419d63b4ac89a7e70bff26ad0b566.zip
Merge remote-tracking branch 'github-p/ticket/10828' into develop-olympus
* github-p/ticket/10828: [ticket/10828] Connect to postgres database by default.
-rw-r--r--tests/test_framework/phpbb_database_test_connection_manager.php15
1 files changed, 15 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 c734c90a1a..ae21be6c34 100644
--- a/tests/test_framework/phpbb_database_test_connection_manager.php
+++ b/tests/test_framework/phpbb_database_test_connection_manager.php
@@ -80,6 +80,21 @@ class phpbb_database_test_connection_manager
{
$dsn .= ';dbname=' . $this->config['dbname'];
}
+ else if ($this->dbms['PDO'] == 'pgsql')
+ {
+ // Postgres always connects to a
+ // database. If the database is not
+ // specified here, but the username
+ // is specified, then connection
+ // will be to the database named
+ // as the username.
+ //
+ // For greater compatibility, connect
+ // instead to postgres database which
+ // should always exist:
+ // http://www.postgresql.org/docs/9.0/static/manage-ag-templatedbs.html
+ $dsn .= ';dbname=postgres';
+ }
break;
}