From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Sat, 25 Jun 2011 04:11:20 +0000 (+0000)
Subject: Follow-up r90749:
X-Git-Tag: 1.31.0-rc.0~29293
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=a4d029210aa2f5338519f7cc18a783cff4728049;p=lhc%2Fweb%2Fwiklou.git

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 fdaaf8f2de..ed18b2b662 100644
--- 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 9317a202e3..1ba011e34a 100644
--- 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 c942855ac8..ac0258ff95 100644
--- 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 4bfa703a84..0880a70205 100644
--- 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