Follow-up r90749:

* Removed useless ufg_group index from user_former_groups
* Index name consistency

diff --git a/maintenance/archives/patch-user_former_groups.sql b/maintenance/archives/patch-user_former_groups.sql
index fdaaf8f..ed18b2b 100644 (file)
--- a/maintenance/archives/patch-user_former_groups.sql
+++ b/maintenance/archives/patch-user_former_groups.sql
@@ -3,8 +3,7 @@
 CREATE TABLE /*_*/user_former_groups (
   -- Key to user_id
   ufg_user int unsigned NOT NULL default 0,
-  ufg_group varbinary(16) NOT NULL default '',
-  
-  PRIMARY KEY (ufg_user,ufg_group),
-  KEY (ufg_group)
+  ufg_group varbinary(16) NOT NULL default ''
 ) /*$wgDBTableOptions*/;
+
+CREATE UNIQUE INDEX /*i*/ufg_user_group ON /*_*/user_former_groups (ufg_user,ufg_group);

diff --git a/maintenance/postgres/archives/patch-user_former_groups.sql b/maintenance/postgres/archives/patch-user_former_groups.sql
index 9317a20..1ba011e 100644 (file)
--- a/maintenance/postgres/archives/patch-user_former_groups.sql
+++ b/maintenance/postgres/archives/patch-user_former_groups.sql
@@ -2,4 +2,4 @@ CREATE TABLE user_former_groups (
   ufg_user   INTEGER      NULL  REFERENCES mwuser(user_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
   ufg_group  TEXT     NOT NULL
 );
-CREATE UNIQUE INDEX user_former_groups_unique ON user_former_groups (ufg_user, ufg_group);
+CREATE UNIQUE INDEX ufg_user_group ON user_former_groups (ufg_user, ufg_group);

diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index c942855..ac0258f 100644 (file)
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -58,7 +58,7 @@ CREATE TABLE user_former_groups (
   ufg_user   INTEGER      NULL  REFERENCES mwuser(user_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
   ufg_group  TEXT     NOT NULL
 );
-CREATE UNIQUE INDEX user_former_groups_unique ON user_former_groups (ufg_user, ufg_group);
+CREATE UNIQUE INDEX ufg_user_group ON user_former_groups (ufg_user, ufg_group);
 
 CREATE TABLE user_newtalk (
   user_id              INTEGER      NOT NULL  REFERENCES mwuser(user_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 4bfa703..0880a70 100644 (file)
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -173,7 +173,6 @@ CREATE TABLE /*_*/user_former_groups (
 ) /*$wgDBTableOptions*/;
 
 CREATE UNIQUE INDEX /*i*/ufg_user_group ON /*_*/user_former_groups (ufg_user,ufg_group);
-CREATE INDEX /*i*/ufg_group ON /*_*/user_former_groups (ufg_group);
 
 --
 -- Stores notifications of user talk page changes, for the display