Merge remote-tracking branch 'github-p/ticket/10828' into develop-olympus

* github-p/ticket/10828:
  [ticket/10828] Connect to postgres database by default.

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;
 		}