| Index: trunk/phase3/includes/installer/MysqlUpdater.php |
| — | — | @@ -175,7 +175,6 @@ |
| 176 | 176 | array( 'dropIndex', 'archive', 'ar_page_revid', 'patch-archive_kill_ar_page_revid.sql' ), |
| 177 | 177 | array( 'addIndex', 'archive', 'ar_revid', 'patch-archive_ar_revid.sql' ), |
| 178 | 178 | array( 'doLangLinksLengthUpdate' ), |
| 179 | | - array( 'doClTypeVarcharUpdate' ), |
| 180 | 179 | |
| 181 | 180 | // 1.18 |
| 182 | 181 | array( 'doUserNewTalkTimestampNotNull' ), |
| — | — | @@ -833,20 +832,6 @@ |
| 834 | 833 | $this->output( "...ll_lang is up-to-date.\n" ); |
| 835 | 834 | } |
| 836 | 835 | } |
| 837 | | - |
| 838 | | - protected function doClTypeVarcharUpdate() { |
| 839 | | - $categorylinks = $this->db->tableName( 'categorylinks' ); |
| 840 | | - $res = $this->db->query( "SHOW COLUMNS FROM $categorylinks LIKE 'cl_type'" ); |
| 841 | | - $row = $this->db->fetchObject( $res ); |
| 842 | | - |
| 843 | | - if ( $row && substr( $row->Type, 0, 4 ) == 'enum' ) { |
| 844 | | - $this->output( 'Changing cl_type from enum to varchar...' ); |
| 845 | | - $this->applyPatch( 'patch-cl_type.sql' ); |
| 846 | | - $this->output( "done.\n" ); |
| 847 | | - } else { |
| 848 | | - $this->output( "...cl_type is up-to-date.\n" ); |
| 849 | | - } |
| 850 | | - } |
| 851 | 836 | |
| 852 | 837 | protected function doUserNewTalkTimestampNotNull() { |
| 853 | 838 | $info = $this->db->fieldInfo( 'user_newtalk', 'user_last_timestamp' ); |
| Index: trunk/phase3/maintenance/tables.sql |
| — | — | @@ -521,9 +521,7 @@ |
| 522 | 522 | -- paginate the three categories separately. This never has to be updated |
| 523 | 523 | -- after the page is created, since none of these page types can be moved to |
| 524 | 524 | -- any other. |
| 525 | | - -- This used to be ENUM('page', 'subcat', 'file') but was changed to a |
| 526 | | - -- varchar because of the weird semantics of < and > when used on enums |
| 527 | | - cl_type varchar(6) NOT NULL default 'page' |
| | 525 | + cl_type ENUM('page', 'subcat', 'file') NOT NULL default 'page' |
| 528 | 526 | ) /*$wgDBTableOptions*/; |
| 529 | 527 | |
| 530 | 528 | CREATE UNIQUE INDEX /*i*/cl_from ON /*_*/categorylinks (cl_from,cl_to); |
| Index: trunk/phase3/maintenance/archives/patch-cl_type.sql |
| — | — | @@ -1,6 +0,0 @@ |
| 2 | | - |
| 3 | | -ALTER TABLE /*_*/categorylinks MODIFY cl_type varchar(6) NOT NULL default 'page'; |