Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename ipb_address to ipb_address_unique

Browse source 
This is how it's named in WMF production and the Postgres. Converging
names would help us to keep everything consistent, for example if we
need to force this index in the code.

For changing this index in Sqlite, we don't need to make a temp table as
this only touches the index and not the table structure.

Bug: T250071
Change-Id: I0838753b809680af3ee06d9c4f6d21d95b8982cc
This commit is contained in:
Amir Sarabadani 2020-04-21 23:51:33 +02:00 committed by Reedy
parent eb88d78c3a
commit d779d2889a
5 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
includes/installer/MysqlUpdater.php
View file

@ -412,6 +412,8 @@ class MysqlUpdater extends DatabaseUpdater {
// 1.35
[ 'addTable', 'watchlist_expiry', 'patch-watchlist_expiry.sql' ],
[ 'modifyField', 'page', 'page_restrictions', 'patch-page_restrictions-null.sql' ],
[ 'renameIndex', 'ipblocks', 'ipb_address', 'ipb_address_unique', false,
'patch-ipblocks-rename-ipb_address.sql' ],
];
}

2
includes/installer/SqliteUpdater.php
View file

@ -282,6 +282,8 @@ class SqliteUpdater extends DatabaseUpdater {
[ 'modifyfield', 'recentchanges', 'rc_actor', 'patch-recentchanges-drop-rc_actor-DEFAULT.sql' ],
[ 'modifyfield', 'logging', 'log_actor', 'patch-logging-drop-log_actor-DEFAULT.sql' ],
[ 'modifyField', 'page', 'page_restrictions', 'patch-page_restrictions-null.sql' ],
[ 'renameIndex', 'ipblocks', 'ipb_address', 'ipb_address_unique', false,
'patch-ipblocks-rename-ipb_address.sql' ],
];
}

1
maintenance/archives/patch-ipblocks-rename-ipb_address.sql Normal file
View file

@ -0,0 +1 @@
ALTER TABLE /*_*/ipblocks DROP INDEX /*i*/ipb_address, ADD UNIQUE INDEX /*i*/ipb_address_unique (ipb_address(255), ipb_user, ipb_auto, ipb_anon_only);

2
maintenance/sqlite/archives/patch-ipblocks-rename-ipb_address.sql Normal file
View file

@ -0,0 +1,2 @@
DROP INDEX /*i*/ipb_address;
CREATE UNIQUE INDEX /*i*/ipb_address_unique ON /*_*/ipblocks (ipb_address(255), ipb_user, ipb_auto, ipb_anon_only);

2
maintenance/tables.sql
View file

@ -1090,7 +1090,7 @@ CREATE TABLE /*_*/ipblocks (
-- Unique index to support "user already blocked" messages
-- Any new options which prevent collisions should be included
CREATE UNIQUE INDEX /*i*/ipb_address ON /*_*/ipblocks (ipb_address(255), ipb_user, ipb_auto, ipb_anon_only);
CREATE UNIQUE INDEX /*i*/ipb_address_unique ON /*_*/ipblocks (ipb_address(255), ipb_user, ipb_auto, ipb_anon_only);
-- For querying whether a logged-in user is blocked
CREATE INDEX /*i*/ipb_user ON /*_*/ipblocks (ipb_user);