Yet another attempt to fix the populateIpChanges script

[lhc/web/wiklou.git] / maintenance / archives / patch-user_rights.sql

diff --git a/maintenance/archives/patch-user_rights.sql b/maintenance/archives/patch-user_rights.sql
index 5d799de..a39ac0a 100644 (file)
--- a/maintenance/archives/patch-user_rights.sql
+++ b/maintenance/archives/patch-user_rights.sql
@@ -1,16 +1,21 @@
 -- Split user table into two parts:
 --   user
 --   user_rights
--- The later contains only the permissions of the user. This way,
+-- The latter contains only the permissions of the user. This way,
 -- you can store the accounts for several wikis in one central
 -- database but keep user rights local to the wiki.
 
-CREATE TABLE user_rights (
-       user_id int(5) unsigned NOT NULL,
-       user_rights tinyblob NOT NULL default '',
-       UNIQUE KEY user_id (user_id)
-) PACK_KEYS=1;
+CREATE TABLE /*$wgDBprefix*/user_rights (
+  -- Key to user_id
+  ur_user int unsigned NOT NULL,
 
-INSERT INTO user_rights SELECT user_id,user_rights FROM user;
+  -- Comma-separated list of permission keys
+  ur_rights tinyblob NOT NULL,
 
-ALTER TABLE user DROP COLUMN user_rights;
+  UNIQUE KEY ur_user (ur_user)
+
+) /*$wgDBTableOptions*/;
+
+INSERT INTO /*$wgDBprefix*/user_rights SELECT user_id,user_rights FROM /*$wgDBprefix*/user;
+
+ALTER TABLE /*$wgDBprefix*/user DROP COLUMN user_rights;