X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=maintenance%2Fsqlite%2Farchives%2Fpatch-actor-table.sql;h=d9a018ef7196e77cd220da3a818eff3e3f121886;hb=b23cab80f73ac73a08c0f83db60d6b172623df75;hp=bf15a04ca640adf4a73a290211b878d554e14e00;hpb=27c61fb1e94da9114314468fd00bcf129ec064b6;p=lhc%2Fweb%2Fwiklou.git diff --git a/maintenance/sqlite/archives/patch-actor-table.sql b/maintenance/sqlite/archives/patch-actor-table.sql index bf15a04ca6..8350cfab33 100644 --- a/maintenance/sqlite/archives/patch-actor-table.sql +++ b/maintenance/sqlite/archives/patch-actor-table.sql @@ -30,7 +30,6 @@ CREATE TABLE /*_*/archive_tmp ( ar_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT, ar_namespace int NOT NULL default 0, ar_title varchar(255) binary NOT NULL default '', - ar_text mediumblob NOT NULL, ar_comment varbinary(767) NOT NULL default '', ar_comment_id bigint unsigned NOT NULL DEFAULT 0, ar_user int unsigned NOT NULL default 0, @@ -38,9 +37,8 @@ CREATE TABLE /*_*/archive_tmp ( ar_actor bigint unsigned NOT NULL DEFAULT 0, ar_timestamp binary(14) NOT NULL default '', ar_minor_edit tinyint NOT NULL default 0, - ar_flags tinyblob NOT NULL, ar_rev_id int unsigned, - ar_text_id int unsigned, + ar_text_id int unsigned NOT NULL default 0, ar_deleted tinyint unsigned NOT NULL default 0, ar_len int unsigned, ar_page_id int unsigned, @@ -51,15 +49,13 @@ CREATE TABLE /*_*/archive_tmp ( ) /*$wgDBTableOptions*/; INSERT OR IGNORE INTO /*_*/archive_tmp ( - ar_id, ar_namespace, ar_title, ar_text, ar_comment, ar_user, ar_user_text, - ar_timestamp, ar_minor_edit, ar_flags, ar_rev_id, ar_text_id, ar_deleted, - ar_len, ar_page_id, ar_parent_id, ar_sha1, ar_content_model, - ar_content_format) + ar_id, ar_namespace, ar_title, ar_comment, ar_user, ar_user_text, + ar_timestamp, ar_minor_edit, ar_rev_id, ar_text_id, ar_deleted, ar_len, + ar_page_id, ar_parent_id, ar_sha1, ar_content_model, ar_content_format) SELECT - ar_id, ar_namespace, ar_title, ar_text, ar_comment, ar_user, ar_user_text, - ar_timestamp, ar_minor_edit, ar_flags, ar_rev_id, ar_text_id, ar_deleted, - ar_len, ar_page_id, ar_parent_id, ar_sha1, ar_content_model, - ar_content_format + ar_id, ar_namespace, ar_title, ar_comment, ar_user, ar_user_text, + ar_timestamp, ar_minor_edit, ar_rev_id, ar_text_id, ar_deleted, ar_len, + ar_page_id, ar_parent_id, ar_sha1, ar_content_model, ar_content_format FROM /*_*/archive; DROP TABLE /*_*/archive; @@ -130,10 +126,11 @@ CREATE TABLE /*_*/image_tmp ( img_height int NOT NULL default 0, img_metadata mediumblob NOT NULL, img_bits int NOT NULL default 0, - img_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL, + img_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE", "3D") default NULL, img_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart", "chemical") NOT NULL default "unknown", img_minor_mime varbinary(100) NOT NULL default "unknown", img_description varbinary(767) NOT NULL default '', + img_description_id bigint unsigned NOT NULL DEFAULT 0, img_user int unsigned NOT NULL default 0, img_user_text varchar(255) binary NOT NULL DEFAULT '', img_actor bigint unsigned NOT NULL DEFAULT 0, @@ -143,12 +140,12 @@ CREATE TABLE /*_*/image_tmp ( INSERT OR IGNORE INTO /*_*/image_tmp ( img_name, img_size, img_width, img_height, img_metadata, img_bits, - img_media_type, img_major_mime, img_minor_mime, img_description, img_user, - img_user_text, img_timestamp, img_sha1) + img_media_type, img_major_mime, img_minor_mime, img_description, + img_description_id, img_user, img_user_text, img_timestamp, img_sha1) SELECT img_name, img_size, img_width, img_height, img_metadata, img_bits, - img_media_type, img_major_mime, img_minor_mime, img_description, img_user, - img_user_text, img_timestamp, img_sha1 + img_media_type, img_major_mime, img_minor_mime, img_description, + img_description_id, img_user, img_user_text, img_timestamp, img_sha1 FROM /*_*/image; DROP TABLE /*_*/image; @@ -180,7 +177,7 @@ CREATE TABLE /*_*/oldimage_tmp ( oi_actor bigint unsigned NOT NULL DEFAULT 0, 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_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE", "3D") 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, @@ -207,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; @@ -303,7 +246,7 @@ CREATE INDEX /*i*/times ON /*_*/logging (log_timestamp); CREATE INDEX /*i*/log_user_type_time ON /*_*/logging (log_user, log_type, log_timestamp); CREATE INDEX /*i*/log_actor_type_time ON /*_*/logging (log_actor, log_type, log_timestamp); CREATE INDEX /*i*/log_page_id_time ON /*_*/logging (log_page,log_timestamp); -CREATE INDEX /*i*/type_action ON /*_*/logging (log_type, log_action, log_timestamp); +CREATE INDEX /*i*/log_type_action ON /*_*/logging (log_type, log_action, log_timestamp); CREATE INDEX /*i*/log_user_text_type_time ON /*_*/logging (log_user_text, log_type, log_timestamp); CREATE INDEX /*i*/log_user_text_time ON /*_*/logging (log_user_text, log_timestamp);