* rmed redundant code

[lhc/web/wiklou.git] / maintenance / tables.sql

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index ddc5ea1..f5fdae3 100644 (file)
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -36,30 +36,41 @@ CREATE TABLE /*$wgDBprefix*/user_rights (
 -- );
 
 CREATE TABLE /*$wgDBprefix*/page (
+  -- Identifiers:
   page_id int(8) unsigned NOT NULL auto_increment,
   page_namespace tinyint NOT NULL,
   page_title varchar(255) binary NOT NULL,
+  
+  -- Mutable information
   page_restrictions tinyblob NOT NULL default '',
   page_counter bigint(20) unsigned NOT NULL default '0',
   page_is_redirect tinyint(1) unsigned NOT NULL default '0',
   page_is_new tinyint(1) unsigned NOT NULL default '0',
   page_random real unsigned NOT NULL,
   page_touched char(14) binary NOT NULL default '',
+  
+  -- Handy key to revision.rev_id of the current revision
   page_latest int(8) unsigned NOT NULL,
+  page_len int(8) unsigned NOT NULL,
 
   PRIMARY KEY page_id (page_id),
   UNIQUE INDEX name_title (page_namespace,page_title),
-  INDEX (page_random)
+  
+  -- Special-purpose indexes
+  INDEX (page_random),
+  INDEX (page_len)
 );
 
 CREATE TABLE /*$wgDBprefix*/revision (
   rev_id int(8) unsigned NOT NULL auto_increment,
   rev_page int(8) unsigned NOT NULL,
+  rev_text_id int(8) unsigned NOT NULL,
   rev_comment tinyblob NOT NULL default '',
   rev_user int(5) unsigned NOT NULL default '0',
   rev_user_text varchar(255) binary NOT NULL default '',
   rev_timestamp char(14) binary NOT NULL default '',
   rev_minor_edit tinyint(1) unsigned NOT NULL default '0',
+  rev_deleted tinyint(1) unsigned NOT NULL default '0',
   
   PRIMARY KEY rev_page_id (rev_page, rev_id),
   UNIQUE INDEX rev_id (rev_id),
@@ -303,14 +314,13 @@ CREATE TABLE /*$wgDBprefix*/blobs (
 
 CREATE TABLE /*$wgDBprefix*/validate (
   `val_user` int(11) NOT NULL default '0',
-  `val_title` varchar(255) binary NOT NULL default '',
-  `val_timestamp` varchar(14) binary NOT NULL default '',
-  `val_type` int(10) unsigned NOT NULL default '0',
+  `val_page` int(11) unsigned NOT NULL default '0',
+  `val_revision` int(11) unsigned NOT NULL default '0',
+  `val_type` int(11) unsigned NOT NULL default '0',
   `val_value` int(11) default '0',
   `val_comment` varchar(255) NOT NULL default '',
-  KEY `val_user` (`val_user`,`val_title`,`val_timestamp`)
-);
-
+  KEY `val_user` (`val_user`,`val_revision`)
+) TYPE=MyISAM;
 
 CREATE TABLE /*$wgDBprefix*/logging (
   -- Symbolic keys for the general log type and the action type