| Index: trunk/phase3/includes/installer/DatabaseUpdater.php |
| — | — | @@ -453,7 +453,7 @@ |
| 454 | 454 | } else { |
| 455 | 455 | $this->output( "Adding $index key to table $table... " ); |
| 456 | 456 | $this->applyPatch( $patch, $fullpath ); |
| 457 | | - $this->output( "done.\n" ); |
| | 457 | + $this->output( "ok\n" ); |
| 458 | 458 | } |
| 459 | 459 | } |
| 460 | 460 | |
| — | — | @@ -469,7 +469,7 @@ |
| 470 | 470 | if ( $this->db->fieldExists( $table, $field, __METHOD__ ) ) { |
| 471 | 471 | $this->output( "Table $table contains $field field. Dropping... " ); |
| 472 | 472 | $this->applyPatch( $patch, $fullpath ); |
| 473 | | - $this->output( "done.\n" ); |
| | 473 | + $this->output( "ok\n" ); |
| 474 | 474 | } else { |
| 475 | 475 | $this->output( "...$table table does not contain $field field.\n" ); |
| 476 | 476 | } |
| — | — | @@ -487,7 +487,7 @@ |
| 488 | 488 | if ( $this->db->indexExists( $table, $index, __METHOD__ ) ) { |
| 489 | 489 | $this->output( "Dropping $index key from table $table... " ); |
| 490 | 490 | $this->applyPatch( $patch, $fullpath ); |
| 491 | | - $this->output( "done.\n" ); |
| | 491 | + $this->output( "ok\n" ); |
| 492 | 492 | } else { |
| 493 | 493 | $this->output( "...$index key doesn't exist.\n" ); |
| 494 | 494 | } |
| — | — | @@ -502,7 +502,7 @@ |
| 503 | 503 | if ( $this->db->tableExists( $table, __METHOD__ ) ) { |
| 504 | 504 | $this->output( "Dropping table $table... " ); |
| 505 | 505 | $this->applyPatch( $patch, $fullpath ); |
| 506 | | - $this->output( "done.\n" ); |
| | 506 | + $this->output( "ok\n" ); |
| 507 | 507 | } else { |
| 508 | 508 | $this->output( "...$table doesn't exist.\n" ); |
| 509 | 509 | } |
| — | — | @@ -528,7 +528,7 @@ |
| 529 | 529 | $this->output( "Modifying $field field of table $table..." ); |
| 530 | 530 | $this->applyPatch( $patch, $fullpath ); |
| 531 | 531 | $this->insertUpdateRow( $updateKey ); |
| 532 | | - $this->output( "done.\n" ); |
| | 532 | + $this->output( "ok\n" ); |
| 533 | 533 | } |
| 534 | 534 | } |
| 535 | 535 | |
| — | — | @@ -588,7 +588,7 @@ |
| 589 | 589 | $this->output( |
| 590 | 590 | "Populating log_user_text field, printing progress markers. For large\n" . |
| 591 | 591 | "databases, you may want to hit Ctrl-C and do this manually with\n" . |
| 592 | | - "maintenance/populateLogUsertext.php..." ); |
| | 592 | + "maintenance/populateLogUsertext.php.\n" ); |
| 593 | 593 | |
| 594 | 594 | $task = $this->maintenance->runChild( 'PopulateLogUsertext' ); |
| 595 | 595 | $task->execute(); |
| — | — | @@ -616,12 +616,12 @@ |
| 617 | 617 | * Updates the timestamps in the transcache table |
| 618 | 618 | */ |
| 619 | 619 | protected function doUpdateTranscacheField() { |
| 620 | | - $this->output( "Converting tc_time from UNIX epoch to MediaWiki timestamp... " ); |
| 621 | 620 | if ( $this->updateRowExists( 'convert transcache field' ) ) { |
| 622 | 621 | $this->output( "...transcache tc_time already converted.\n" ); |
| 623 | 622 | return; |
| 624 | 623 | } |
| 625 | 624 | |
| | 625 | + $this->output( "Converting tc_time from UNIX epoch to MediaWiki timestamp... " ); |
| 626 | 626 | $this->applyPatch( 'patch-tc-timestamp.sql' ); |
| 627 | 627 | $this->output( "done.\n" ); |
| 628 | 628 | } |
| — | — | @@ -630,7 +630,6 @@ |
| 631 | 631 | * Update CategoryLinks collation |
| 632 | 632 | */ |
| 633 | 633 | protected function doCollationUpdate() { |
| 634 | | - $this->output( "Updating category collations..." ); |
| 635 | 634 | global $wgCategoryCollation; |
| 636 | 635 | if ( $this->db->selectField( |
| 637 | 636 | 'categorylinks', |
| — | — | @@ -642,6 +641,7 @@ |
| 643 | 642 | return; |
| 644 | 643 | } |
| 645 | 644 | |
| | 645 | + $this->output( "Updating category collations..." ); |
| 646 | 646 | $task = $this->maintenance->runChild( 'UpdateCollation' ); |
| 647 | 647 | $task->execute(); |
| 648 | 648 | $this->output( "...done.\n" ); |
| Index: trunk/phase3/includes/installer/MysqlUpdater.php |
| — | — | @@ -203,7 +203,6 @@ |
| 204 | 204 | * @param $patchFile String: path to the patch to correct the field |
| 205 | 205 | */ |
| 206 | 206 | protected function checkBin( $table, $field, $patchFile ) { |
| 207 | | - $this->output( "Fixing $field encoding on $table table... " ); |
| 208 | 207 | $tableName = $this->db->tableName( $table ); |
| 209 | 208 | $res = $this->db->query( "SELECT $field FROM $tableName LIMIT 0", __METHOD__ ); |
| 210 | 209 | $flags = explode( ' ', mysql_field_flags( $res->result, 0 ) ); |
| — | — | @@ -211,6 +210,7 @@ |
| 212 | 211 | if ( in_array( 'binary', $flags ) ) { |
| 213 | 212 | $this->output( "...$table table has correct $field encoding.\n" ); |
| 214 | 213 | } else { |
| | 214 | + $this->output( "Fixing $field encoding on $table table... " ); |
| 215 | 215 | $this->applyPatch( $patchFile ); |
| 216 | 216 | $this->output( "done.\n" ); |
| 217 | 217 | } |
| — | — | @@ -225,7 +225,6 @@ |
| 226 | 226 | * @return Boolean |
| 227 | 227 | */ |
| 228 | 228 | protected function indexHasField( $table, $index, $field ) { |
| 229 | | - $this->output( "Checking whether the $index index on the $table table has the $field field..." ); |
| 230 | 229 | $info = $this->db->indexInfo( $table, $index, __METHOD__ ); |
| 231 | 230 | if ( $info ) { |
| 232 | 231 | foreach ( $info as $row ) { |
| — | — | @@ -244,12 +243,13 @@ |
| 245 | 244 | */ |
| 246 | 245 | protected function doInterwikiUpdate() { |
| 247 | 246 | global $IP; |
| 248 | | - $this->output( 'Creating interwiki table...' ); |
| | 247 | + |
| 249 | 248 | if ( $this->db->tableExists( "interwiki", __METHOD__ ) ) { |
| 250 | 249 | $this->output( "...already have interwiki table\n" ); |
| 251 | 250 | return; |
| 252 | 251 | } |
| 253 | 252 | |
| | 253 | + $this->output( 'Creating interwiki table...' ); |
| 254 | 254 | $this->applyPatch( 'patch-interwiki.sql' ); |
| 255 | 255 | $this->output( "done.\n" ); |
| 256 | 256 | $this->output( 'Adding default interwiki definitions...' ); |
| — | — | @@ -261,7 +261,6 @@ |
| 262 | 262 | * Check that proper indexes are in place |
| 263 | 263 | */ |
| 264 | 264 | protected function doIndexUpdate() { |
| 265 | | - $this->output( "Updating indexes to 20031107..." ); |
| 266 | 265 | $meta = $this->db->fieldInfo( 'recentchanges', 'rc_timestamp' ); |
| 267 | 266 | if ( $meta === false ) { |
| 268 | 267 | throw new MWException( 'Missing rc_timestamp field of recentchanges table. Should not happen.' ); |
| — | — | @@ -271,6 +270,7 @@ |
| 272 | 271 | return; |
| 273 | 272 | } |
| 274 | 273 | |
| | 274 | + $this->output( "Updating indexes to 20031107..." ); |
| 275 | 275 | $this->applyPatch( 'patch-indexes.sql', true ); |
| 276 | 276 | $this->output( "done.\n" ); |
| 277 | 277 | } |
| — | — | @@ -281,14 +281,14 @@ |
| 282 | 282 | } |
| 283 | 283 | |
| 284 | 284 | protected function doFixAncientImagelinks() { |
| 285 | | - $this->output( "Fixing ancient broken imagelinks table..." ); |
| 286 | 285 | $info = $this->db->fieldInfo( 'imagelinks', 'il_from' ); |
| 287 | 286 | if ( !$info || $info->type() !== 'string' ) { |
| 288 | 287 | $this->output( "...il_from OK\n" ); |
| 289 | 288 | return; |
| 290 | 289 | } |
| 291 | 290 | |
| 292 | | - $this->output( "\nNOTE: you will have to run maintenance/refreshLinks.php after this..." ); |
| | 291 | + $this->output( "Fixing ancient broken imagelinks table.\n" ); |
| | 292 | + $this->output( "NOTE: you will have to run maintenance/refreshLinks.php after this.\n" ); |
| 293 | 293 | $this->applyPatch( 'patch-fix-il_from.sql' ); |
| 294 | 294 | $this->output( "done.\n" ); |
| 295 | 295 | } |
| — | — | @@ -297,14 +297,14 @@ |
| 298 | 298 | * Check if we need to add talk page rows to the watchlist |
| 299 | 299 | */ |
| 300 | 300 | function doWatchlistUpdate() { |
| 301 | | - $this->output( "Adding missing watchlist talk page rows... " ); |
| 302 | 301 | $talk = $this->db->selectField( 'watchlist', 'count(*)', 'wl_namespace & 1', __METHOD__ ); |
| 303 | 302 | $nontalk = $this->db->selectField( 'watchlist', 'count(*)', 'NOT (wl_namespace & 1)', __METHOD__ ); |
| 304 | 303 | if ( $talk == $nontalk ) { |
| 305 | | - $this->output( "watchlist talk page rows already present.\n" ); |
| | 304 | + $this->output( "...watchlist talk page rows already present.\n" ); |
| 306 | 305 | return; |
| 307 | 306 | } |
| 308 | 307 | |
| | 308 | + $this->output( "Adding missing watchlist talk page rows... " ); |
| 309 | 309 | $this->db->insertSelect( 'watchlist', 'watchlist', |
| 310 | 310 | array( |
| 311 | 311 | 'wl_user' => 'wl_user', |
| — | — | @@ -507,12 +507,12 @@ |
| 508 | 508 | } |
| 509 | 509 | |
| 510 | 510 | protected function doPagelinksUpdate() { |
| 511 | | - $this->output( "Converting links and brokenlinks tables to pagelinks... " ); |
| 512 | 511 | if ( $this->db->tableExists( 'pagelinks', __METHOD__ ) ) { |
| 513 | 512 | $this->output( "...already have pagelinks table.\n" ); |
| 514 | 513 | return; |
| 515 | 514 | } |
| 516 | 515 | |
| | 516 | + $this->output( "Converting links and brokenlinks tables to pagelinks... " ); |
| 517 | 517 | $this->applyPatch( 'patch-pagelinks.sql' ); |
| 518 | 518 | $this->output( "done.\n" ); |
| 519 | 519 | |
| — | — | @@ -541,16 +541,16 @@ |
| 542 | 542 | } |
| 543 | 543 | |
| 544 | 544 | protected function doUserUniqueUpdate() { |
| 545 | | - $this->output( "Adding unique index on user_name... " ); |
| 546 | 545 | $duper = new UserDupes( $this->db, array( $this, 'output' ) ); |
| 547 | 546 | if ( $duper->hasUniqueIndex() ) { |
| 548 | | - $this->output( "already had unique user_name index.\n" ); |
| | 547 | + $this->output( "...already have unique user_name index.\n" ); |
| 549 | 548 | return; |
| 550 | 549 | } |
| 551 | 550 | |
| 552 | 551 | if ( !$duper->clearDupes() ) { |
| 553 | 552 | $this->output( "WARNING: This next step will probably fail due to unfixed duplicates...\n" ); |
| 554 | 553 | } |
| | 554 | + $this->output( "Adding unique index on user_name... " ); |
| 555 | 555 | $this->applyPatch( 'patch-user_nameindex.sql' ); |
| 556 | 556 | $this->output( "done.\n" ); |
| 557 | 557 | } |
| — | — | @@ -581,13 +581,13 @@ |
| 582 | 582 | |
| 583 | 583 | $this->output( "Adding user_groups table... " ); |
| 584 | 584 | $this->applyPatch( 'patch-user_groups.sql' ); |
| 585 | | - $this->output( "ok.\n" ); |
| | 585 | + $this->output( "done.\n" ); |
| 586 | 586 | |
| 587 | 587 | if ( !$this->db->tableExists( 'user_rights', __METHOD__ ) ) { |
| 588 | 588 | if ( $this->db->fieldExists( 'user', 'user_rights', __METHOD__ ) ) { |
| 589 | 589 | $this->output( "Upgrading from a 1.3 or older database? Breaking out user_rights for conversion..." ); |
| 590 | | - $this->applyPatch( 'patch-user_rights.sql' ); |
| 591 | | - $this->output( "ok.\n" ); |
| | 590 | + $this->db->applyPatch( 'patch-user_rights.sql' ); |
| | 591 | + $this->output( done.\n" ); |
| 592 | 592 | } else { |
| 593 | 593 | $this->output( "*** WARNING: couldn't locate user_rights table or field for upgrade.\n" ); |
| 594 | 594 | $this->output( "*** You may need to manually configure some sysops by manipulating\n" ); |
| — | — | @@ -623,13 +623,13 @@ |
| 624 | 624 | * and update old broken items. |
| 625 | 625 | */ |
| 626 | 626 | protected function doWatchlistNull() { |
| 627 | | - $this->output( "Making wl_notificationtimestamp nullable... " ); |
| 628 | 627 | $info = $this->db->fieldInfo( 'watchlist', 'wl_notificationtimestamp' ); |
| 629 | 628 | if ( $info->isNullable() ) { |
| 630 | | - $this->output( "wl_notificationtimestamp is already nullable.\n" ); |
| | 629 | + $this->output( "...wl_notificationtimestamp is already nullable.\n" ); |
| 631 | 630 | return; |
| 632 | 631 | } |
| 633 | 632 | |
| | 633 | + $this->output( "Making wl_notificationtimestamp nullable... " ); |
| 634 | 634 | $this->applyPatch( 'patch-watchlist-null.sql' ); |
| 635 | 635 | $this->output( "done.\n" ); |
| 636 | 636 | } |
| — | — | @@ -640,27 +640,26 @@ |
| 641 | 641 | * @see bug 3946 |
| 642 | 642 | */ |
| 643 | 643 | protected function doPageRandomUpdate() { |
| 644 | | - $this->output( 'Set page_random to a random value...' ); |
| 645 | 644 | $page = $this->db->tableName( 'page' ); |
| 646 | 645 | $this->db->query( "UPDATE $page SET page_random = RAND() WHERE page_random = 0", __METHOD__ ); |
| 647 | 646 | $rows = $this->db->affectedRows(); |
| 648 | 647 | |
| 649 | 648 | if( $rows ) { |
| 650 | | - $this->output( " set on $rows rows where it was 0.\n" ); |
| | 649 | + $this->output( "Set page_random to a random value on $rows rows where it was set to 0\n" ); |
| 651 | 650 | } else { |
| 652 | | - $this->output( "not needed.\n" ); |
| | 651 | + $this->output( "...no page_random rows needed to be set\n" ); |
| 653 | 652 | } |
| 654 | 653 | } |
| 655 | 654 | |
| 656 | 655 | protected function doTemplatelinksUpdate() { |
| 657 | | - $this->output( "Creating templatelinks table...\n" ); |
| 658 | 656 | if ( $this->db->tableExists( 'templatelinks', __METHOD__ ) ) { |
| 659 | | - $this->output( "templatelinks table already exists.\n" ); |
| | 657 | + $this->output( "...templatelinks table already exists\n" ); |
| 660 | 658 | return; |
| 661 | 659 | } |
| 662 | 660 | |
| | 661 | + $this->output( "Creating templatelinks table...\n" ); |
| 663 | 662 | $this->applyPatch( 'patch-templatelinks.sql' ); |
| 664 | | - $this->output( "Populating templatelinks...\n" ); |
| | 663 | + $this->output( "Populating...\n" ); |
| 665 | 664 | if ( wfGetLB()->getServerCount() > 1 ) { |
| 666 | 665 | // Slow, replication-friendly update |
| 667 | 666 | $res = $this->db->select( 'pagelinks', array( 'pl_from', 'pl_namespace', 'pl_title' ), |
| — | — | @@ -696,15 +695,12 @@ |
| 697 | 696 | } |
| 698 | 697 | |
| 699 | 698 | protected function doBacklinkingIndicesUpdate() { |
| 700 | | - $this->output( 'Updating backlinking indexes...' ); |
| 701 | 699 | if ( !$this->indexHasField( 'pagelinks', 'pl_namespace', 'pl_from' ) || |
| 702 | 700 | !$this->indexHasField( 'templatelinks', 'tl_namespace', 'tl_from' ) || |
| 703 | 701 | !$this->indexHasField( 'imagelinks', 'il_to', 'il_from' ) ) |
| 704 | 702 | { |
| 705 | 703 | $this->applyPatch( 'patch-backlinkindexes.sql' ); |
| 706 | | - $this->output( "done\n" ); |
| 707 | | - } else { |
| 708 | | - $this->output( "already done.\n" ); |
| | 704 | + $this->output( "...backlinking indices updated\n" ); |
| 709 | 705 | } |
| 710 | 706 | } |
| 711 | 707 | |
| — | — | @@ -714,47 +710,43 @@ |
| 715 | 711 | * -- Andrew Garrett, January 2007. |
| 716 | 712 | */ |
| 717 | 713 | protected function doRestrictionsUpdate() { |
| 718 | | - $this->output( "Creating page_restrictions table..." ); |
| 719 | 714 | if ( $this->db->tableExists( 'page_restrictions', __METHOD__ ) ) { |
| 720 | 715 | $this->output( "...page_restrictions table already exists.\n" ); |
| 721 | 716 | return; |
| 722 | 717 | } |
| 723 | 718 | |
| | 719 | + $this->output( "Creating page_restrictions table..." ); |
| 724 | 720 | $this->applyPatch( 'patch-page_restrictions.sql' ); |
| 725 | 721 | $this->applyPatch( 'patch-page_restrictions_sortkey.sql' ); |
| 726 | 722 | $this->output( "done.\n" ); |
| 727 | 723 | |
| 728 | | - $this->output( "Migrating old restrictions to new table..." ); |
| | 724 | + $this->output( "Migrating old restrictions to new table...\n" ); |
| 729 | 725 | $task = $this->maintenance->runChild( 'UpdateRestrictions' ); |
| 730 | 726 | $task->execute(); |
| 731 | | - $this->output( "done.\n" ); |
| 732 | 727 | } |
| 733 | 728 | |
| 734 | 729 | protected function doCategorylinksIndicesUpdate() { |
| 735 | | - $this->output( 'Updating categorylinks indexes...' ); |
| 736 | 730 | if ( !$this->indexHasField( 'categorylinks', 'cl_sortkey', 'cl_from' ) ) { |
| 737 | 731 | $this->applyPatch( 'patch-categorylinksindex.sql' ); |
| 738 | | - $this->output( "done.\n" ); |
| 739 | | - } else { |
| 740 | | - $this->output( "already done.\n" ); |
| | 732 | + $this->output( "...categorylinks indices updated\n" ); |
| 741 | 733 | } |
| 742 | 734 | } |
| 743 | 735 | |
| 744 | 736 | protected function doCategoryPopulation() { |
| 745 | | - $this->output( |
| 746 | | - "Populating category table, printing progress markers. " . |
| 747 | | - "For large databases, you\n" . |
| 748 | | - "may want to hit Ctrl-C and do this manually with maintenance/\n" . |
| 749 | | - "populateCategory.php..." |
| 750 | | - ); |
| 751 | 737 | if ( $this->updateRowExists( 'populate category' ) ) { |
| 752 | 738 | $this->output( "...category table already populated.\n" ); |
| 753 | 739 | return; |
| 754 | 740 | } |
| 755 | 741 | |
| | 742 | + $this->output( |
| | 743 | + "Populating category table, printing progress markers. " . |
| | 744 | + "For large databases, you\n" . |
| | 745 | + "may want to hit Ctrl-C and do this manually with maintenance/\n" . |
| | 746 | + "populateCategory.php.\n" |
| | 747 | + ); |
| 756 | 748 | $task = $this->maintenance->runChild( 'PopulateCategory' ); |
| 757 | 749 | $task->execute(); |
| 758 | | - $this->output( "done.\n" ); |
| | 750 | + $this->output( "Done populating category table.\n" ); |
| 759 | 751 | } |
| 760 | 752 | |
| 761 | 753 | protected function doPopulateParentId() { |
| — | — | @@ -762,21 +754,20 @@ |
| 763 | 755 | $this->output( |
| 764 | 756 | "Populating rev_parent_id fields, printing progress markers. For large\n" . |
| 765 | 757 | "databases, you may want to hit Ctrl-C and do this manually with\n" . |
| 766 | | - "maintenance/populateParentId.php..." ); |
| | 758 | + "maintenance/populateParentId.php.\n" ); |
| 767 | 759 | |
| 768 | 760 | $task = $this->maintenance->runChild( 'PopulateParentId' ); |
| 769 | 761 | $task->execute(); |
| 770 | | - $this->output( "done.\n" ); |
| 771 | 762 | } |
| 772 | 763 | } |
| 773 | 764 | |
| 774 | 765 | protected function doMaybeProfilingMemoryUpdate() { |
| 775 | | - $this->output( "Adding pf_memory field to table profiling..." ); |
| 776 | 766 | if ( !$this->db->tableExists( 'profiling', __METHOD__ ) ) { |
| 777 | 767 | // Simply ignore |
| 778 | 768 | } elseif ( $this->db->fieldExists( 'profiling', 'pf_memory', __METHOD__ ) ) { |
| 779 | 769 | $this->output( "...profiling table has pf_memory field.\n" ); |
| 780 | 770 | } else { |
| | 771 | + $this->output( "Adding pf_memory field to table profiling..." ); |
| 781 | 772 | $this->applyPatch( 'patch-profiling-memory.sql' ); |
| 782 | 773 | $this->output( "done.\n" ); |
| 783 | 774 | } |
| — | — | @@ -792,57 +783,57 @@ |
| 793 | 784 | } |
| 794 | 785 | |
| 795 | 786 | protected function doUniquePlTlIl() { |
| 796 | | - $this->output( "Making pl_namespace, tl_namespace and il_to indices UNIQUE... " ); |
| 797 | 787 | $info = $this->db->indexInfo( 'pagelinks', 'pl_namespace' ); |
| 798 | 788 | if ( is_array( $info ) && !$info[0]->Non_unique ) { |
| 799 | 789 | $this->output( "...pl_namespace, tl_namespace, il_to indices are already UNIQUE.\n" ); |
| 800 | 790 | return; |
| 801 | 791 | } |
| 802 | 792 | |
| | 793 | + $this->output( "Making pl_namespace, tl_namespace and il_to indices UNIQUE... " ); |
| 803 | 794 | $this->applyPatch( 'patch-pl-tl-il-unique.sql' ); |
| 804 | 795 | $this->output( "done.\n" ); |
| 805 | 796 | } |
| 806 | 797 | |
| 807 | 798 | protected function renameEuWikiId() { |
| 808 | | - $this->output( "Renaming eu_wiki_id -> eu_local_id... " ); |
| 809 | 799 | if ( $this->db->fieldExists( 'external_user', 'eu_local_id', __METHOD__ ) ) { |
| 810 | 800 | $this->output( "...eu_wiki_id already renamed to eu_local_id.\n" ); |
| 811 | 801 | return; |
| 812 | 802 | } |
| 813 | 803 | |
| | 804 | + $this->output( "Renaming eu_wiki_id -> eu_local_id... " ); |
| 814 | 805 | $this->applyPatch( 'patch-eu_local_id.sql' ); |
| 815 | 806 | $this->output( "done.\n" ); |
| 816 | 807 | } |
| 817 | 808 | |
| 818 | 809 | protected function doUpdateMimeMinorField() { |
| 819 | | - $this->output( "Altering all *_mime_minor fields to 100 bytes in size ... " ); |
| 820 | 810 | if ( $this->updateRowExists( 'mime_minor_length' ) ) { |
| 821 | 811 | $this->output( "...*_mime_minor fields are already long enough.\n" ); |
| 822 | 812 | return; |
| 823 | 813 | } |
| 824 | 814 | |
| | 815 | + $this->output( "Altering all *_mime_minor fields to 100 bytes in size ... " ); |
| 825 | 816 | $this->applyPatch( 'patch-mime_minor_length.sql' ); |
| 826 | 817 | $this->output( "done.\n" ); |
| 827 | 818 | } |
| 828 | 819 | |
| 829 | 820 | protected function doClFieldsUpdate() { |
| 830 | | - $this->output( 'Updating categorylinks (again)...' ); |
| 831 | 821 | if ( $this->updateRowExists( 'cl_fields_update' ) ) { |
| 832 | 822 | $this->output( "...categorylinks up-to-date.\n" ); |
| 833 | 823 | return; |
| 834 | 824 | } |
| 835 | 825 | |
| | 826 | + $this->output( 'Updating categorylinks (again)...' ); |
| 836 | 827 | $this->applyPatch( 'patch-categorylinks-better-collation2.sql' ); |
| 837 | 828 | $this->output( "done.\n" ); |
| 838 | 829 | } |
| 839 | 830 | |
| 840 | 831 | protected function doLangLinksLengthUpdate() { |
| 841 | | - $this->output( 'Updating length of ll_lang in langlinks...' ); |
| 842 | 832 | $langlinks = $this->db->tableName( 'langlinks' ); |
| 843 | 833 | $res = $this->db->query( "SHOW COLUMNS FROM $langlinks LIKE 'll_lang'" ); |
| 844 | 834 | $row = $this->db->fetchObject( $res ); |
| 845 | 835 | |
| 846 | 836 | if ( $row && $row->Type == "varbinary(10)" ) { |
| | 837 | + $this->output( 'Updating length of ll_lang in langlinks...' ); |
| 847 | 838 | $this->applyPatch( 'patch-langlinks-ll_lang-20.sql' ); |
| 848 | 839 | $this->output( "done.\n" ); |
| 849 | 840 | } else { |
| — | — | @@ -851,13 +842,13 @@ |
| 852 | 843 | } |
| 853 | 844 | |
| 854 | 845 | protected function doUserNewTalkTimestampNotNull() { |
| 855 | | - $this->output( "Making user_last_timestamp nullable... " ); |
| 856 | 846 | $info = $this->db->fieldInfo( 'user_newtalk', 'user_last_timestamp' ); |
| 857 | 847 | if ( $info->isNullable() ) { |
| 858 | 848 | $this->output( "...user_last_timestamp is already nullable.\n" ); |
| 859 | 849 | return; |
| 860 | 850 | } |
| 861 | 851 | |
| | 852 | + $this->output( "Making user_last_timestamp nullable... " ); |
| 862 | 853 | $this->applyPatch( 'patch-user-newtalk-timestamp-null.sql' ); |
| 863 | 854 | $this->output( "done.\n" ); |
| 864 | 855 | } |