| Index: trunk/phpwiki/fpw/wikipedia.sql |
| — | — | @@ -24,9 +24,8 @@ |
| 25 | 25 | cur_unlinked_links mediumtext, |
| 26 | 26 | cur_counter bigint(20) unsigned default '0', |
| 27 | 27 | cur_cache mediumtext, |
| 28 | | - UNIQUE KEY cur_id (cur_id), |
| 29 | 28 | UNIQUE KEY cur_title (cur_title), |
| 30 | | - KEY cur_id_2 (cur_id), |
| | 29 | + UNIQUE KEY cur_id (cur_id), |
| 31 | 30 | KEY timeind (cur_timestamp) |
| 32 | 31 | ) TYPE=ISAM PACK_KEYS=1; |
| 33 | 32 | |
| — | — | @@ -36,7 +35,7 @@ |
| 37 | 36 | |
| 38 | 37 | CREATE TABLE old ( |
| 39 | 38 | old_id mediumint(8) unsigned NOT NULL auto_increment, |
| 40 | | - old_title varchar(255) binary default NULL, |
| | 39 | + old_title varchar(255) binary NOT NULL default '', |
| 41 | 40 | old_text mediumtext, |
| 42 | 41 | old_comment tinyblob, |
| 43 | 42 | old_user mediumint(8) unsigned default '0', |
| — | — | @@ -44,10 +43,9 @@ |
| 45 | 44 | old_old_version mediumint(8) unsigned default '0', |
| 46 | 45 | old_timestamp timestamp(14) NOT NULL, |
| 47 | 46 | old_minor_edit tinyint(1) default '0', |
| 48 | | - PRIMARY KEY (old_id), |
| 49 | 47 | UNIQUE KEY old_id (old_id), |
| 50 | | - KEY old_id_2 (old_id), |
| 51 | | - KEY timeind (old_timestamp) |
| | 48 | + KEY timeind (old_timestamp), |
| | 49 | + KEY old_title (old_title) |
| 52 | 50 | ) TYPE=ISAM PACK_KEYS=1; |
| 53 | 51 | |
| 54 | 52 | # |
| — | — | @@ -62,8 +60,6 @@ |
| 63 | 61 | user_email tinytext, |
| 64 | 62 | user_options mediumtext, |
| 65 | 63 | user_watch mediumtext, |
| 66 | | - PRIMARY KEY (user_id), |
| 67 | | - UNIQUE KEY user_id (user_id), |
| 68 | | - KEY user_id_2 (user_id) |
| | 64 | + UNIQUE KEY user_id (user_id) |
| 69 | 65 | ) TYPE=ISAM PACK_KEYS=1; |
| 70 | 66 | |
| Index: trunk/phpwiki/fpw/updSchema.sql |
| — | — | @@ -1,18 +1,23 @@ |
| 2 | 2 | # This code adapts older versions of the database. |
| 3 | 3 | # It adapts the table definitions adds indexes and, if necessary, |
| 4 | | -# fills new columns with appropriate values. |
| | 4 | +# fills new columns with appropriate values. Uncomment |
| | 5 | +# the command that you still need to run to bring |
| | 6 | +# your database scheme up-to-date. |
| 5 | 7 | |
| 6 | 8 | # adding the indexes on the timestamps |
| 7 | 9 | |
| 8 | | -ALTER TABLE cur ADD INDEX timeind (cur_timestamp); |
| 9 | | -ALTER TABLE old ADD INDEX timeind (old_timestamp); |
| | 10 | +# ALTER TABLE cur ADD INDEX timeind (cur_timestamp); |
| | 11 | +# ALTER TABLE old ADD INDEX timeind (old_timestamp); |
| 10 | 12 | |
| 11 | 13 | # adding index on old_title |
| 12 | 14 | |
| 13 | | -ALTER TABLE old MODIFY old_title VARCHAR(255) BINARY NOT NULL DEFAULT ''; |
| 14 | | -ALTER TABLE old ADD INDEX old_title (old_title); |
| | 15 | +# ALTER TABLE old MODIFY old_title VARCHAR(255) BINARY NOT NULL DEFAULT ''; |
| | 16 | +# ALTER TABLE old ADD INDEX old_title (old_title); |
| 15 | 17 | |
| 16 | | -# dropping the superfluous indexes on cur_id and old_id |
| | 18 | +# dropping the superfluous indexes |
| 17 | 19 | |
| 18 | | -ALTER TABLE cur DROP key cur_id_2; |
| 19 | | -ALTER TABLE old DROP key old_id_2; |
| | 20 | +# ALTER TABLE cur DROP KEY cur_id_2; |
| | 21 | +# ALTER TABLE old DROP KEY old_id_2; |
| | 22 | +# ALTER TABLE old DROP PRIMARY KEY; |
| | 23 | +# ALTER TABLE user DROP PRIMARY KEY; |
| | 24 | +# ALTER TABLE user DROP KEY user_id_2; |