Merge "Schema is not PostgreSQL connection parameter"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Fri, 7 Nov 2014 19:02:18 +0000 (19:02 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Fri, 7 Nov 2014 19:02:18 +0000 (19:02 +0000)
includes/installer/PostgresInstaller.php

index 6dcce23..c30a989 100644 (file)
@@ -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,