Changeset 11883

Timestamp:

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

Author:

ryan

Message:

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

Location:

trunk

Files:

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

trunk/wp-admin/includes/schema.php

@@ -100 +100 @@
   option_value longtext NOT NULL,
   autoload varchar(20) NOT NULL default 'yes',
-  PRIMARY KEY  (option_id,blog_id,option_name),
-  KEY option_name (option_name)
+  PRIMARY KEY  (option_name),
+  KEY option_id (option_id)
 ) $charset_collate;
 CREATE TABLE $wpdb->postmeta (

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");
+}
+
 ?>

trunk/wp-includes/functions.php

@@ -622 +622 @@
     // Get the ID, if no ID then return
     // expected_slashed ($name)
-    $option = $wpdb->get_row( "SELECT option_id, autoload FROM $wpdb->options WHERE option_name = '$name'" );
-    if ( is_null($option) || !$option->option_id )
+    $option = $wpdb->get_row( "SELECT autoload FROM $wpdb->options WHERE option_name = '$name'" );
+    if ( is_null($option) )
         return false;
     // expected_slashed ($name)

trunk/wp-includes/version.php

@@ -16 +16 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 11548;
+$wp_db_version = 11557;
 
 /**