http://www.mediawiki.org/wiki/Special:Code/MediaWiki/74072
Revision: 74072
Author: demon
Date: 2010-10-01 15:11:06 +0000 (Fri, 01 Oct 2010)
Log Message:
-----------
wfOut() -> $this->output(). More useful in the long run. No functional changes.
Modified Paths:
--------------
trunk/phase3/includes/installer/DatabaseUpdater.php
trunk/phase3/includes/installer/MysqlUpdater.php
trunk/phase3/includes/installer/PostgresUpdater.php
trunk/phase3/includes/installer/SqliteUpdater.php
Modified: trunk/phase3/includes/installer/DatabaseUpdater.php
===================================================================
--- trunk/phase3/includes/installer/DatabaseUpdater.php 2010-10-01 14:51:03 UTC
(rev 74071)
+++ trunk/phase3/includes/installer/DatabaseUpdater.php 2010-10-01 15:11:06 UTC
(rev 74072)
@@ -87,6 +87,16 @@
}
/**
+ * Output some text. Right now this is a wrapper for wfOut, but
hopefully
+ * that function can go away some day :)
+ *
+ * @param $str String: Text to output
+ */
+ protected function output( $str ) {
+ wfOut( $str );
+ }
+
+ /**
* Add a new update coming from an extension. This should be called by
* extensions while executing the LoadExtensionSchemaUpdates hook.
*
@@ -272,11 +282,11 @@
*/
protected function addTable( $name, $patch, $fullpath = false ) {
if ( $this->db->tableExists( $name ) ) {
- wfOut( "...$name table already exists.\n" );
+ $this->output( "...$name table already exists.\n" );
} else {
- wfOut( "Creating $name table..." );
+ $this->output( "Creating $name table..." );
$this->applyPatch( $patch, $fullpath );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
}
@@ -289,13 +299,13 @@
*/
protected function addField( $table, $field, $patch, $fullpath = false
) {
if ( !$this->db->tableExists( $table ) ) {
- wfOut( "...$table table does not exist, skipping new
field patch\n" );
+ $this->output( "...$table table does not exist,
skipping new field patch\n" );
} elseif ( $this->db->fieldExists( $table, $field ) ) {
- wfOut( "...have $field field in $table table.\n" );
+ $this->output( "...have $field field in $table
table.\n" );
} else {
- wfOut( "Adding $field field to table $table..." );
+ $this->output( "Adding $field field to table $table..."
);
$this->applyPatch( $patch, $fullpath );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
}
@@ -308,11 +318,11 @@
*/
function addIndex( $table, $index, $patch, $fullpath = false ) {
if ( $this->db->indexExists( $table, $index ) ) {
- wfOut( "...$index key already set on $table table.\n" );
+ $this->output( "...$index key already set on $table
table.\n" );
} else {
- wfOut( "Adding $index key to table $table... " );
+ $this->output( "Adding $index key to table $table... "
);
$this->applyPatch( $patch, $fullpath );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
}
@@ -326,11 +336,11 @@
*/
function dropField( $table, $field, $patch, $fullpath = false ) {
if ( $this->db->fieldExists( $table, $field ) ) {
- wfOut( "Table $table contains $field field. Dropping...
" );
+ $this->output( "Table $table contains $field field.
Dropping... " );
$this->applyPatch( $patch, $fullpath );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
} else {
- wfOut( "...$table table does not contain $field
field.\n" );
+ $this->output( "...$table table does not contain $field
field.\n" );
}
}
@@ -344,11 +354,11 @@
*/
function dropIndex( $table, $index, $patch, $fullpath = false ) {
if ( $this->db->indexExists( $table, $index ) ) {
- wfOut( "Dropping $index from table $table... " );
+ $this->output( "Dropping $index from table $table... "
);
$this->applyPatch( $patch, $fullpath );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
} else {
- wfOut( "...$index key doesn't exist.\n" );
+ $this->output( "...$index key doesn't exist.\n" );
}
}
@@ -362,13 +372,13 @@
*/
public function modifyField( $table, $field, $patch, $fullpath = false
) {
if ( !$this->db->tableExists( $table ) ) {
- wfOut( "...$table table does not exist, skipping modify
field patch\n" );
+ $this->output( "...$table table does not exist,
skipping modify field patch\n" );
} elseif ( !$this->db->fieldExists( $table, $field ) ) {
- wfOut( "...$field field does not exist in $table table,
skipping modify field patch\n" );
+ $this->output( "...$field field does not exist in
$table table, skipping modify field patch\n" );
} else {
- wfOut( "Modifying $field field of table $table..." );
+ $this->output( "Modifying $field field of table
$table..." );
$this->applyPatch( $patch, $fullpath );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
}
@@ -378,23 +388,23 @@
protected function purgeCache() {
# We can't guarantee that the user will be able to use TRUNCATE,
# but we know that DELETE is available to us
- wfOut( "Purging caches..." );
+ $this->output( "Purging caches..." );
$this->db->delete( 'objectcache', '*', __METHOD__ );
- wfOut( "done.\n" );
+ $this->output( "done.\n" );
}
/**
* Check the site_stats table is not properly populated.
*/
protected function checkStats() {
- wfOut( "Checking site_stats row..." );
+ $this->output( "Checking site_stats row..." );
$row = $this->db->selectRow( 'site_stats', '*', array(
'ss_row_id' => 1 ), __METHOD__ );
if ( $row === false ) {
- wfOut( "data is missing! rebuilding...\n" );
+ $this->output( "data is missing! rebuilding...\n" );
} elseif ( isset( $row->site_stats ) && $row->ss_total_pages ==
-1 ) {
- wfOut( "missing ss_total_pages, rebuilding...\n" );
+ $this->output( "missing ss_total_pages,
rebuilding...\n" );
} else {
- wfOut( "done.\n" );
+ $this->output( "done.\n" );
return;
}
SiteStatsInit::doAllAndCommit( false );
@@ -414,33 +424,33 @@
array( 'ss_row_id' => 1 ), __METHOD__, array(
'LIMIT' => 1 )
);
}
- wfOut( "...ss_active_users user count set...\n" );
+ $this->output( "...ss_active_users user count set...\n" );
}
protected function doLogSearchPopulation() {
if ( $this->updateRowExists( 'populate log_search' ) ) {
- wfOut( "...log_search table already populated.\n" );
+ $this->output( "...log_search table already
populated.\n" );
return;
}
- wfOut(
+ $this->output(
"Populating log_search table, printing progress
markers. For large\n" .
"databases, you may want to hit Ctrl-C and do this
manually with\n" .
"maintenance/populateLogSearch.php.\n" );
$task = new PopulateLogSearch();
$task->execute();
- wfOut( "Done populating log_search table.\n" );
+ $this->output( "Done populating log_search table.\n" );
}
function doUpdateTranscacheField() {
if ( $this->updateRowExists( 'convert transcache field' ) ) {
- wfOut( "...transcache tc_time already converted.\n" );
+ $this->output( "...transcache tc_time already
converted.\n" );
return;
}
- wfOut( "Converting tc_time from UNIX epoch to MediaWiki
timestamp... " );
+ $this->output( "Converting tc_time from UNIX epoch to MediaWiki
timestamp... " );
$this->applyPatch( 'patch-tc-timestamp.sql' );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
protected function doCollationUpdate() {
@@ -451,7 +461,7 @@
'cl_collation != ' . $this->db->addQuotes(
$wgCategoryCollation ),
__METHOD__
) == 0 ) {
- wfOut( "...collations up-to-date.\n" );
+ $this->output( "...collations up-to-date.\n" );
return;
}
Modified: trunk/phase3/includes/installer/MysqlUpdater.php
===================================================================
--- trunk/phase3/includes/installer/MysqlUpdater.php 2010-10-01 14:51:03 UTC
(rev 74071)
+++ trunk/phase3/includes/installer/MysqlUpdater.php 2010-10-01 15:11:06 UTC
(rev 74072)
@@ -188,11 +188,11 @@
$flags = explode( ' ', mysql_field_flags( $res->result, 0 ) );
if ( in_array( 'binary', $flags ) ) {
- wfOut( "...$table table has correct $field encoding.\n"
);
+ $this->output( "...$table table has correct $field
encoding.\n" );
} else {
- wfOut( "Fixing $field encoding on $table table... " );
+ $this->output( "Fixing $field encoding on $table
table... " );
$this->db->applyPatch( $patchFile );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
}
@@ -209,12 +209,12 @@
if ( $info ) {
foreach ( $info as $row ) {
if ( $row->Column_name == $field ) {
- wfOut( "...index $index on table $table
includes field $field\n" );
+ $this->output( "...index $index on
table $table includes field $field\n" );
return true;
}
}
}
- wfOut( "...index $index on table $table has no field $field;
adding\n" );
+ $this->output( "...index $index on table $table has no field
$field; adding\n" );
return false;
}
@@ -225,16 +225,16 @@
global $IP;
if ( $this->db->tableExists( "interwiki" ) ) {
- wfOut( "...already have interwiki table\n" );
+ $this->output( "...already have interwiki table\n" );
return;
}
- wfOut( 'Creating interwiki table...' );
+ $this->output( 'Creating interwiki table...' );
$this->applyPatch( 'patch-interwiki.sql' );
- wfOut( "ok\n" );
- wfOut( 'Adding default interwiki definitions...' );
+ $this->output( "ok\n" );
+ $this->output( 'Adding default interwiki definitions...' );
$this->applyPatch( "$IP/maintenance/interwiki.sql", true );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
/**
@@ -243,13 +243,13 @@
protected function doIndexUpdate() {
$meta = $this->db->fieldInfo( 'recentchanges', 'rc_timestamp' );
if ( $meta->isMultipleKey() ) {
- wfOut( "...indexes seem up to 20031107 standards\n" );
+ $this->output( "...indexes seem up to 20031107
standards\n" );
return;
}
- wfOut( "Updating indexes to 20031107..." );
+ $this->output( "Updating indexes to 20031107..." );
$this->applyPatch( 'patch-indexes.sql', true );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
protected function doOldLinksUpdate() {
@@ -260,14 +260,14 @@
protected function doFixAncientImagelinks() {
$info = $this->db->fieldInfo( 'imagelinks', 'il_from' );
if ( !$info || $info->type() !== 'string' ) {
- wfOut( "...il_from OK\n" );
+ $this->output( "...il_from OK\n" );
return;
}
- wfOut( "Fixing ancient broken imagelinks table.\n" );
- wfOut( "NOTE: you will have to run maintenance/refreshLinks.php
after this.\n" );
+ $this->output( "Fixing ancient broken imagelinks table.\n" );
+ $this->output( "NOTE: you will have to run
maintenance/refreshLinks.php after this.\n" );
$this->applyPatch( 'patch-fix-il_from.sql' );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
/**
@@ -277,11 +277,11 @@
$talk = $this->db->selectField( 'watchlist', 'count(*)',
'wl_namespace & 1', __METHOD__ );
$nontalk = $this->db->selectField( 'watchlist', 'count(*)',
'NOT (wl_namespace & 1)', __METHOD__ );
if ( $talk == $nontalk ) {
- wfOut( "...watchlist talk page rows already present\n"
);
+ $this->output( "...watchlist talk page rows already
present\n" );
return;
}
- wfOut( "Adding missing watchlist talk page rows... " );
+ $this->output( "Adding missing watchlist talk page rows... " );
$this->db->insertSelect( 'watchlist', 'watchlist',
array(
'wl_user' => 'wl_user',
@@ -289,18 +289,18 @@
'wl_title' => 'wl_title',
'wl_notificationtimestamp' =>
'wl_notificationtimestamp'
), array( 'NOT (wl_namespace & 1)' ), __METHOD__,
'IGNORE' );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
function doSchemaRestructuring() {
if ( $this->db->tableExists( 'page' ) ) {
- wfOut( "...page table already exists.\n" );
+ $this->output( "...page table already exists.\n" );
return;
}
- wfOut( "...converting from cur/old to page/revision/text DB
structure.\n" );
- wfOut( wfTimestamp( TS_DB ) );
- wfOut( "......checking for duplicate entries.\n" );
+ $this->output( "...converting from cur/old to
page/revision/text DB structure.\n" );
+ $this->output( wfTimestamp( TS_DB ) );
+ $this->output( "......checking for duplicate entries.\n" );
list ( $cur, $old, $page, $revision, $text ) =
$this->db->tableNamesN( 'cur', 'old', 'page', 'revision', 'text' );
@@ -308,15 +308,15 @@
FROM $cur GROUP BY cur_title, cur_namespace
HAVING c>1", __METHOD__ );
if ( $rows->numRows() > 0 ) {
- wfOut( wfTimestamp( TS_DB ) );
- wfOut( "......<b>Found duplicate entries</b>\n" );
- wfOut( sprintf( "<b> %-60s %3s %5s</b>\n",
'Title', 'NS', 'Count' ) );
+ $this->output( wfTimestamp( TS_DB ) );
+ $this->output( "......<b>Found duplicate entries</b>\n"
);
+ $this->output( sprintf( "<b> %-60s %3s %5s</b>\n",
'Title', 'NS', 'Count' ) );
foreach ( $rows as $row ) {
if ( ! isset( $duplicate[$row->cur_namespace] )
) {
$duplicate[$row->cur_namespace] =
array();
}
$duplicate[$row->cur_namespace][] =
$row->cur_title;
- wfOut( sprintf( " %-60s %3s %5s\n",
$row->cur_title, $row->cur_namespace, $row->c ) );
+ $this->output( sprintf( " %-60s %3s
%5s\n", $row->cur_title, $row->cur_namespace, $row->c ) );
}
$sql = "SELECT cur_title, cur_namespace, cur_id,
cur_timestamp FROM $cur WHERE ";
$firstCond = true;
@@ -356,13 +356,13 @@
}
$sql = "DELETE FROM $cur WHERE cur_id IN ( " . join(
',', $deleteId ) . ')';
$rows = $this->db->query( $sql, __METHOD__ );
- wfOut( wfTimestamp( TS_DB ) );
- wfOut( "......<b>Deleted</b> " .
$this->db->affectedRows() . " records.\n" );
+ $this->output( wfTimestamp( TS_DB ) );
+ $this->output( "......<b>Deleted</b> " .
$this->db->affectedRows() . " records.\n" );
}
- wfOut( wfTimestamp( TS_DB ) );
- wfOut( "......Creating tables.\n" );
+ $this->output( wfTimestamp( TS_DB ) );
+ $this->output( "......Creating tables.\n" );
$this->db->query( "CREATE TABLE $page (
page_id int(8) unsigned NOT NULL auto_increment,
page_namespace int NOT NULL,
@@ -400,26 +400,26 @@
INDEX usertext_timestamp (rev_user_text,rev_timestamp)
) ENGINE=InnoDB", __METHOD__ );
- wfOut( wfTimestamp( TS_DB ) );
- wfOut( "......Locking tables.\n" );
+ $this->output( wfTimestamp( TS_DB ) );
+ $this->output( "......Locking tables.\n" );
$this->db->query( "LOCK TABLES $page WRITE, $revision WRITE,
$old WRITE, $cur WRITE", __METHOD__ );
$maxold = intval( $this->db->selectField( 'old', 'max(old_id)',
'', __METHOD__ ) );
- wfOut( wfTimestamp( TS_DB ) );
- wfOut( "......maxold is {$maxold}\n" );
+ $this->output( wfTimestamp( TS_DB ) );
+ $this->output( "......maxold is {$maxold}\n" );
- wfOut( wfTimestamp( TS_DB ) );
+ $this->output( wfTimestamp( TS_DB ) );
global $wgLegacySchemaConversion;
if ( $wgLegacySchemaConversion ) {
// Create HistoryBlobCurStub entries.
// Text will be pulled from the leftover 'cur' table at
runtime.
- wfOut( "......Moving metadata from cur; using blob
references to text in cur table.\n" );
+ $this->output( "......Moving metadata from cur; using
blob references to text in cur table.\n" );
$cur_text =
"concat('O:18:\"historyblobcurstub\":1:{s:6:\"mCurId\";i:',cur_id,';}')";
$cur_flags = "'object'";
} else {
// Copy all cur text in immediately: this may take
longer but avoids
// having to keep an extra table around.
- wfOut( "......Moving text from cur.\n" );
+ $this->output( "......Moving text from cur.\n" );
$cur_text = 'cur_text';
$cur_flags = "''";
}
@@ -428,16 +428,16 @@
SELECT cur_namespace, cur_title, $cur_text,
cur_comment, cur_user, cur_user_text, cur_timestamp, cur_minor_edit, $cur_flags
FROM $cur", __METHOD__ );
- wfOut( wfTimestamp( TS_DB ) );
- wfOut( "......Setting up revision table.\n" );
+ $this->output( wfTimestamp( TS_DB ) );
+ $this->output( "......Setting up revision table.\n" );
$this->db->query( "INSERT INTO $revision (rev_id, rev_page,
rev_comment, rev_user, rev_user_text, rev_timestamp,
rev_minor_edit)
SELECT old_id, cur_id, old_comment, old_user,
old_user_text,
old_timestamp, old_minor_edit
FROM $old,$cur WHERE old_namespace=cur_namespace AND
old_title=cur_title", __METHOD__ );
- wfOut( wfTimestamp( TS_DB ) );
- wfOut( "......Setting up page table.\n" );
+ $this->output( wfTimestamp( TS_DB ) );
+ $this->output( "......Setting up page table.\n" );
$this->db->query( "INSERT INTO $page (page_id, page_namespace,
page_title, page_restrictions, page_counter,
page_is_redirect, page_is_new, page_random,
page_touched, page_latest, page_len)
SELECT cur_id, cur_namespace, cur_title,
cur_restrictions, cur_counter, cur_is_redirect, cur_is_new,
@@ -445,16 +445,16 @@
FROM $cur,$revision
WHERE cur_id=rev_page AND rev_timestamp=cur_timestamp
AND rev_id > {$maxold}", __METHOD__ );
- wfOut( wfTimestamp( TS_DB ) );
- wfOut( "......Unlocking tables.\n" );
+ $this->output( wfTimestamp( TS_DB ) );
+ $this->output( "......Unlocking tables.\n" );
$this->db->query( "UNLOCK TABLES", __METHOD__ );
- wfOut( wfTimestamp( TS_DB ) );
- wfOut( "......Renaming old.\n" );
+ $this->output( wfTimestamp( TS_DB ) );
+ $this->output( "......Renaming old.\n" );
$this->db->query( "ALTER TABLE $old RENAME TO $text",
__METHOD__ );
- wfOut( wfTimestamp( TS_DB ) );
- wfOut( "...done.\n" );
+ $this->output( wfTimestamp( TS_DB ) );
+ $this->output( "...done.\n" );
}
protected function doNamespaceSize() {
@@ -474,24 +474,24 @@
$info = $this->db->fetchObject( $result );
if ( substr( $info->Type, 0, 3 ) == 'int' ) {
- wfOut( "...$field is already a full int
($info->Type).\n" );
+ $this->output( "...$field is already a full int
($info->Type).\n" );
} else {
- wfOut( "Promoting $field from $info->Type to
int... " );
+ $this->output( "Promoting $field from
$info->Type to int... " );
$this->db->query( "ALTER TABLE $tablename
MODIFY $field int NOT NULL", __METHOD__ );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
}
}
protected function doPagelinksUpdate() {
if ( $this->db->tableExists( 'pagelinks' ) ) {
- wfOut( "...already have pagelinks table.\n" );
+ $this->output( "...already have pagelinks table.\n" );
return;
}
- wfOut( "Converting links and brokenlinks tables to pagelinks...
" );
+ $this->output( "Converting links and brokenlinks tables to
pagelinks... " );
$this->applyPatch( 'patch-pagelinks.sql' );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
global $wgContLang;
foreach ( MWNamespace::getCanonicalNamespaces() as $ns => $name
) {
@@ -499,7 +499,7 @@
continue;
}
- wfOut( "Cleaning up broken links for namespace $ns... "
);
+ $this->output( "Cleaning up broken links for namespace
$ns... " );
$pagelinks = $this->db->tableName( 'pagelinks' );
$name = $wgContLang->getNsText( $ns );
@@ -513,23 +513,23 @@
AND pl_title LIKE '$likeprefix:%'";
$this->db->query( $sql, __METHOD__ );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
}
protected function doUserUniqueUpdate() {
$duper = new UserDupes( $this->db );
if ( $duper->hasUniqueIndex() ) {
- wfOut( "...already have unique user_name index.\n" );
+ $this->output( "...already have unique user_name
index.\n" );
return;
}
if ( !$duper->clearDupes() ) {
- wfOut( "WARNING: This next step will probably fail due
to unfixed duplicates...\n" );
+ $this->output( "WARNING: This next step will probably
fail due to unfixed duplicates...\n" );
}
- wfOut( "Adding unique index on user_name... " );
+ $this->output( "Adding unique index on user_name... " );
$this->applyPatch( 'patch-user_nameindex.sql' );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
protected function doUserGroupsUpdate() {
@@ -538,42 +538,42 @@
if ( $info->type() == 'int' ) {
$oldug = $this->db->tableName( 'user_groups' );
$newug = $this->db->tableName(
'user_groups_bogus' );
- wfOut( "user_groups table exists but is in
bogus intermediate format. Renaming to $newug... " );
+ $this->output( "user_groups table exists but is
in bogus intermediate format. Renaming to $newug... " );
$this->db->query( "ALTER TABLE $oldug RENAME TO
$newug", __METHOD__ );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
- wfOut( "Re-adding fresh user_groups table... "
);
+ $this->output( "Re-adding fresh user_groups
table... " );
$this->applyPatch( 'patch-user_groups.sql' );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
- wfOut( "***\n" );
- wfOut( "*** WARNING: You will need to manually
fix up user permissions in the user_groups\n" );
- wfOut( "*** table. Old 1.5 alpha versions did
some pretty funky stuff...\n" );
- wfOut( "***\n" );
+ $this->output( "***\n" );
+ $this->output( "*** WARNING: You will need to
manually fix up user permissions in the user_groups\n" );
+ $this->output( "*** table. Old 1.5 alpha
versions did some pretty funky stuff...\n" );
+ $this->output( "***\n" );
} else {
- wfOut( "...user_groups table exists and is in
current format.\n" );
+ $this->output( "...user_groups table exists and
is in current format.\n" );
}
return;
}
- wfOut( "Adding user_groups table... " );
+ $this->output( "Adding user_groups table... " );
$this->applyPatch( 'patch-user_groups.sql' );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
if ( !$this->db->tableExists( 'user_rights' ) ) {
if ( $this->db->fieldExists( 'user', 'user_rights' ) ) {
- wfOut( "Upgrading from a 1.3 or older database?
Breaking out user_rights for conversion..." );
+ $this->output( "Upgrading from a 1.3 or older
database? Breaking out user_rights for conversion..." );
$this->db->applyPatch( 'patch-user_rights.sql'
);
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
} else {
- wfOut( "*** WARNING: couldn't locate
user_rights table or field for upgrade.\n" );
- wfOut( "*** You may need to manually configure
some sysops by manipulating\n" );
- wfOut( "*** the user_groups table.\n" );
+ $this->output( "*** WARNING: couldn't locate
user_rights table or field for upgrade.\n" );
+ $this->output( "*** You may need to manually
configure some sysops by manipulating\n" );
+ $this->output( "*** the user_groups table.\n" );
return;
}
}
- wfOut( "Converting user_rights table to user_groups... " );
+ $this->output( "Converting user_rights table to user_groups...
" );
$result = $this->db->select( 'user_rights',
array( 'ur_user', 'ur_rights' ),
array( "ur_rights != ''" ),
@@ -592,7 +592,7 @@
__METHOD__ );
}
}
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
/**
@@ -602,13 +602,13 @@
protected function doWatchlistNull() {
$info = $this->db->fieldInfo( 'watchlist',
'wl_notificationtimestamp' );
if ( $info->nullable() ) {
- wfOut( "...wl_notificationtimestamp is already
nullable.\n" );
+ $this->output( "...wl_notificationtimestamp is already
nullable.\n" );
return;
}
- wfOut( "Making wl_notificationtimestamp nullable... " );
+ $this->output( "Making wl_notificationtimestamp nullable... " );
$this->applyPatch( 'patch-watchlist-null.sql' );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
/**
@@ -617,24 +617,24 @@
* @see bug 3946
*/
protected function doPageRandomUpdate() {
- wfOut( "Setting page_random to a random value on rows where it
equals 0..." );
+ $this->output( "Setting page_random to a random value on rows
where it equals 0..." );
$page = $this->db->tableName( 'page' );
$this->db->query( "UPDATE $page SET page_random = RAND() WHERE
page_random = 0", __METHOD__ );
$rows = $this->db->affectedRows();
- wfOut( "changed $rows rows\n" );
+ $this->output( "changed $rows rows\n" );
}
protected function doTemplatelinksUpdate() {
if ( $this->db->tableExists( 'templatelinks' ) ) {
- wfOut( "...templatelinks table already exists\n" );
+ $this->output( "...templatelinks table already
exists\n" );
return;
}
- wfOut( "Creating templatelinks table...\n" );
+ $this->output( "Creating templatelinks table...\n" );
$this->applyPatch( 'patch-templatelinks.sql' );
- wfOut( "Populating...\n" );
+ $this->output( "Populating...\n" );
if ( wfGetLB()->getServerCount() > 1 ) {
// Slow, replication-friendly update
$res = $this->db->select( 'pagelinks', array(
'pl_from', 'pl_namespace', 'pl_title' ),
@@ -666,7 +666,7 @@
), __METHOD__
);
}
- wfOut( "Done. Please run maintenance/refreshLinks.php for a
more thorough templatelinks update.\n" );
+ $this->output( "Done. Please run maintenance/refreshLinks.php
for a more thorough templatelinks update.\n" );
}
protected function doBacklinkingIndicesUpdate() {
@@ -675,7 +675,7 @@
!$this->indexHasField( 'imagelinks', 'il_to', 'il_from'
) )
{
$this->applyPatch( 'patch-backlinkindexes.sql' );
- wfOut( "...backlinking indices updated\n" );
+ $this->output( "...backlinking indices updated\n" );
}
}
@@ -686,16 +686,16 @@
*/
protected function doRestrictionsUpdate() {
if ( $this->db->tableExists( 'page_restrictions' ) ) {
- wfOut( "...page_restrictions table already exists.\n" );
+ $this->output( "...page_restrictions table already
exists.\n" );
return;
}
- wfOut( "Creating page_restrictions table..." );
+ $this->output( "Creating page_restrictions table..." );
$this->applyPatch( 'patch-page_restrictions.sql' );
$this->applyPatch( 'patch-page_restrictions_sortkey.sql' );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
- wfOut( "Migrating old restrictions to new table...\n" );
+ $this->output( "Migrating old restrictions to new table...\n" );
$task = new UpdateRestrictions();
$task->execute();
}
@@ -703,17 +703,17 @@
protected function doCategorylinksIndicesUpdate() {
if ( !$this->indexHasField( 'categorylinks', 'cl_sortkey',
'cl_from' ) ) {
$this->applyPatch( 'patch-categorylinksindex.sql' );
- wfOut( "...categorylinks indices updated\n" );
+ $this->output( "...categorylinks indices updated\n" );
}
}
protected function doCategoryPopulation() {
if ( $this->updateRowExists( 'populate category' ) ) {
- wfOut( "...category table already populated.\n" );
+ $this->output( "...category table already populated.\n"
);
return;
}
- wfOut(
+ $this->output(
"Populating category table, printing progress markers.
" .
"For large databases, you\n" .
"may want to hit Ctrl-C and do this manually with
maintenance/\n" .
@@ -721,12 +721,12 @@
);
$task = new PopulateCategory();
$task->execute();
- wfOut( "Done populating category table.\n" );
+ $this->output( "Done populating category table.\n" );
}
protected function doPopulateParentId() {
if ( $this->updateRowExists( 'populate rev_parent_id' ) ) {
- wfOut( "...rev_parent_id column already populated.\n" );
+ $this->output( "...rev_parent_id column already
populated.\n" );
return;
}
@@ -738,11 +738,11 @@
if ( !$this->db->tableExists( 'profiling' ) ) {
// Simply ignore
} elseif ( $this->db->fieldExists( 'profiling', 'pf_memory' ) )
{
- wfOut( "...profiling table has pf_memory field.\n" );
+ $this->output( "...profiling table has pf_memory
field.\n" );
} else {
- wfOut( "Adding pf_memory field to table profiling..." );
+ $this->output( "Adding pf_memory field to table
profiling..." );
$this->applyPatch( 'patch-profiling-memory.sql' );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
}
@@ -750,47 +750,47 @@
$info = $this->db->indexInfo( 'filearchive',
'fa_user_timestamp', __METHOD__ );
if ( !$info ) {
$this->applyPatch( 'patch-filearchive-user-index.sql' );
- wfOut( "...filearchive indices updated\n" );
+ $this->output( "...filearchive indices updated\n" );
}
}
protected function doUniquePlTlIl() {
$info = $this->db->indexInfo( 'pagelinks', 'pl_namespace' );
if ( is_array( $info ) && !$info[0]->Non_unique ) {
- wfOut( "...pl_namespace, tl_namespace, il_to indices
are already UNIQUE.\n" );
+ $this->output( "...pl_namespace, tl_namespace, il_to
indices are already UNIQUE.\n" );
return;
}
- wfOut( "Making pl_namespace, tl_namespace and il_to indices
UNIQUE... " );
+ $this->output( "Making pl_namespace, tl_namespace and il_to
indices UNIQUE... " );
$this->applyPatch( 'patch-pl-tl-il-unique.sql' );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
protected function renameEuWikiId() {
if ( $this->db->fieldExists( 'external_user', 'eu_local_id' ) )
{
- wfOut( "...eu_wiki_id already renamed to
eu_local_id.\n" );
+ $this->output( "...eu_wiki_id already renamed to
eu_local_id.\n" );
return;
}
- wfOut( "Renaming eu_wiki_id -> eu_local_id... " );
+ $this->output( "Renaming eu_wiki_id -> eu_local_id... " );
$this->applyPatch( 'patch-eu_local_id.sql' );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
protected function doUpdateMimeMinorField() {
if ( $this->updateRowExists( 'mime_minor_length' ) ) {
- wfOut( "...*_mime_minor fields are already long
enough.\n" );
+ $this->output( "...*_mime_minor fields are already long
enough.\n" );
return;
}
- wfOut( "Altering all *_mime_minor fields to 100 bytes in size
... " );
+ $this->output( "Altering all *_mime_minor fields to 100 bytes
in size ... " );
$this->applyPatch( 'patch-mime_minor_length.sql' );
- wfOut( "ok\n" );
+ $this->output( "ok\n" );
}
protected function doPopulateRevLen() {
if ( $this->updateRowExists( 'populate rev_len' ) ) {
- wfOut( "...rev_len column already populated.\n" );
+ $this->output( "...rev_len column already populated.\n"
);
return;
}
@@ -800,12 +800,12 @@
protected function doClFieldsUpdate() {
if ( $this->updateRowExists( 'cl_fields_update' ) ) {
- wfOut( "...categorylinks up-to-date.\n" );
+ $this->output( "...categorylinks up-to-date.\n" );
return;
}
- wfOut( 'Updating categorylinks (again)...' );
+ $this->output( 'Updating categorylinks (again)...' );
$this->applyPatch( 'patch-categorylinks-better-collation2.sql'
);
- wfOut( "done.\n" );
+ $this->output( "done.\n" );
}
}
Modified: trunk/phase3/includes/installer/PostgresUpdater.php
===================================================================
--- trunk/phase3/includes/installer/PostgresUpdater.php 2010-10-01 14:51:03 UTC
(rev 74071)
+++ trunk/phase3/includes/installer/PostgresUpdater.php 2010-10-01 15:11:06 UTC
(rev 74072)
@@ -387,14 +387,14 @@
protected function addSequence( $ns ) {
if ( !$this->db->sequenceExists( $ns ) ) {
- wfOut( "Creating sequence $ns\n" );
+ $this->output( "Creating sequence $ns\n" );
$this->db->query( "CREATE SEQUENCE $ns" );
}
}
protected function renameSequence( $old, $new ) {
if ( $this->db->sequenceExists( $old ) ) {
- wfOut( "Renaming sequence $old to $new\n" );
+ $this->output( "Renaming sequence $old to $new\n" );
$this->db->query( "ALTER SEQUENCE $old RENAME TO $new"
);
}
}
@@ -402,10 +402,10 @@
protected function addPgField( $table, $field, $type ) {
$fi = $this->db->fieldInfo( $table, $field );
if ( !is_null( $fi ) ) {
- wfOut( "... column \"$table.$field\" already exists\n"
);
+ $this->output( "... column \"$table.$field\" already
exists\n" );
return;
} else {
- wfOut( "Adding column \"$table.$field\"\n" );
+ $this->output( "Adding column \"$table.$field\"\n" );
$this->db->query( "ALTER TABLE $table ADD $field $type"
);
}
}
@@ -413,14 +413,14 @@
protected function changeField( $table, $field, $newtype, $default ) {
$fi = $this->db->fieldInfo( $table, $field );
if ( is_null( $fi ) ) {
- wfOut( "... error: expected column $table.$field to
exist\n" );
+ $this->output( "... error: expected column
$table.$field to exist\n" );
exit( 1 );
}
if ( $fi->type() === $newtype )
- wfOut( "... column \"$table.$field\" is already of type
\"$newtype\"\n" );
+ $this->output( "... column \"$table.$field\" is already
of type \"$newtype\"\n" );
else {
- wfOut( "Changing column type of \"$table.$field\" from
\"{$fi->type()}\" to \"$newtype\"\n" );
+ $this->output( "Changing column type of
\"$table.$field\" from \"{$fi->type()}\" to \"$newtype\"\n" );
$sql = "ALTER TABLE $table ALTER $field TYPE $newtype";
if ( strlen( $default ) ) {
$res = array();
@@ -439,43 +439,43 @@
protected function changeNullableField( $table, $field, $null ) {
$fi = $this->db->fieldInfo( $table, $field );
if ( is_null( $fi ) ) {
- wfOut( "... error: expected column $table.$field to
exist\n" );
+ $this->output( "... error: expected column
$table.$field to exist\n" );
exit( 1 );
}
if ( $fi->nullable() ) {
# # It's NULL - does it need to be NOT NULL?
if ( 'NOT NULL' === $null ) {
- wfOut( "Changing \"$table.$field\" to not allow
NULLs\n" );
+ $this->output( "Changing \"$table.$field\" to
not allow NULLs\n" );
$this->db->query( "ALTER TABLE $table ALTER
$field SET NOT NULL" );
} else {
- wfOut( "... column \"$table.$field\" is already
set as NULL\n" );
+ $this->output( "... column \"$table.$field\" is
already set as NULL\n" );
}
} else {
# # It's NOT NULL - does it need to be NULL?
if ( 'NULL' === $null ) {
- wfOut( "Changing \"$table.$field\" to allow
NULLs\n" );
+ $this->output( "Changing \"$table.$field\" to
allow NULLs\n" );
$this->db->query( "ALTER TABLE $table ALTER
$field DROP NOT NULL" );
}
else {
- wfOut( "... column \"$table.$field\" is already
set as NOT NULL\n" );
+ $this->output( "... column \"$table.$field\" is
already set as NOT NULL\n" );
}
}
}
public function addPgIndex( $table, $index, $type ) {
if ( $this->db->indexExists( $table, $index ) ) {
- wfOut( "... index \"$index\" on table \"$table\"
already exists\n" );
+ $this->output( "... index \"$index\" on table
\"$table\" already exists\n" );
} else {
- wfOut( "Creating index \"$index\" on table \"$table\"
$type\n" );
+ $this->output( "Creating index \"$index\" on table
\"$table\" $type\n" );
$this->db->query( "CREATE INDEX $index ON $table $type"
);
}
}
public function addPgExtIndex( $table, $index, $type ) {
if ( $this->db->indexExists( $table, $index ) ) {
- wfOut( "... index \"$index\" on table \"$table\"
already exists\n" );
+ $this->output( "... index \"$index\" on table
\"$table\" already exists\n" );
} else {
- wfOut( "Creating index \"$index\" on table
\"$table\"\n" );
+ $this->output( "Creating index \"$index\" on table
\"$table\"\n" );
if ( preg_match( '/^\(/', $type ) ) {
$this->db->query( "CREATE INDEX $index ON
$table $type" );
} else {
@@ -487,13 +487,13 @@
protected function changeFkeyDeferrable( $table, $field, $clause ) {
$fi = $this->db->fieldInfo( $table, $field );
if ( is_null( $fi ) ) {
- wfOut( "WARNING! Column \"$table.$field\" does not
exist but it should! Please report this.\n" );
+ $this->output( "WARNING! Column \"$table.$field\" does
not exist but it should! Please report this.\n" );
return;
}
if ( $fi->is_deferred() && $fi->is_deferrable() ) {
return;
}
- wfOut( "Altering column \"$table.$field\" to be DEFERRABLE
INITIALLY DEFERRED\n" );
+ $this->output( "Altering column \"$table.$field\" to be
DEFERRABLE INITIALLY DEFERRED\n" );
$conname = $fi->conname();
$command = "ALTER TABLE $table DROP CONSTRAINT $conname";
$this->db->query( $command );
@@ -528,11 +528,11 @@
}
if ( strpos( $search_path, $wgDBmwschema ) === false ) {
- wfOut( "Adding in schema \"$wgDBmwschema\" to
search_path for user \"$wgDBuser\"\n" );
+ $this->output( "Adding in schema \"$wgDBmwschema\" to
search_path for user \"$wgDBuser\"\n" );
$search_path = "$wgDBmwschema, $search_path";
}
if ( strpos( $search_path, $wgDBts2schema ) === false ) {
- wfOut( "Adding in schema \"$wgDBts2schema\" to
search_path for user \"$wgDBuser\"\n" );
+ $this->output( "Adding in schema \"$wgDBts2schema\" to
search_path for user \"$wgDBuser\"\n" );
$search_path = "$search_path, $wgDBts2schema";
}
$search_path = str_replace( ', ,', ',', $search_path );
@@ -541,7 +541,7 @@
$this->db->doQuery( "SET search_path = $search_path" );
} else {
$path = $conf['search_path'];
- wfOut( "... search_path for user \"$wgDBuser\" looks
correct ($path)\n" );
+ $this->output( "... search_path for user \"$wgDBuser\"
looks correct ($path)\n" );
}
$goodconf = array(
@@ -552,46 +552,46 @@
foreach ( $goodconf as $key => $value ) {
if ( !array_key_exists( $key, $conf ) or $conf[$key]
!== $value ) {
- wfOut( "Setting $key to '$value' for user
\"$wgDBuser\"\n" );
+ $this->output( "Setting $key to '$value' for
user \"$wgDBuser\"\n" );
$this->db->doQuery( "ALTER USER $wgDBuser SET
$key = '$value'" );
$this->db->doQuery( "SET $key = '$value'" );
} else {
- wfOut( "... default value of \"$key\" is
correctly set to \"$value\" for user \"$wgDBuser\"\n" );
+ $this->output( "... default value of \"$key\"
is correctly set to \"$value\" for user \"$wgDBuser\"\n" );
}
}
}
protected function convertArchive2() {
if ( $this->db->tableExists( "archive2" ) ) {
- wfOut( "Converting \"archive2\" back to normal archive
table\n" );
+ $this->output( "Converting \"archive2\" back to normal
archive table\n" );
if ( $this->db->ruleExists( 'archive', 'archive_insert'
) ) {
- wfOut( "Dropping rule \"archive_insert\"\n" );
+ $this->output( "Dropping rule
\"archive_insert\"\n" );
$this->db->query( 'DROP RULE archive_insert ON
archive' );
}
if ( $this->db->ruleExists( 'archive', 'archive_delete'
) ) {
- wfOut( "Dropping rule \"archive_delete\"\n" );
+ $this->output( "Dropping rule
\"archive_delete\"\n" );
$this->db->query( 'DROP RULE archive_delete ON
archive' );
}
$this->applyPatch( 'patch-remove-archive2.sql' );
} else {
- wfOut( "... obsolete table \"archive2\" does not
exist\n" );
+ $this->output( "... obsolete table \"archive2\" does
not exist\n" );
}
}
protected function checkOiDeleted() {
if ( $this->db->fieldInfo( 'oldimage', 'oi_deleted' )->type()
!== 'smallint' ) {
- wfOut( "Changing \"oldimage.oi_deleted\" to type
\"smallint\"\n" );
+ $this->output( "Changing \"oldimage.oi_deleted\" to
type \"smallint\"\n" );
$this->db->query( "ALTER TABLE oldimage ALTER
oi_deleted DROP DEFAULT" );
$this->db->query( "ALTER TABLE oldimage ALTER
oi_deleted TYPE SMALLINT USING (oi_deleted::smallint)" );
$this->db->query( "ALTER TABLE oldimage ALTER
oi_deleted SET DEFAULT 0" );
} else {
- wfOut( "... column \"oldimage.oi_deleted\" is already
of type \"smallint\"\n" );
+ $this->output( "... column \"oldimage.oi_deleted\" is
already of type \"smallint\"\n" );
}
}
protected function checkOiNameConstraint() {
if ( $this->db->hasConstraint( "oldimage_oi_name_fkey_cascaded"
) ) {
- wfOut( "... table \"oldimage\" has correct cascading
delete/update foreign key to image\n" );
+ $this->output( "... table \"oldimage\" has correct
cascading delete/update foreign key to image\n" );
} else {
if ( $this->db->hasConstraint( "oldimage_oi_name_fkey"
) ) {
$this->db->query( "ALTER TABLE oldimage DROP
CONSTRAINT oldimage_oi_name_fkey" );
@@ -599,7 +599,7 @@
if ( $this->db->hasConstraint(
"oldimage_oi_name_fkey_cascade" ) ) {
$this->db->query( "ALTER TABLE oldimage DROP
CONSTRAINT oldimage_oi_name_fkey_cascade" );
}
- wfOut( "Making foreign key on table \"oldimage\" (to
image) a cascade delete/update\n" );
+ $this->output( "Making foreign key on table
\"oldimage\" (to image) a cascade delete/update\n" );
$this->db->query( "ALTER TABLE oldimage ADD CONSTRAINT
oldimage_oi_name_fkey_cascaded " .
"FOREIGN KEY (oi_name) REFERENCES
image(img_name) ON DELETE CASCADE ON UPDATE CASCADE" );
}
@@ -607,66 +607,66 @@
protected function checkPageDeletedTrigger() {
if ( !$this->db->triggerExists( 'page', 'page_deleted' ) ) {
- wfOut( "Adding function and trigger \"page_deleted\" to
table \"page\"\n" );
+ $this->output( "Adding function and trigger
\"page_deleted\" to table \"page\"\n" );
$this->applyPatch( 'patch-page_deleted.sql' );
} else {
- wfOut( "... table \"page\" has \"page_deleted\"
trigger\n" );
+ $this->output( "... table \"page\" has \"page_deleted\"
trigger\n" );
}
}
protected function checkRcCurIdNullable(){
$fi = $this->db->fieldInfo( 'recentchanges', 'rc_cur_id' );
if ( !$fi->nullable() ) {
- wfOut( "Removing NOT NULL constraint from
\"recentchanges.rc_cur_id\"\n" );
+ $this->output( "Removing NOT NULL constraint from
\"recentchanges.rc_cur_id\"\n" );
$this->applyPatch( 'patch-rc_cur_id-not-null.sql' );
} else {
- wfOut( "... column \"recentchanges.rc_cur_id\" has a
NOT NULL constraint\n" );
+ $this->output( "... column \"recentchanges.rc_cur_id\"
has a NOT NULL constraint\n" );
}
}
protected function checkPagelinkUniqueIndex() {
$pu = $this->describeIndex( 'pagelink_unique' );
if ( !is_null( $pu ) && ( $pu[0] != 'pl_from' || $pu[1] !=
'pl_namespace' || $pu[2] != 'pl_title' ) ) {
- wfOut( "Dropping obsolete version of index
\"pagelink_unique index\"\n" );
+ $this->output( "Dropping obsolete version of index
\"pagelink_unique index\"\n" );
$this->db->query( 'DROP INDEX pagelink_unique' );
$pu = null;
} else {
- wfOut( "... obsolete version of index \"pagelink_unique
index\" does not exist\n" );
+ $this->output( "... obsolete version of index
\"pagelink_unique index\" does not exist\n" );
}
if ( is_null( $pu ) ) {
- wfOut( "Creating index \"pagelink_unique index\"\n" );
+ $this->output( "Creating index \"pagelink_unique
index\"\n" );
$this->db->query( 'CREATE UNIQUE INDEX pagelink_unique
ON pagelinks (pl_from,pl_namespace,pl_title)' );
} else {
- wfOut( "... index \"pagelink_unique_index\" already
exists\n" );
+ $this->output( "... index \"pagelink_unique_index\"
already exists\n" );
}
}
protected function checkRevUserFkey() {
if ( $this->fkeyDeltype( 'revision_rev_user_fkey' ) == 'r' ) {
- wfOut( "... constraint \"revision_rev_user_fkey\" is ON
DELETE RESTRICT\n" );
+ $this->output( "... constraint
\"revision_rev_user_fkey\" is ON DELETE RESTRICT\n" );
} else {
- wfOut( "Changing constraint \"revision_rev_user_fkey\"
to ON DELETE RESTRICT\n" );
+ $this->output( "Changing constraint
\"revision_rev_user_fkey\" to ON DELETE RESTRICT\n" );
$this->applyPatch( 'patch-revision_rev_user_fkey.sql' );
}
}
protected function checkIpbAdress() {
if ( $this->db->indexExists( 'ipblocks', 'ipb_address' ) ) {
- wfOut( "Removing deprecated index 'ipb_address'...\n" );
+ $this->output( "Removing deprecated index
'ipb_address'...\n" );
$this->db->query( 'DROP INDEX ipb_address' );
}
if ( $this->db->indexExists( 'ipblocks', 'ipb_address_unique' )
) {
- wfOut( "... have ipb_address_unique\n" );
+ $this->output( "... have ipb_address_unique\n" );
} else {
- wfOut( "Adding ipb_address_unique index\n" );
+ $this->output( "Adding ipb_address_unique index\n" );
$this->applyPatch( 'patch-ipb_address_unique.sql' );
}
}
protected function checkIwlPrefix() {
if ( $this->db->indexExists( 'iwlinks', 'iwl_prefix' ) ) {
- wfOut( "Replacing index 'iwl_prefix' with
'iwl_prefix_from_title'...\n" );
+ $this->output( "Replacing index 'iwl_prefix' with
'iwl_prefix_from_title'...\n" );
$this->applyPatch( 'patch-rename-iwl_prefix.sql' );
}
}
Modified: trunk/phase3/includes/installer/SqliteUpdater.php
===================================================================
--- trunk/phase3/includes/installer/SqliteUpdater.php 2010-10-01 14:51:03 UTC
(rev 74071)
+++ trunk/phase3/includes/installer/SqliteUpdater.php 2010-10-01 15:11:06 UTC
(rev 74072)
@@ -57,27 +57,27 @@
protected function sqliteInitialIndexes() {
// initial-indexes.sql fails if the indexes are already
present, so we perform a quick check if our database is newer.
if ( $this->updateRowExists( 'initial_indexes' ) ||
$this->db->indexExists( 'user', 'user_name' ) ) {
- wfOut( "...have initial indexes\n" );
+ $this->output( "...have initial indexes\n" );
return;
}
- wfOut( "Adding initial indexes..." );
+ $this->output( "Adding initial indexes..." );
$this->applyPatch( 'initial-indexes.sql' );
- wfOut( "done\n" );
+ $this->output( "done\n" );
}
protected function sqliteSetupSearchindex() {
$module = $this->db->getFulltextSearchModule();
$fts3tTable = $this->updateRowExists( 'fts3' );
if ( $fts3tTable && !$module ) {
- wfOut( '...PHP is missing FTS3 support, downgrading
tables...' );
+ $this->output( '...PHP is missing FTS3 support,
downgrading tables...' );
$this->applyPatch( 'searchindex-no-fts.sql' );
- wfOut( "done\n" );
+ $this->output( "done\n" );
} elseif ( !$fts3tTable && $module == 'FTS3' ) {
- wfOut( '...adding FTS3 search capabilities...' );
+ $this->output( '...adding FTS3 search capabilities...'
);
$this->applyPatch( 'searchindex-fts3.sql' );
- wfOut( "done\n" );
+ $this->output( "done\n" );
} else {
- wfOut( "...fulltext search table appears to be in
order.\n" );
+ $this->output( "...fulltext search table appears to be
in order.\n" );
}
}
}
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
