From 0532c260ba61f3bbb7d0762246ad52aa56ece628 Mon Sep 17 00:00:00 2001 From: Evan Prodromou Date: Sat, 28 May 2005 21:18:39 +0000 Subject: [PATCH] patch-img_media_type.sql assumed that img_type field existed and dropped it. This was incorrect and borked updates; now check for the field and drop it only if it exists. NB this process should probably be automated as the field-adding process has been. --- maintenance/archives/patch-drop_img_type.sql | 3 +++ maintenance/archives/patch-img_media_type.sql | 3 --- maintenance/updaters.inc | 16 +++++++++++++++- 3 files changed, 18 insertions(+), 4 deletions(-) create mode 100644 maintenance/archives/patch-drop_img_type.sql diff --git a/maintenance/archives/patch-drop_img_type.sql b/maintenance/archives/patch-drop_img_type.sql new file mode 100644 index 0000000000..e37376176b --- /dev/null +++ b/maintenance/archives/patch-drop_img_type.sql @@ -0,0 +1,3 @@ +-- img_type is no longer used, delete it + +ALTER TABLE /*$wgDBprefix*/image DROP COLUMN img_type; diff --git a/maintenance/archives/patch-img_media_type.sql b/maintenance/archives/patch-img_media_type.sql index c9ef8548a7..2356fc6316 100644 --- a/maintenance/archives/patch-img_media_type.sql +++ b/maintenance/archives/patch-img_media_type.sql @@ -15,6 +15,3 @@ ALTER TABLE /*$wgDBprefix*/image ADD ( -- see http://www.iana.org/assignments/media-types/ img_minor_mime varchar(32) NOT NULL default "unknown" ); - --- img_type is no longer used, delete it -ALTER TABLE /*$wgDBprefix*/image DROP COLUMN img_type; \ No newline at end of file diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc index cb249a7900..b21de9eb57 100644 --- a/maintenance/updaters.inc +++ b/maintenance/updaters.inc @@ -549,6 +549,18 @@ function do_pagelinks_namespace( $namespace ) { echo "ok\n"; } +function do_drop_img_type() { + global $wgDatabase; + + if ($wgDatabase->fieldExists('image', 'img_type')) { + echo "Dropping unused img_type field in image table... "; + dbsource( "maintenance/archives/patch-drop_img_type.sql", $wgDatabase ); + echo "ok\n"; + } else { + echo "No img_type field in image table; Good.\n"; + } +} + function do_all_updates() { global $wgNewTables, $wgNewFields, $wgRenamedTables; @@ -589,7 +601,9 @@ function do_all_updates() { do_namespace_size(); flush(); do_pagelinks_update(); flush(); - + + do_drop_img_type(); flush(); + initialiseMessages(); flush(); } -- 2.20.1