* OracleInstaller now also supports installation with (requested by Tim):

** preexisting account
** privileged account into a restricted account
* DatabaseOracle fixed a fixme (made by Reedy)

diff --git a/includes/db/DatabaseOracle.php b/includes/db/DatabaseOracle.php
index 5aeb773..6c07a3a 100644 (file)
--- a/includes/db/DatabaseOracle.php
+++ b/includes/db/DatabaseOracle.php
@@ -244,9 +244,9 @@ class DatabaseOracle extends DatabaseBase {
 
                $session_mode = $this->mFlags & DBO_SYSDBA ? OCI_SYSDBA : OCI_DEFAULT;
                if ( $this->mFlags & DBO_DEFAULT ) {
-                       $this->mConn = oci_new_connect( $this->mUser, $this->mPassword, $this->mServer, $this->defaultCharset, $session_mode );
+                       $this->mConn = @oci_new_connect( $this->mUser, $this->mPassword, $this->mServer, $this->defaultCharset, $session_mode );
                } else {
-                       $this->mConn = oci_connect( $this->mUser, $this->mPassword, $this->mServer, $this->defaultCharset, $session_mode );
+                       $this->mConn = @oci_connect( $this->mUser, $this->mPassword, $this->mServer, $this->defaultCharset, $session_mode );
                }
 
                if ( $this->mUser != $this->mDBname ) {
@@ -789,12 +789,7 @@ class DatabaseOracle extends DatabaseBase {
        # Returns the size of a text field, or -1 for "unlimited"
        function textFieldSize( $table, $field ) {
                $fieldInfoData = $this->fieldInfo( $table, $field );
-               if ( $fieldInfoData->type() == 'varchar' ) {
-                       $size = $row->size - 4; // FIXME: $row is undefined
-               } else {
-                       $size = $row->size;
-               }
-               return $size;
+               return $fieldInfoData->maxLength();
        }
 
        function limitResult( $sql, $limit, $offset = false ) {

diff --git a/includes/installer/Installer.i18n.php b/includes/installer/Installer.i18n.php
index 129461d..c76fb3b 100644 (file)
--- a/includes/installer/Installer.i18n.php
+++ b/includes/installer/Installer.i18n.php
@@ -170,6 +170,11 @@ It should not contain spaces.
 
 If you are using shared web hosting, your hosting provider will either give you a specific database name to use or let you create databases via a control panel.',
        'config-db-name-oracle'           => 'Database schema:',
+       'config-db-account-oracle-warn' => "There are three supported scenarios for installing Oracle as database backend:
+
+If you wish to create database account as part of the installation process, please supply an account with SYSDBA role as database account for installation and specify the desired credentials for the web-access account, otherwise you can either create the web-access account manually and supply only that account (if it has required permissions to create the schema objects) or supply two different accounts, one with create privileges and a restricted one for web access.
+
+Script for creating an account with required privileges can be found in \"maintenance/oracle/\" directory of this installation. Keep in mind that using a restricted account will disable all maintenance capabilities with the default account.",
        'config-db-install-account'       => 'User account for installation',
        'config-db-username'              => 'Database username:',
        'config-db-password'              => 'Database password:',
@@ -249,6 +254,8 @@ Use only ASCII letters (a-z, A-Z), numbers (0-9), underscores (_) and hyphens (-
 Check the host, username and password below and try again.',
        'config-invalid-schema'           => 'Invalid schema for MediaWiki "$1".
 Use only ASCII letters (a-z, A-Z), numbers (0-9) and underscores (_).',
+       'config-db-sys-create-oracle' => 'Installer only supports using a SYSDBA account for creating a new account.',
+       'config-db-sys-user-exists-oracle' => 'User account "$1" already exists. SYSDBA can only be used for creating of a new account!',
        'config-postgres-old'             => 'PostgreSQL $1 or later is required, you have $2.',
        'config-sqlite-name-help'         => 'Choose a name that identifies your wiki.
 Do not use spaces or hyphens.

diff --git a/includes/installer/OracleInstaller.php b/includes/installer/OracleInstaller.php
index 337b4d6..8575830 100644 (file)
--- a/includes/installer/OracleInstaller.php
+++ b/includes/installer/OracleInstaller.php
@@ -27,11 +27,9 @@ class OracleInstaller extends DatabaseInstaller {
                '_OracleTempTS' => 'TEMP'
        );
        
-       protected $useSysDBA = false;
-
        public $minimumVersion = '9.0.1'; // 9iR1
 
-       protected $sysConn, $userConn;
+       protected $connError = null;
 
        public function getName() {
                return 'oracle';
@@ -41,22 +39,10 @@ class OracleInstaller extends DatabaseInstaller {
                return self::checkExtension( 'oci8' );
        }
 
-       public function getWebUserBox( $noCreateMsg = false ) {
-               $this->parent->setVar( '_SameAccount', false );
-               $this->parent->setVar( '_CreateDBAccount', true );
-               $this->parent->setVar( 'wgDBname', '' );
-               return Html::openElement( 'fieldset' ) .
-                       Html::element( 'legend', array(), wfMsg( 'config-db-web-account' ) ) .
-                       Html::openElement( 'div', array( 'id' => 'dbOtherAccount' ) ) .
-                       $this->getTextBox( 'wgDBuser', 'config-db-username' ) .
-                       $this->getPasswordBox( 'wgDBpassword', 'config-db-password', array(), $this->parent->getHelpBox( 'config-db-web-help' ) ) .
-                       $this->getCheckBox( '_CreateDBAccount', 'config-db-web-create', array( 'disabled' => true ) ).
-                       Html::closeElement( 'div' ) . Html::closeElement( 'fieldset' );
-       }
-
        public function getConnectForm() {
-               $this->parent->setVar( '_InstallUser', 'sys' );
-               $this->parent->setVar( 'wgDBserver', '' );
+               if ( $this->getVar( 'wgDBserver' ) == 'localhost' ) {
+                       $this->parent->setVar( 'wgDBserver', '' );
+               }
                return
                        $this->getTextBox( 'wgDBserver', 'config-db-host-oracle', array(), $this->parent->getHelpBox( 'config-db-host-oracle-help' ) ) .
                        Html::openElement( 'fieldset' ) .
@@ -65,10 +51,17 @@ class OracleInstaller extends DatabaseInstaller {
                        $this->getTextBox( '_OracleDefTS', 'config-oracle-def-ts' ) .
                        $this->getTextBox( '_OracleTempTS', 'config-oracle-temp-ts', array(), $this->parent->getHelpBox( 'config-db-oracle-help' ) ) .
                        Html::closeElement( 'fieldset' ) .
+                       $this->parent->getWarningBox( wfMsg( 'config-db-account-oracle-warn' ) ).
                        $this->getInstallUserBox().
                        $this->getWebUserBox();
        }
 
+       public function submitInstallUserBox() {
+               parent::submitInstallUserBox();
+               $this->parent->setVar( '_InstallDBname', $this->getVar( '_InstallUser' ) );
+               return Status::newGood();
+       }
+
        public function submitConnectForm() {
                // Get variables from the request
                $newValues = $this->setVarsFromRequest( array( 'wgDBserver', 'wgDBprefix', 'wgDBuser', 'wgDBpassword' ) );
@@ -94,11 +87,34 @@ class OracleInstaller extends DatabaseInstaller {
                        return $status;
                }
 
-               // Try to connect
-               $this->useSysDBA = true;
+               // Try to connect trough multiple scenarios
+               // Scenario 1: Install with a manually created account
                $status = $this->getConnection();
                if ( !$status->isOK() ) {
-                       return $status;
+                       if ( $this->connError == 28009 ) { 
+                               // _InstallUser seems to be a SYSDBA
+                               // Scenario 2: Create user with SYSDBA and install with new user
+                               $status = $this->submitWebUserBox();
+                               if ( !$status->isOK() ) {
+                                       return $status;
+                               }
+                               $status = $this->openSYSDBAConnection();
+                               if ( !$status->isOK() ) {
+                                       return $status;
+                               }
+                               if ( !$this->getVar( '_CreateDBAccount' ) ) {
+                                       $status->fatal('config-db-sys-create-oracle');
+                               }
+                       } else {
+                               return $status;
+                       }
+               } else {
+                       // check for web user credentials
+                       // Scenario 3: Install with a priviliged user but use a restricted user
+                       $statusIS3 = $this->submitWebUserBox();
+                       if ( !$statusIS3->isOK() ) {
+                               return $statusIS3;
+                       }
                }
                $conn = $status->value;
 
@@ -114,65 +130,38 @@ class OracleInstaller extends DatabaseInstaller {
        public function openConnection() {
                $status = Status::newGood();
                try {
-                       if ( $this->useSysDBA ) {
-                               $db = new DatabaseOracle(
-                                       $this->getVar( 'wgDBserver' ),
-                                       $this->getVar( '_InstallUser' ),
-                                       $this->getVar( '_InstallPassword' ),
-                                       $this->getVar( '_InstallUser' ),
-                                       DBO_SYSDBA | DBO_DDLMODE,
-                                       $this->getVar( 'wgDBprefix' )
-                               );
-                       } else {
-                               $db = new DatabaseOracle(
-                                       $this->getVar( 'wgDBserver' ),
-                                       $this->getVar( 'wgDBuser' ),
-                                       $this->getVar( 'wgDBpassword' ),
-                                       $this->getVar( 'wgDBname' ),
-                                       0,
-                                       $this->getVar( 'wgDBprefix' )
-                               );
-                       }
+                       $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;
        }
 
-       /**
-        * Cache the two different types of connection which can be returned by 
-        * openConnection().
-        *
-        * $this->db will be set to the last used connection object.
-        *
-        * FIXME: openConnection() should not be doing two different things.
-        */
-       public function getConnection() {
-               // Check cache
-               if ( $this->useSysDBA ) {
-                       $conn = $this->sysConn;
-               } else {
-                       $conn = $this->userConn;
-               }
-               if ( $conn !== null ) {
-                       $this->db = $conn;
-                       return Status::newGood( $conn );
-               }
-
-               // Open a new connection
-               $status = $this->openConnection();
-               if ( !$status->isOK() ) {
-                       return $status;
-               }
-
-               // Save to the cache
-               if ( $this->useSysDBA ) {
-                       $this->sysConn = $status->value;
-               } else {
-                       $this->userConn = $status->value;
+       public function openSYSDBAConnection() {
+               $status = Status::newGood();
+               try {
+                       $db = new DatabaseOracle(
+                               $this->getVar( 'wgDBserver' ),
+                               $this->getVar( '_InstallUser' ),
+                               $this->getVar( '_InstallPassword' ),
+                               $this->getVar( '_InstallDBname' ),
+                               DBO_SYSDBA,
+                               $this->getVar( 'wgDBprefix' )
+                       );
+                       $status->value = $db;
+               } catch ( DBConnectionError $e ) {
+                       $this->connError = $e->db->lastErrno();
+                       $status->fatal( 'config-connection-error', $e->getMessage() );
                }
-               $this->db = $status->value;
                return $status;
        }
 
@@ -195,7 +184,6 @@ class OracleInstaller extends DatabaseInstaller {
 
 
        public function setupDatabase() {
-               $this->useSysDBA = false;
                $status = Status::newGood();
                return $status;
        }
@@ -207,12 +195,20 @@ class OracleInstaller extends DatabaseInstaller {
                        return Status::newGood();
                }
 
-               $this->useSysDBA = true;
-               $status = $this->getConnection();
+               // normaly only SYSDBA users can create accounts
+               $status = $this->openSYSDBAConnection();
                if ( !$status->isOK() ) {
-                       return $status;
+                       if ( $this->connError == 1031 ) { 
+                               // insufficient  privileges (looks like a normal user)
+                               $status = $this->openConnection();
+                               if ( !$status->isOK() ) {
+                                       return $status;
+                               }
+                       } else {
+                               return $status;
+                       }
                }
-
+               $this->db = $status->value;
                $this->setupSchemaVars();
 
                if ( !$this->db->selectDB( $this->getVar( 'wgDBuser' ) ) ) {
@@ -221,8 +217,19 @@ class OracleInstaller extends DatabaseInstaller {
                        if ( $error !== true || !$this->db->selectDB( $this->getVar( 'wgDBuser' ) ) ) {
                                $status->fatal( 'config-install-user-failed', $this->getVar( 'wgDBuser' ), $error );
                        }
+               } elseif ( $this->db->getFlag( DBO_SYSDBA ) ) {
+                       $status->fatal( 'config-db-sys-user-exists-oracle', $this->getVar( 'wgDBuser' ) );
                }
 
+               if ($status->isOK()) {
+                       // user created or already existing, switching back to a normal connection
+                       // as the new user has all needed privileges to setup the rest of the schema
+                       // i will be using that user as _InstallUser from this point on
+                       $this->parent->setVar( '_InstallUser', $this->getVar( 'wgDBuser' ) );
+                       $this->parent->setVar( '_InstallPassword', $this->getVar( 'wgDBpassword' ) );
+                       $this->parent->setVar( '_InstallDBname', $this->getVar( 'wgDBuser' ) );
+                       $status = $this->getConnection();
+               }
 
                return $status;
        }
@@ -233,7 +240,9 @@ class OracleInstaller extends DatabaseInstaller {
        public function createTables() {
                $this->setupSchemaVars();
                $this->db->selectDB( $this->getVar( 'wgDBuser' ) );
+               $this->db->setFlag( DBO_DDLMODE );
                $status = parent::createTables();
+               $this->db->clearFlag( DBO_DDLMODE );
 
                $this->db->query( 'BEGIN fill_wiki_info; END;' );