From f9ad69d2a5312b0565a5b1a3762aa812f6b5cfb9 Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Wed, 28 Nov 2018 13:53:17 -0500 Subject: [PATCH] SQLite: Split actor and comment filearchive updates to a separate file On a fresh install, update.php will apply patch-editsummary-length.sql even though it doesn't need to. But this partially wipes out the new schema from tables.sql, and the omnibus comment and actor table patches don't detect this, leading to filearchive missing the new fields. Unlike the case with patch-add-3d.sql in I335cb8d9, here the patch does make a change (if only a tiny one): fa_deleted_reason changes from TEXT to BLOB. Change-Id: I08047ff1207d471660365c0eb3faabc0b47746bb --- includes/installer/SqliteUpdater.php | 2 + .../sqlite/archives/patch-actor-table.sql | 56 +---------------- .../archives/patch-filearchive-fa_actor.sql | 61 +++++++++++++++++++ .../patch-filearchive-fa_description_id.sql | 60 ++++++++++++++++++ 4 files changed, 124 insertions(+), 55 deletions(-) create mode 100644 maintenance/sqlite/archives/patch-filearchive-fa_actor.sql create mode 100644 maintenance/sqlite/archives/patch-filearchive-fa_description_id.sql diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php index c91fe32e5f..db9bd0b2a5 100644 --- a/includes/installer/SqliteUpdater.php +++ b/includes/installer/SqliteUpdater.php @@ -203,6 +203,7 @@ class SqliteUpdater extends DatabaseUpdater { // This field was added in 1.31, but is put here so it can be used by 'migrateComments' [ 'addField', 'image', 'img_description_id', 'patch-image-img_description_id.sql' ], + [ 'addField', 'filearchive', 'fa_description_id', 'patch-filearchive-fa_description_id.sql' ], [ 'migrateComments' ], [ 'renameIndex', 'l10n_cache', 'lc_lang_key', 'PRIMARY', false, @@ -216,6 +217,7 @@ class SqliteUpdater extends DatabaseUpdater { [ 'addTable', 'slot_roles', 'patch-slot_roles.sql' ], [ 'migrateArchiveText' ], [ 'addTable', 'actor', 'patch-actor-table.sql' ], + [ 'addField', 'filearchive', 'fa_actor', 'patch-filearchive-fa_actor.sql' ], [ 'migrateActors' ], [ 'modifyField', 'revision', 'rev_text_id', 'patch-rev_text_id-default.sql' ], [ 'modifyTable', 'site_stats', 'patch-site_stats-modify.sql' ], diff --git a/maintenance/sqlite/archives/patch-actor-table.sql b/maintenance/sqlite/archives/patch-actor-table.sql index d9a018ef71..af6347290f 100644 --- a/maintenance/sqlite/archives/patch-actor-table.sql +++ b/maintenance/sqlite/archives/patch-actor-table.sql @@ -204,61 +204,7 @@ CREATE INDEX /*i*/oi_actor_timestamp ON /*_*/oldimage (oi_actor,oi_timestamp); COMMIT; -BEGIN; - -DROP TABLE IF EXISTS /*_*/filearchive_tmp; -CREATE TABLE /*_*/filearchive_tmp ( - fa_id int NOT NULL PRIMARY KEY AUTO_INCREMENT, - fa_name varchar(255) binary NOT NULL default '', - fa_archive_name varchar(255) binary default '', - fa_storage_group varbinary(16), - fa_storage_key varbinary(64) default '', - fa_deleted_user int, - fa_deleted_timestamp binary(14) default '', - fa_deleted_reason varbinary(767) default '', - fa_deleted_reason_id bigint unsigned NOT NULL DEFAULT 0, - fa_size int unsigned default 0, - fa_width int default 0, - fa_height int default 0, - fa_metadata mediumblob, - fa_bits int default 0, - fa_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL, - fa_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart", "chemical") default "unknown", - fa_minor_mime varbinary(100) default "unknown", - fa_description varbinary(767) default '', - fa_description_id bigint unsigned NOT NULL DEFAULT 0, - fa_user int unsigned default 0, - fa_user_text varchar(255) binary DEFAULT '', - fa_actor bigint unsigned NOT NULL DEFAULT 0, - fa_timestamp binary(14) default '', - fa_deleted tinyint unsigned NOT NULL default 0, - fa_sha1 varbinary(32) NOT NULL default '' -) /*$wgDBTableOptions*/; - -INSERT OR IGNORE INTO /*_*/filearchive_tmp ( - fa_id, fa_name, fa_archive_name, fa_storage_group, fa_storage_key, - fa_deleted_user, fa_deleted_timestamp, fa_deleted_reason, fa_size, - fa_width, fa_height, fa_metadata, fa_bits, fa_media_type, fa_major_mime, - fa_minor_mime, fa_description, fa_user, fa_user_text, fa_timestamp, - fa_deleted, fa_sha1) - SELECT - fa_id, fa_name, fa_archive_name, fa_storage_group, fa_storage_key, - fa_deleted_user, fa_deleted_timestamp, fa_deleted_reason, fa_size, - fa_width, fa_height, fa_metadata, fa_bits, fa_media_type, fa_major_mime, - fa_minor_mime, fa_description, fa_user, fa_user_text, fa_timestamp, - fa_deleted, fa_sha1 - FROM /*_*/filearchive; - -DROP TABLE /*_*/filearchive; -ALTER TABLE /*_*/filearchive_tmp RENAME TO /*_*/filearchive; -CREATE INDEX /*i*/fa_name ON /*_*/filearchive (fa_name, fa_timestamp); -CREATE INDEX /*i*/fa_storage_group ON /*_*/filearchive (fa_storage_group, fa_storage_key); -CREATE INDEX /*i*/fa_deleted_timestamp ON /*_*/filearchive (fa_deleted_timestamp); -CREATE INDEX /*i*/fa_user_timestamp ON /*_*/filearchive (fa_user_text,fa_timestamp); -CREATE INDEX /*i*/fa_sha1 ON /*_*/filearchive (fa_sha1(10)); -CREATE INDEX /*i*/fa_actor_timestamp ON /*_*/filearchive (fa_actor,fa_timestamp); - -COMMIT; +-- filearchive is done in patch-filearchive-fa_actor.sql BEGIN; diff --git a/maintenance/sqlite/archives/patch-filearchive-fa_actor.sql b/maintenance/sqlite/archives/patch-filearchive-fa_actor.sql new file mode 100644 index 0000000000..179c29c103 --- /dev/null +++ b/maintenance/sqlite/archives/patch-filearchive-fa_actor.sql @@ -0,0 +1,61 @@ +-- +-- patch-filearchive-fa_actor.sql +-- +-- Split from patch-actor-table.sql to work around SQLite unconditionally running +-- patch-add-3d.sql on a fresh install, which wipes out fa_actor. + +BEGIN; + +DROP TABLE IF EXISTS /*_*/filearchive_tmp; +CREATE TABLE /*_*/filearchive_tmp ( + fa_id int NOT NULL PRIMARY KEY AUTO_INCREMENT, + fa_name varchar(255) binary NOT NULL default '', + fa_archive_name varchar(255) binary default '', + fa_storage_group varbinary(16), + fa_storage_key varbinary(64) default '', + fa_deleted_user int, + fa_deleted_timestamp binary(14) default '', + fa_deleted_reason varbinary(767) default '', + fa_deleted_reason_id bigint unsigned NOT NULL DEFAULT 0, + fa_size int unsigned default 0, + fa_width int default 0, + fa_height int default 0, + fa_metadata mediumblob, + fa_bits int default 0, + fa_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE", "3D") default NULL, + fa_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart", "chemical") default "unknown", + fa_minor_mime varbinary(100) default "unknown", + fa_description varbinary(767) default '', + fa_description_id bigint unsigned NOT NULL DEFAULT 0, + fa_user int unsigned default 0, + fa_user_text varchar(255) binary DEFAULT '', + fa_actor bigint unsigned NOT NULL DEFAULT 0, + fa_timestamp binary(14) default '', + fa_deleted tinyint unsigned NOT NULL default 0, + fa_sha1 varbinary(32) NOT NULL default '' +) /*$wgDBTableOptions*/; + +INSERT OR IGNORE INTO /*_*/filearchive_tmp ( + fa_id, fa_name, fa_archive_name, fa_storage_group, fa_storage_key, + fa_deleted_user, fa_deleted_timestamp, fa_deleted_reason, fa_size, + fa_width, fa_height, fa_metadata, fa_bits, fa_media_type, fa_major_mime, + fa_minor_mime, fa_description, fa_user, fa_user_text, fa_timestamp, + fa_deleted, fa_sha1) + SELECT + fa_id, fa_name, fa_archive_name, fa_storage_group, fa_storage_key, + fa_deleted_user, fa_deleted_timestamp, fa_deleted_reason, fa_size, + fa_width, fa_height, fa_metadata, fa_bits, fa_media_type, fa_major_mime, + fa_minor_mime, fa_description, fa_user, fa_user_text, fa_timestamp, + fa_deleted, fa_sha1 + FROM /*_*/filearchive; + +DROP TABLE /*_*/filearchive; +ALTER TABLE /*_*/filearchive_tmp RENAME TO /*_*/filearchive; +CREATE INDEX /*i*/fa_name ON /*_*/filearchive (fa_name, fa_timestamp); +CREATE INDEX /*i*/fa_storage_group ON /*_*/filearchive (fa_storage_group, fa_storage_key); +CREATE INDEX /*i*/fa_deleted_timestamp ON /*_*/filearchive (fa_deleted_timestamp); +CREATE INDEX /*i*/fa_user_timestamp ON /*_*/filearchive (fa_user_text,fa_timestamp); +CREATE INDEX /*i*/fa_sha1 ON /*_*/filearchive (fa_sha1(10)); +CREATE INDEX /*i*/fa_actor_timestamp ON /*_*/filearchive (fa_actor,fa_timestamp); + +COMMIT; diff --git a/maintenance/sqlite/archives/patch-filearchive-fa_description_id.sql b/maintenance/sqlite/archives/patch-filearchive-fa_description_id.sql new file mode 100644 index 0000000000..c5361edcd4 --- /dev/null +++ b/maintenance/sqlite/archives/patch-filearchive-fa_description_id.sql @@ -0,0 +1,60 @@ +-- +-- patch-filearchive-fa_description_id.sql +-- +-- Split from patch-comment-table.sql to work around SQLite unconditionally running +-- patch-add-3d.sql on a fresh install, which wipes out fa_description_id and +-- fa_deleted_reason_id. + +BEGIN; + +DROP TABLE IF EXISTS /*_*/filearchive_tmp; +CREATE TABLE /*_*/filearchive_tmp ( + fa_id int NOT NULL PRIMARY KEY AUTO_INCREMENT, + fa_name varchar(255) binary NOT NULL default '', + fa_archive_name varchar(255) binary default '', + fa_storage_group varbinary(16), + fa_storage_key varbinary(64) default '', + fa_deleted_user int, + fa_deleted_timestamp binary(14) default '', + fa_deleted_reason varbinary(767) default '', + fa_deleted_reason_id bigint unsigned NOT NULL DEFAULT 0, + fa_size int unsigned default 0, + fa_width int default 0, + fa_height int default 0, + fa_metadata mediumblob, + fa_bits int default 0, + fa_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE", "3D") default NULL, + fa_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart", "chemical") default "unknown", + fa_minor_mime varbinary(100) default "unknown", + fa_description varbinary(767) default '', + fa_description_id bigint unsigned NOT NULL DEFAULT 0, + fa_user int unsigned default 0, + fa_user_text varchar(255) binary, + fa_timestamp binary(14) default '', + fa_deleted tinyint unsigned NOT NULL default 0, + fa_sha1 varbinary(32) NOT NULL default '' +) /*$wgDBTableOptions*/; + +INSERT OR IGNORE INTO /*_*/filearchive_tmp ( + fa_id, fa_name, fa_archive_name, fa_storage_group, fa_storage_key, + fa_deleted_user, fa_deleted_timestamp, fa_deleted_reason, fa_size, + fa_width, fa_height, fa_metadata, fa_bits, fa_media_type, fa_major_mime, + fa_minor_mime, fa_description, fa_user, fa_user_text, fa_timestamp, + fa_deleted, fa_sha1) + SELECT + fa_id, fa_name, fa_archive_name, fa_storage_group, fa_storage_key, + fa_deleted_user, fa_deleted_timestamp, fa_deleted_reason, fa_size, + fa_width, fa_height, fa_metadata, fa_bits, fa_media_type, fa_major_mime, + fa_minor_mime, fa_description, fa_user, fa_user_text, fa_timestamp, + fa_deleted, fa_sha1 + FROM /*_*/filearchive; + +DROP TABLE /*_*/filearchive; +ALTER TABLE /*_*/filearchive_tmp RENAME TO /*_*/filearchive; +CREATE INDEX /*i*/fa_name ON /*_*/filearchive (fa_name, fa_timestamp); +CREATE INDEX /*i*/fa_storage_group ON /*_*/filearchive (fa_storage_group, fa_storage_key); +CREATE INDEX /*i*/fa_deleted_timestamp ON /*_*/filearchive (fa_deleted_timestamp); +CREATE INDEX /*i*/fa_user_timestamp ON /*_*/filearchive (fa_user_text,fa_timestamp); +CREATE INDEX /*i*/fa_sha1 ON /*_*/filearchive (fa_sha1(10)); + +COMMIT; -- 2.20.1