Revert schema changes in r21954, 21955, 21956 for the moment

diff --git a/maintenance/archives/patch-oi_metadata.sql b/maintenance/archives/patch-oi_metadata.sql
deleted file mode 100644 (file)
index a055d67..0000000
--- a/maintenance/archives/patch-oi_metadata.sql
+++ /dev/null
@@ -1,15 +0,0 @@
--- \r
--- patch-indexes.sql\r
--- \r
--- Add data to allow for direct reference to old images\r
--- They can be included into pages\r
--- \r
-\r
-ALTER TABLE /*$wgDBprefix*/oldimage\r
-   DROP INDEX oi_name,\r
-   ADD INDEX oi_name_timestamp (oi_name,oi_timestamp),\r
-   ADD oi_metadata mediumblob NOT NULL,\r
-   ADD oi_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL,\r
-   ADD oi_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart") NOT NULL default "unknown",\r
-   ADD oi_minor_mime varchar(32) NOT NULL default "unknown",\r
-   ADD oi_deleted tinyint(1) unsigned NOT NULL default '0',
\ No newline at end of file

diff --git a/maintenance/ora/tables.sql b/maintenance/ora/tables.sql
index bbdb62a..7b8dc80 100644 (file)
--- a/maintenance/ora/tables.sql
+++ b/maintenance/ora/tables.sql
@@ -244,12 +244,7 @@ CREATE TABLE oldimage (
   oi_description   CLOB,
   oi_user          INTEGER          NULL  REFERENCES mwuser(user_id) ON DELETE SET NULL,
   oi_user_text     CLOB         NOT NULL,
-  oi_timestamp     TIMESTAMP WITH TIME ZONE  NOT NULL,
-  oi_metadata      CLOB,
-  oi_media_type    VARCHAR(10) DEFAULT NULL,
-  oi_major_mime    VARCHAR(11) DEFAULT 'unknown',
-  oi_minor_mime    VARCHAR(32) DEFAULT 'unknown',
-  oi_deleted       INTEGER DEFAULT 0 NOT NULL
+  oi_timestamp     TIMESTAMP WITH TIME ZONE  NOT NULL
 );
 CREATE INDEX oi_name ON oldimage (oi_name);
 

diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 448dfa7..1c7c42d 100644 (file)
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -262,12 +262,7 @@ CREATE TABLE oldimage (
   oi_description   TEXT,
   oi_user          INTEGER          NULL  REFERENCES mwuser(user_id) ON DELETE SET NULL,
   oi_user_text     TEXT         NOT NULL,
-  oi_timestamp     TIMESTAMPTZ  NOT NULL,
-  oi_metadata      BYTEA        NOT NULL,
-  oi_media_type    TEXT             NULL,
-  oi_major_mime    TEXT         NOT NULL DEFAULT 'unknown',
-  oi_minor_mime    TEXT         NOT NULL DEFAULT 'unknown',
-  oi_deleted       CHAR         NOT NULL DEFAULT '0'
+  oi_timestamp     TIMESTAMPTZ  NOT NULL
 );
 CREATE INDEX oi_name ON oldimage (oi_name);
 

diff --git a/maintenance/rebuildImages.php b/maintenance/rebuildImages.php
index 14a9578..4c02dc9 100644 (file)
--- a/maintenance/rebuildImages.php
+++ b/maintenance/rebuildImages.php
@@ -144,7 +144,7 @@ class ImageBuilder extends FiveUpgrade {
        }
 
        function oldimageCallback( $row ) {
-               if( $row->oi_width && $row->oi_media_type ) {
+               if( $row->oi_width ) {
                        return null;
                }
 
@@ -153,11 +153,7 @@ class ImageBuilder extends FiveUpgrade {
                return array(
                        'oi_width'  => $info['width' ],
                        'oi_height' => $info['height'],
-                       'oi_bits'   => $info['bits'  ],
-                       'oi_metadata' => '', // filled in on-demand
-                       'oi_media_type' => $info['media'],
-                       'oi_major_mime' => $info['major'],
-                       'oi_minor_mime' => $info['minor'] );
+                       'oi_bits'   => $info['bits'  ] );
        }
 
        function crawlMissing() {

diff --git a/maintenance/tables.sql b/maintenance/tables.sql
index 80a4629..5d8b548 100644 (file)
--- a/maintenance/tables.sql
+++ b/maintenance/tables.sql
@@ -715,21 +715,6 @@ CREATE TABLE /*$wgDBprefix*/oldimage (
   oi_user int(5) unsigned NOT NULL default '0',
   oi_user_text varchar(255) binary NOT NULL,
   oi_timestamp char(14) binary NOT NULL default '',
-  
-  -- Extracted EXIF metadata stored as a serialized PHP array.
-  oi_metadata mediumblob NOT NULL,
-  -- Media type as defined by the MEDIATYPE_xxx constants
-  oi_media_type ENUM("UNKNOWN", "BITMAP", "DRAWING", "AUDIO", "VIDEO", "MULTIMEDIA", "OFFICE", "TEXT", "EXECUTABLE", "ARCHIVE") default NULL,
-  -- major part of a MIME media type as defined by IANA
-  -- see http://www.iana.org/assignments/media-types/
-  oi_major_mime ENUM("unknown", "application", "audio", "image", "text", "video", "message", "model", "multipart") NOT NULL default "unknown",
-  -- minor part of a MIME media type as defined by IANA
-  -- the minor parts are not required to adher to any standard
-  -- but should be consistent throughout the database
-  -- see http://www.iana.org/assignments/media-types/
-  oi_minor_mime varchar(32) NOT NULL default "unknown",
-  
-  oi_deleted tinyint(1) unsigned NOT NULL default '0',
 
   INDEX oi_name (oi_name(10))
 

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 8ad4f4b..4707891 100644 (file)
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -76,7 +76,6 @@ $wgNewFields = array(
        array( 'archive',           'ar_len',           'patch-ar_len.sql' ),
        array( 'revision',          'rev_parent_id',    'patch-rev_parent_id.sql' ),
        array( 'page_restrictions', 'pr_id',            'patch-page_restrictions_sortkey.sql' ),
-       array( 'oldimage',              'oi_metadata',          'patch-oi_metadata.sql' ),
 );
 
 function rename_table( $from, $to, $patch ) {
@@ -1196,11 +1195,6 @@ function do_postgres_updates() {
                array("logging",       "log_params",           "TEXT"),
                array("mwuser",        "user_editcount",       "INTEGER"),
                array("mwuser",        "user_newpass_time",    "TIMESTAMPTZ"),
-               array("oldimage",      "oi_metadata",          "BYTEA NOT NULL"),
-               array("oldimage",      "oi_media_type",        "TEXT NOT NULL"),
-               array("oldimage",      "oi_major_mime",        "TEXT NOT NULL DEFAULT 'unknown'"),
-               array("oldimage",      "oi_minor_mime",        "TEXT NOT NULL DEFAULT 'unknown'"),
-               array("oldimage",      "oi_deleted",           "CHAR NOT NULL DEFAULT '0'"),
                array("page_restrictions", "pr_id",            "INTEGER NOT NULL UNIQUE DEFAULT nextval('pr_id_val')"),
                array("recentchanges", "rc_deleted",           "INTEGER NOT NULL DEFAULT 0"),
                array("recentchanges", "rc_log_action",        "TEXT"),