From 229e56d2cafb892e5f890319160ac9832b1636d5 Mon Sep 17 00:00:00 2001 From: saper Date: Tue, 26 Aug 2014 21:11:25 +0200 Subject: [PATCH] Schema is not PostgreSQL connection parameter Temporary fix for bug 70030. openConnectionWithParams() got a new schema parameter in 30a82aae9cf and therefore must not be used to probe some available databases when checking username/password, because schema is not at all a PostgreSQL connection parameter - it something similar to "current directory" in the database. PostgreSQL can additionally search additional schemas for objects in necessary. This whole openPgConnection logic needs some deeper repair; for now however, let's quickly fix bug 70030 which is caused by that fact that openConnectionWithParams returns magic "Status" object and no longer a DatabasePostgres instance we can directly talk to. As a result, openPgConnection( "create-db" ) was returning a Status object that had another Status object embedded in the value field. This reverts partially commit 30a82aae9cf7e5536eef761637a1277b7c18017e. Conflicts: includes/installer/Installer.php includes/installer/PostgresInstaller.php maintenance/install.php Bug: 70030 Change-Id: I61d5f262e60722bc08201b40b61a298d8af42223 --- includes/installer/PostgresInstaller.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/installer/PostgresInstaller.php b/includes/installer/PostgresInstaller.php index 6dcce23dec..c30a989e6e 100644 --- a/includes/installer/PostgresInstaller.php +++ b/includes/installer/PostgresInstaller.php @@ -262,11 +262,11 @@ class PostgresInstaller extends DatabaseInstaller { $status = Status::newGood(); foreach ( $dbs as $db ) { try { - $conn = $this->openConnectionWithParams( + $conn = new DatabasePostgres( + $this->getVar( 'wgDBserver' ), $user, $password, - $db, - $this->getVar( 'wgDBmwschema' ) ); + $db ); } catch ( DBConnectionError $error ) { $conn = false; $status->fatal( 'config-pg-test-error', $db, -- 2.20.1