Fix bogus DatabaseOracle::__construct() calls in OracleInstaller

[lhc/web/wiklou.git] / includes / installer / OracleInstaller.php

diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php
index e5418e4..659a1d7 100644 (file)
--- a/includes/installer/OracleInstaller.php
+++ b/includes/installer/OracleInstaller.php
@@ -165,35 +165,30 @@ class OracleInstaller extends DatabaseInstaller {
        }
 
        public function openConnection() {
-               $status = Status::newGood();
-               try {
-                       $db = new DatabaseOracle(
-                               $this->getVar( 'wgDBserver' ),
-                               $this->getVar( '_InstallUser' ),
-                               $this->getVar( '_InstallPassword' ),
-                               $this->getVar( '_InstallDBname' ),
-                               0,
-                               $this->getVar( 'wgDBprefix' )
-                       );
-                       $status->value = $db;
-               } catch ( DBConnectionError $e ) {
-                       $this->connError = $e->db->lastErrno();
-                       $status->fatal( 'config-connection-error', $e->getMessage() );
-               }
-
-               return $status;
+               return $this->doOpenConnection();
        }
 
        public function openSYSDBAConnection() {
+               return $this->doOpenConnection( DatabaseOracle::DBO_SYSDBA );
+       }
+
+       /**
+        * @param int $flags
+        * @return Status Status with DatabaseOracle or null as the value
+        */
+       private function doOpenConnection( $flags = 0 ) {
                $status = Status::newGood();
                try {
-                       $db = new DatabaseOracle(
-                               $this->getVar( 'wgDBserver' ),
-                               $this->getVar( '_InstallUser' ),
-                               $this->getVar( '_InstallPassword' ),
-                               $this->getVar( '_InstallDBname' ),
-                               DBO_SYSDBA,
-                               $this->getVar( 'wgDBprefix' )
+                       $db = Database::factory(
+                               'oracle',
+                               [
+                                       'host' => $this->getVar( 'wgDBserver' ),
+                                       'user' => $this->getVar( '_InstallUser' ),
+                                       'password' => $this->getVar( '_InstallPassword' ),
+                                       'dbname' => $this->getVar( '_InstallDBname' ),
+                                       'tablePrefix' => $this->getVar( 'wgDBprefix' ),
+                                       'flags' => $flags
+                               ]
                        );
                        $status->value = $db;
                } catch ( DBConnectionError $e ) {