Merge "FeedbackDialog: Improve alignment"

[lhc/web/wiklou.git] / includes / installer / MssqlUpdater.php

diff --git a/includes/installer/MssqlUpdater.php b/includes/installer/MssqlUpdater.php
index dfe595e..a2aa8c0 100644 (file)
--- a/includes/installer/MssqlUpdater.php
+++ b/includes/installer/MssqlUpdater.php
@@ -101,6 +101,9 @@ class MssqlUpdater extends DatabaseUpdater {
                        [ 'addField', 'externallinks', 'el_index_60', 'patch-externallinks-el_index_60.sql' ],
                        [ 'dropIndex', 'oldimage', 'oi_name_archive_name',
                                'patch-alter-table-oldimage.sql' ],
+
+                       // 1.30
+                       [ 'modifyField', 'image', 'img_media_type', 'patch-add-3d.sql' ],
                ];
        }
 
@@ -114,12 +117,15 @@ class MssqlUpdater extends DatabaseUpdater {
 
        /**
         * General schema update for a table that touches more than one field or requires
-        * destructive actions (such as dropping and recreating the table).
+        * destructive actions (such as dropping and recreating the table). NOTE: Usage of
+        * this function is highly discouraged, use it's successor DatabaseUpdater::modifyTable
+        * instead.
         *
         * @param string $table
         * @param string $updatekey
         * @param string $patch
         * @param bool $fullpath
+        * @return bool
         */
        protected function updateSchema( $table, $updatekey, $patch, $fullpath = false ) {
                if ( !$this->db->tableExists( $table, __METHOD__ ) ) {
@@ -127,9 +133,11 @@ class MssqlUpdater extends DatabaseUpdater {
                } elseif ( $this->updateRowExists( $updatekey ) ) {
                        $this->output( "...$table already had schema updated by $patch.\n" );
                } else {
-                       $this->insertUpdateRow( $updatekey );
-
-                       return $this->applyPatch( $patch, $fullpath, "Updating schema of table $table" );
+                       $apply = $this->applyPatch( $patch, $fullpath, "Updating schema of table $table" );
+                       if ( $apply ) {
+                               $this->insertUpdateRow( $updatekey );
+                       }
+                       return $apply;
                }
 
                return true;