Paladox has uploaded a new change for review.
https://gerrit.wikimedia.org/r/318547
Change subject: Add primary key to oldimage
......................................................................
Add primary key to oldimage
Bug: T146568
Change-Id: I76b6db73cea77c22fc0051624927ef1afc83a826
---
M includes/installer/MysqlUpdater.php
M includes/installer/SqliteUpdater.php
A maintenance/archives/patch-oldimage-oi_id.sql
A maintenance/sqlite/archives/patch-oldimage-oi_id.sql
M maintenance/tables.sql
5 files changed, 67 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/47/318547/1
diff --git a/includes/installer/MysqlUpdater.php
b/includes/installer/MysqlUpdater.php
index a637ce0..a81aae9 100644
--- a/includes/installer/MysqlUpdater.php
+++ b/includes/installer/MysqlUpdater.php
@@ -291,6 +291,7 @@
[ 'addField', 'change_tag', 'ct_id',
'patch-change_tag-ct_id.sql' ],
[ 'addField', 'tag_summary', 'ts_id',
'patch-tag_summary-ts_id.sql' ],
[ 'modifyField', 'recentchanges', 'rc_ip',
'patch-rc_ip_modify.sql' ],
+ [ 'addField', 'oldimage', 'oi_id',
'patch-oldimage-oi_id.sql' ],
];
}
diff --git a/includes/installer/SqliteUpdater.php
b/includes/installer/SqliteUpdater.php
index 388c034..3f51d18 100644
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -158,6 +158,7 @@
'patch-add-rc_name_type_patrolled_timestamp_index.sql' ],
[ 'addField', 'change_tag', 'ct_id',
'patch-change_tag-ct_id.sql' ],
[ 'addField', 'tag_summary', 'ts_id',
'patch-tag_summary-ts_id.sql' ],
+ [ 'addField', 'oldimage', 'oi_id',
'patch-oldimage-oi_id.sql' ],
];
}
diff --git a/maintenance/archives/patch-oldimage-oi_id.sql
b/maintenance/archives/patch-oldimage-oi_id.sql
new file mode 100644
index 0000000..84e7703
--- /dev/null
+++ b/maintenance/archives/patch-oldimage-oi_id.sql
@@ -0,0 +1,8 @@
+--
+-- patch-oldimage-oi_id.sql
+--
+-- Bug T146568. Add oldimage.oi_id.
+
+ALTER TABLE /*$wgDBprefix*/oldimage
+ ADD COLUMN oi_id int unsigned NOT NULL AUTO_INCREMENT FIRST,
+ ADD PRIMARY KEY (oi_id);
diff --git a/maintenance/sqlite/archives/patch-oldimage-oi_id.sql
b/maintenance/sqlite/archives/patch-oldimage-oi_id.sql
new file mode 100644
index 0000000..ae7d353
--- /dev/null
+++ b/maintenance/sqlite/archives/patch-oldimage-oi_id.sql
@@ -0,0 +1,54 @@
+--
+-- patch-oldimage-oi_id.sql
+--
+-- Bug T146568. Add oldimage.oi_id.
+
+DROP TABLE IF EXISTS /*_*/l10n_cache_tmp;
+
+CREATE TABLE /*$wgDBprefix*/oldimage_tmp (
+ lc_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ lc_lang varbinary(32) NOT NULL,
+ lc_key varchar(255) NOT NULL,
+ lc_value mediumblob NOT NULL
+) /*$wgDBTableOptions*/;
+
+CREATE TABLE /*$wgDBprefix*/oldimage_tmp (
+ oi_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
+ oi_name varchar(255) binary NOT NULL default '',
+ oi_archive_name varchar(255) binary NOT NULL default '',
+ oi_size int unsigned NOT NULL default 0,
+ oi_width int NOT NULL default 0,
+ oi_height int NOT NULL default 0,
+ oi_bits int NOT NULL default 0,
+ oi_description varbinary(767) NOT NULL,
+ oi_user int unsigned NOT NULL default 0,
+ oi_user_text varchar(255) binary NOT NULL,
+ oi_timestamp binary(14) NOT NULL default '',
+ oi_metadata mediumblob NOT NULL,
+ oi_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO",
"MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL,
+ oi_major_mime ENUM("unknown", "application", "audio", "image", "text",
"video", "message", "model", "multipart", "chemical") NOT NULL default
"unknown",
+ oi_minor_mime varbinary(100) NOT NULL default "unknown",
+ oi_deleted tinyint unsigned NOT NULL default 0,
+ oi_sha1 varbinary(32) NOT NULL default ''
+) /*$wgDBTableOptions*/;
+
+INSERT OR IGNORE INTO /*_*/oldimage_tmp (
+ oi_id, oi_name, oi_archive_name, oi_size, oi_width,
+ oi_height, oi_bits, oi_description, oi_user, oi_user_text,
+ oi_timestamp, oi_metadata, oi_media_type, oi_major_mime,
+ oi_minor_mime, oi_deleted, oi_sha1 )
+ SELECT
+ oi_id, oi_name, oi_archive_name, oi_size, oi_width,
+ oi_height, oi_bits, oi_description, oi_user, oi_user_text,
+ oi_timestamp, oi_metadata, oi_media_type, oi_major_mime,
+ oi_minor_mime, oi_deleted, oi_sha1
+ FROM /*_*/oldimage;
+
+DROP TABLE /*_*/oldimage;
+
+ALTER TABLE /*_*/oldimage_tmp RENAME TO /*_*/oldimage;
+
+CREATE INDEX /*i*/oi_usertext_timestamp ON /*_*/oldimage
(oi_user_text,oi_timestamp);
+CREATE INDEX /*i*/oi_name_timestamp ON /*_*/oldimage (oi_name,oi_timestamp);
+CREATE INDEX /*i*/oi_name_archive_name ON /*_*/oldimage
(oi_name,oi_archive_name(14));
+CREATE INDEX /*i*/oi_sha1 ON /*_*/oldimage (oi_sha1(10));
diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 03ce508..4d00293 100644
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -903,6 +903,9 @@
-- this table at re-upload time.
--
CREATE TABLE /*_*/oldimage (
+ -- Primary key
+ oi_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,
+
-- Base filename: key to image.img_name
oi_name varchar(255) binary NOT NULL default '',
--
To view, visit https://gerrit.wikimedia.org/r/318547
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I76b6db73cea77c22fc0051624927ef1afc83a826
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
