*
* TODO: naming this parent is confusing, 'installer' would be clearer.
*
- * @var Installer
+ * @var WebInstaller
*/
public $parent;
*
* @var DatabaseBase
*/
- public $db;
+ public $db = null;
/**
* Internal variables for installation.
}
/**
- * Connect to the database using the administrative user/password currently
- * defined in the session. On success, return the connection, on failure,
- *
- * This may be called multiple times, so the result should be cached.
+ * Open a connection to the database using the administrative user/password
+ * currently defined in the session, without any caching. Returns a status
+ * object. On success, the status object will contain a Database object in
+ * its value member.
*
* @return Status
*/
- public abstract function getConnection();
+ public abstract function openConnection();
/**
* Create the database and return a Status object indicating success or
*/
public abstract function setupDatabase();
+ /**
+ * Connect to the database using the administrative user/password currently
+ * defined in the session. Returns a status object. On success, the status
+ * object will contain a Database object in its value member.
+ *
+ * This will return a cached connection if one is available.
+ *
+ * @return Status
+ */
+ public function getConnection() {
+ if ( $this->db ) {
+ return Status::newGood( $this->db );
+ }
+ $status = $this->openConnection();
+ if ( $status->isOK() ) {
+ $this->db = $status->value;
+ // Enable autocommit
+ $this->db->clearFlag( DBO_TRX );
+ $this->db->commit();
+ }
+ return $status;
+ }
+
/**
* Create database tables from scratch.
*
if( $this->db->tableExists( 'user' ) ) {
$status->warning( 'config-install-tables-exist' );
+ $this->enableLB();
return $status;
}
+ $this->db->setFlag( DBO_DDLMODE ); // For Oracle's handling of schema files
+ $this->db->begin( __METHOD__ );
+
$error = $this->db->sourceFile( $this->db->getSchema() );
if( $error !== true ) {
- $this->db->reportQueryError( $error, 0, $sql, __METHOD__ );
+ $this->db->reportQueryError( $error, 0, '', __METHOD__ );
+ $this->db->rollback( __METHOD__ );
$status->fatal( 'config-install-tables-failed', $error );
+ } else {
+ $this->db->commit( __METHOD__ );
+ }
+ // Resume normal operations
+ if( $status->isOk() ) {
+ $this->enableLB();
}
return $status;
}
+ /**
+ * Create the tables for each extension the user enabled
+ * @return Status
+ */
+ public function createExtensionTables() {
+ $status = $this->getConnection();
+ if ( !$status->isOK() ) {
+ return $status;
+ }
+ $updater = DatabaseUpdater::newForDB( $this->db );
+ $extensionUpdates = $updater->getNewExtensions();
+
+ // No extensions need tables (or haven't updated to new installer support)
+ if( !count( $extensionUpdates ) ) {
+ return $status;
+ }
+
+ $ourExtensions = array_map( 'strtolower', $this->getVar( '_Extensions' ) );
+
+ foreach( $ourExtensions as $ext ) {
+ if( isset( $extensionUpdates[$ext] ) ) {
+ $this->db->begin( __METHOD__ );
+ $error = $this->db->sourceFile( $extensionUpdates[$ext] );
+ if( $error !== true ) {
+ $this->db->rollback( __METHOD__ );
+ $status->warning( 'config-install-tables-failed', $error );
+ } else {
+ $this->db->commit( __METHOD__ );
+ }
+ }
+ }
+
+ // Now run updates to create tables for old extensions
+ $updater->doUpdates( array( 'extensions' ) );
+
+ return $status;
+ }
+
/**
* Get the DBMS-specific options for LocalSettings.php generation.
*
*/
public abstract function getLocalSettings();
+ /**
+ * Override this to provide DBMS-specific schema variables, to be
+ * substituted into tables.sql and other schema files.
+ */
+ public function getSchemaVars() {
+ return array();
+ }
+
+ /**
+ * Set appropriate schema variables in the current database connection.
+ *
+ * This should be called after any request data has been imported, but before
+ * any write operations to the database.
+ */
+ public function setupSchemaVars() {
+ $status = $this->getConnection();
+ if ( $status->isOK() ) {
+ $status->value->setSchemaVars( $this->getSchemaVars() );
+ } else {
+ throw new MWException( __METHOD__.': unexpected DB connection error' );
+ }
+ }
+
+ /**
+ * Set up LBFactory so that wfGetDB() etc. works.
+ * We set up a special LBFactory instance which returns the current
+ * installer connection.
+ */
+ public function enableLB() {
+ $status = $this->getConnection();
+ if ( !$status->isOK() ) {
+ throw new MWException( __METHOD__.': unexpected DB connection error' );
+ }
+ LBFactory::setInstance( new LBFactory_Single( array(
+ 'connection' => $status->value ) ) );
+ }
+
/**
* Perform database upgrades
*
* @return Boolean
*/
public function doUpgrade() {
- # Maintenance scripts like wfGetDB()
- LBFactory::enableBackend();
+ $this->setupSchemaVars();
+ $this->enableLB();
$ret = true;
ob_start( array( $this, 'outputHandler' ) );
return $this->globalNames;
}
- /**
- * Return any table options to be applied to all tables that don't
- * override them.
- *
- * @return Array
- */
- public function getTableOptions() {
- return array();
- }
-
/**
* Construct and initialise parent.
* This is typically only called from Installer::getDBInstaller()
/**
* Get a standard install-user fieldset.
+ *
+ * @return String
*/
public function getInstallUserBox() {
return
* Get a standard web-user fieldset
* @param $noCreateMsg String: Message to display instead of the creation checkbox.
* Set this to false to show a creation checkbox.
+ *
+ * @return String
*/
public function getWebUserBox( $noCreateMsg = false ) {
+ $wrapperStyle = $this->getVar( '_SameAccount' ) ? 'display: none' : '';
$s = Html::openElement( 'fieldset' ) .
Html::element( 'legend', array(), wfMsg( 'config-db-web-account' ) ) .
$this->getCheckBox(
'_SameAccount', 'config-db-web-account-same',
array( 'class' => 'hideShowRadio', 'rel' => 'dbOtherAccount' )
) .
- Html::openElement( 'div', array( 'id' => 'dbOtherAccount', 'style' => 'display: none;' ) ) .
+ Html::openElement( 'div', array( 'id' => 'dbOtherAccount', 'style' => $wrapperStyle ) ) .
$this->getTextBox( 'wgDBuser', 'config-db-username' ) .
$this->getPasswordBox( 'wgDBpassword', 'config-db-password' ) .
$this->parent->getHelpBox( 'config-db-web-help' );
$this->setVar( 'wgDBpassword', $this->getVar( '_InstallPassword' ) );
}
+ if( $this->getVar( '_CreateDBAccount' ) && strval( $this->getVar( 'wgDBpassword' ) ) == '' ) {
+ return Status::newFatal( 'config-db-password-empty', $this->getVar( 'wgDBuser' ) );
+ }
+
return Status::newGood();
}
/**
* Common function for databases that don't understand the MySQLish syntax of interwiki.sql.
+ *
+ * @return Status
*/
public function populateInterwikiTable() {
$status = $this->getConnection();
return $status;
}
global $IP;
+ wfSuppressWarnings();
$rows = file( "$IP/maintenance/interwiki.list",
FILE_IGNORE_NEW_LINES | FILE_SKIP_EMPTY_LINES );
+ wfRestoreWarnings();
$interwikis = array();
if ( !$rows ) {
- return Status::newFatal( 'config-install-interwiki-sql' );
+ return Status::newFatal( 'config-install-interwiki-list' );
}
foreach( $rows as $row ) {
$row = preg_replace( '/^\s*([^#]*?)\s*(#.*)?$/', '\\1', $row ); // strip comments - whee
dépôts / lhc / web / wiklou.git / blobdiff