Changeset 25448

Timestamp:

09/15/2013 11:11:30 PM (12 years ago)

Author:

nacin

Message:

Multisite blogs table: Convert the archived field from enum to tinyint to match the other status fields. fixes #12832.

Location:

trunk/src

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/upgrade.php (modified) (1 diff)
• wp-includes/version.php (modified) (1 diff)

trunk/src/wp-admin/includes/schema.php

@@ -231 +231 @@
   last_updated datetime NOT NULL default '0000-00-00 00:00:00',
   public tinyint(2) NOT NULL default '1',
-  archived enum('0','1') NOT NULL default '0',
+  archived tinyint(2) NOT NULL default '0',
   mature tinyint(2) NOT NULL default '0',
   spam tinyint(2) NOT NULL default '0',

trunk/src/wp-admin/includes/upgrade.php

@@ -1979 +1979 @@
     }
 
-    // Upgrade verions prior to 3.7
-    if ( $wp_current_db_version < 25179 && is_multisite() && is_main_network() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) {
-        $wpdb->query( "ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST" );
-        $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain" );
+    // Multisite schema upgrades.
+    if ( $wp_current_db_version < 25448 && is_multisite() && ! defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) && is_main_network() ) {
+
+        // Upgrade verions prior to 3.7
+        if ( $wp_current_db_version < 25179 ) {
+            // New primary key for signups.
+            $wpdb->query( "ALTER TABLE $wpdb->signups ADD signup_id BIGINT(20) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST" );
+            $wpdb->query( "ALTER TABLE $wpdb->signups DROP INDEX domain" );
+        }
+
+        if ( $wp_current_db_version < 25448 ) {
+            // Convert archived from enum to tinyint.
+            $wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived varchar(1) NOT NULL default '0'" );
+            $wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived tinyint(2) NOT NULL default 0" );
+        }
     }
 }

trunk/src/wp-includes/version.php

@@ -12 +12 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 25416;
+$wp_db_version = 25448;
 
 /**