* rmed redundant code

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

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 67596d7..f5fdae3 100644 (file)
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -11,6 +11,7 @@ CREATE TABLE /*$wgDBprefix*/user (
   user_password tinyblob NOT NULL default '',
   user_newpassword tinyblob NOT NULL default '',
   user_email tinytext NOT NULL default '',
+  user_emailauthenticationtimestamp varchar(14) binary NOT NULL default '0',
   user_options blob NOT NULL default '',
   user_touched char(14) binary NOT NULL default '',
   user_token char(32) binary NOT NULL default '',
@@ -25,62 +26,70 @@ CREATE TABLE /*$wgDBprefix*/user_rights (
   UNIQUE KEY ur_user (ur_user)
 );
 
-CREATE TABLE /*$wgDBprefix*/user_newtalk (
-  user_id int(5) NOT NULL default '0',
-  user_ip varchar(40) NOT NULL default '',
-  INDEX user_id (user_id),
-  INDEX user_ip (user_ip)
-);
+-- The following table is no longer needed with Enotif >= 2.00
+-- Entries for newtalk on user_talk page are handled like in the watchlist table
+-- CREATE TABLE /*$wgDBprefix*/user_newtalk (
+--  user_id int(5) NOT NULL default '0',
+--  user_ip varchar(40) NOT NULL default '',
+--  INDEX user_id (user_id),
+--  INDEX user_ip (user_ip)
+-- );
+
+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,
 
-CREATE TABLE /*$wgDBprefix*/cur (
-  cur_id int(8) unsigned NOT NULL auto_increment,
-  cur_namespace tinyint(2) unsigned NOT NULL default '0',
-  cur_title varchar(255) binary NOT NULL default '',
-  cur_text mediumtext NOT NULL default '',
-  cur_comment tinyblob NOT NULL default '',
-  cur_user int(5) unsigned NOT NULL default '0',
-  cur_user_text varchar(255) binary NOT NULL default '',
-  cur_timestamp char(14) binary NOT NULL default '',
-  cur_restrictions tinyblob NOT NULL default '',
-  cur_counter bigint(20) unsigned NOT NULL default '0',
-  cur_is_redirect tinyint(1) unsigned NOT NULL default '0',
-  cur_minor_edit tinyint(1) unsigned NOT NULL default '0',
-  cur_is_new tinyint(1) unsigned NOT NULL default '0',
-  cur_random real unsigned NOT NULL,
-  cur_touched char(14) binary NOT NULL default '',
-  inverse_timestamp char(14) binary NOT NULL default '',
-  PRIMARY KEY cur_id (cur_id),
-  UNIQUE INDEX name_title (cur_namespace,cur_title),
+  PRIMARY KEY page_id (page_id),
+  UNIQUE INDEX name_title (page_namespace,page_title),
   
-  -- Is this one necessary?
-  INDEX cur_title (cur_title(20)),
+  -- 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',
   
-  INDEX cur_timestamp (cur_timestamp),
-  INDEX (cur_random),
-  INDEX name_title_timestamp (cur_namespace,cur_title,inverse_timestamp),
-  INDEX user_timestamp (cur_user,inverse_timestamp),
-  INDEX usertext_timestamp (cur_user_text,inverse_timestamp),
-  INDEX namespace_redirect_timestamp(cur_namespace,cur_is_redirect,cur_timestamp)
+  PRIMARY KEY rev_page_id (rev_page, rev_id),
+  UNIQUE INDEX rev_id (rev_id),
+  INDEX rev_timestamp (rev_timestamp),
+  INDEX page_timestamp (rev_page,rev_timestamp),
+  INDEX user_timestamp (rev_user,rev_timestamp),
+  INDEX usertext_timestamp (rev_user_text,rev_timestamp)
 );
 
-CREATE TABLE /*$wgDBprefix*/old (
+
+--
+-- Holds text of individual page revisions.
+--
+CREATE TABLE /*$wgDBprefix*/text (
   old_id int(8) unsigned NOT NULL auto_increment,
-  old_namespace tinyint(2) unsigned NOT NULL default '0',
-  old_title varchar(255) binary NOT NULL default '',
   old_text mediumtext NOT NULL default '',
-  old_comment tinyblob NOT NULL default '',
-  old_user int(5) unsigned NOT NULL default '0',
-  old_user_text varchar(255) binary NOT NULL,
-  old_timestamp char(14) binary NOT NULL default '',
-  old_minor_edit tinyint(1) NOT NULL default '0',
   old_flags tinyblob NOT NULL default '',
-  inverse_timestamp char(14) binary NOT NULL default '',
   
-  PRIMARY KEY old_id (old_id),
-  INDEX old_timestamp (old_timestamp),
-  INDEX name_title_timestamp (old_namespace,old_title,inverse_timestamp),
-  INDEX user_timestamp (old_user,inverse_timestamp),
-  INDEX usertext_timestamp (old_user_text,inverse_timestamp)
+  PRIMARY KEY old_id (old_id)
 );
 
 CREATE TABLE /*$wgDBprefix*/archive (
@@ -93,6 +102,7 @@ CREATE TABLE /*$wgDBprefix*/archive (
   ar_timestamp char(14) binary NOT NULL default '',
   ar_minor_edit tinyint(1) NOT NULL default '0',
   ar_flags tinyblob NOT NULL default '',
+  ar_rev_id int(8) unsigned,
   
   KEY name_title_timestamp (ar_namespace,ar_title,ar_timestamp)
 );
@@ -241,6 +251,7 @@ CREATE TABLE /*$wgDBprefix*/watchlist (
   wl_user int(5) unsigned NOT NULL,
   wl_namespace tinyint(2) unsigned NOT NULL default '0',
   wl_title varchar(255) binary NOT NULL default '',
+  wl_notificationtimestamp varchar(14) binary NOT NULL default '0',
   UNIQUE KEY (wl_user, wl_namespace, wl_title),
   KEY namespace_title (wl_namespace,wl_title)
 );
@@ -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
@@ -328,11 +338,14 @@ CREATE TABLE /*$wgDBprefix*/logging (
   -- Key to the page affected. Where a user is the target,
   -- this will point to the user page.
   log_namespace tinyint unsigned NOT NULL default 0,
-  log_title varchar(255) NOT NULL default '',
+  log_title varchar(255) binary NOT NULL default '',
   
   -- Freeform text. Interpreted as edit history comments.
   log_comment varchar(255) NOT NULL default '',
   
+  -- LF separated list of miscellaneous parameters
+  log_params blob NOT NULL default '',
+
   KEY type_time (log_type, log_timestamp),
   KEY user_time (log_user, log_timestamp),
   KEY page_time (log_namespace, log_title, log_timestamp)