Changeset 11883 for trunk/wp-admin/includes/upgrade.php

Timestamp:

08/26/2009 10:46:33 PM (17 years ago)

Author:

ryan

Message:

Make option_name the primary key for the options table. Props Denis-de-Bernardy. fixes #2699

File:

• trunk/wp-admin/includes/upgrade.php (modified) (3 diffs)

trunk/wp-admin/includes/upgrade.php

@@ -270 +270 @@
         wp_check_mysql_version();
         wp_cache_flush();
+        pre_schema_upgrade();
         make_db_current_silent();
         upgrade_all();
@@ -555 +556 @@
                         $limit = $option->dupes - 1;
                         $dupe_ids = $wpdb->get_col( $wpdb->prepare("SELECT option_id FROM $wpdb->options WHERE option_name = %s LIMIT %d", $option->option_name, $limit) );
-                        $dupe_ids = join($dupe_ids, ',');
-                        $wpdb->query("DELETE FROM $wpdb->options WHERE option_id IN ($dupe_ids)");
+                        if ( $dupe_ids ) {
+                                $dupe_ids = join($dupe_ids, ',');
+                                $wpdb->query("DELETE FROM $wpdb->options WHERE option_id IN ($dupe_ids)");
+                        }
                 }
         }
@@ -1657 +1660 @@
 }
 
+/**
+ * Runs before the schema is upgraded.
+ */
+function pre_schema_upgrade() {
+        global $wp_current_db_version, $wp_db_version, $wpdb;
+
+        // Only run if less than 2.9
+        if ( $wp_current_db_version >= 11557 )
+                return;
+
+        // Delete duplicate options.  Keep the option with the highest option_id.
+        $delete_options = $wpdb->get_col("SELECT o1.option_id FROM $wpdb->options AS o1 JOIN $wpdb->options AS o2 ON o2.option_name = o1.option_name AND o2.option_id > o1.option_id");
+        if ( !empty($delete_options) ) {
+                $delete_options = implode("', '", $delete_options);
+                $wpdb->query("DELETE FROM $wpdb->options WHERE option_id IN ($delete_options)");
+        }
+
+        // Add an index on option_id to satisfy the auto_increment requirement
+        $wpdb->query("ALTER TABLE $wpdb->options ADD INDEX option_id (option_id)");
+
+        // Drop the old primary key. The new primary will be created by dbDelta()
+        $wpdb->query("ALTER TABLE $wpdb->options DROP PRIMARY KEY");
+
+        // Drop the old option_name index. dbDelta() doesn't do the drop.
+        $wpdb->query("ALTER TABLE $wpdb->options DROP INDEX option_name");
+}
+
 ?>