<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12217] trunk: Make option_id primary.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12217">12217</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2009-11-19 16:42:07 +0000 (Thu, 19 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make option_id primary. Add uniques for option_name and autoload. see <a href="http://trac.wordpress.org/ticket/2699">#2699</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesschemaphp">trunk/wp-admin/includes/schema.php</a></li>
<li><a href="#trunkwpadminincludesupgradephp">trunk/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunkwpincludesversionphp">trunk/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesschemaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/schema.php (12216 => 12217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/schema.php 2009-11-19 16:35:17 UTC (rev 12216)
+++ trunk/wp-admin/includes/schema.php 2009-11-19 16:42:07 UTC (rev 12217)
</span><span class="lines">@@ -108,8 +108,9 @@
</span><span class="cx"> option_name varchar(64) NOT NULL default '',
</span><span class="cx"> option_value longtext NOT NULL,
</span><span class="cx"> autoload varchar(20) NOT NULL default 'yes',
</span><del>- PRIMARY KEY (option_name),
- KEY option_id (option_id)
</del><ins>+ PRIMARY KEY (option_id),
+ UNIQUE option_name (option_name),
+ UNIQUE autoloaded_options (autoload, option_name)
</ins><span class="cx"> ) $charset_collate;
</span><span class="cx"> CREATE TABLE $wpdb->postmeta (
</span><span class="cx"> meta_id bigint(20) unsigned NOT NULL auto_increment,
</span></span></pre></div>
<a id="trunkwpadminincludesupgradephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/upgrade.php (12216 => 12217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/upgrade.php 2009-11-19 16:35:17 UTC (rev 12216)
+++ trunk/wp-admin/includes/upgrade.php 2009-11-19 16:42:07 UTC (rev 12217)
</span><span class="lines">@@ -1708,25 +1708,33 @@
</span><span class="cx"> function pre_schema_upgrade() {
</span><span class="cx"> global $wp_current_db_version, $wp_db_version, $wpdb;
</span><span class="cx">
</span><del>- // Only run if less than 2.9
- if ( $wp_current_db_version >= 11557 )
</del><ins>+ // Upgrade 2.9 development versions
+ if ( ( $wp_current_db_version > 11557 ) && ( $wp_current_db_version < 12204 ) ) {
+ // Drop the option_id index. dbDelta() doesn't do the drop.
+ $wpdb->query("ALTER TABLE $wpdb->options DROP INDEX option_id");
+
+ // Drop the old primary key and add the new.
+ $wpdb->query("ALTER TABLE $wpdb->options DROP PRIMARY KEY, ADD PRIMARY KEY(option_id)");
+
</ins><span class="cx"> return;
</span><del>-
- // 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)");
</del><span class="cx"> }
</span><span class="cx">
</span><del>- // Add an index on option_id to satisfy the auto_increment requirement
- $wpdb->query("ALTER TABLE $wpdb->options ADD INDEX option_id (option_id)");
</del><ins>+ // Upgrade versions prior to 2.9
+ if ( $wp_current_db_version < 11557 ) {
+ // 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)");
+ }
</ins><span class="cx">
</span><del>- // Drop the old primary key. The new primary will be created by dbDelta()
- $wpdb->query("ALTER TABLE $wpdb->options DROP PRIMARY KEY");
</del><ins>+ // Drop the old primary key and add the new.
+ $wpdb->query("ALTER TABLE $wpdb->options DROP PRIMARY KEY, ADD PRIMARY KEY(option_id)");
</ins><span class="cx">
</span><del>- // Drop the old option_name index. dbDelta() doesn't do the drop.
- $wpdb->query("ALTER TABLE $wpdb->options DROP INDEX option_name");
</del><ins>+ // Drop the old option_name index. dbDelta() doesn't do the drop.
+ $wpdb->query("ALTER TABLE $wpdb->options DROP INDEX option_name");
+ }
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ?>
</span></span></pre></div>
<a id="trunkwpincludesversionphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/version.php (12216 => 12217)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/version.php 2009-11-19 16:35:17 UTC (rev 12216)
+++ trunk/wp-includes/version.php 2009-11-19 16:42:07 UTC (rev 12217)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @global int $wp_db_version
</span><span class="cx"> */
</span><del>-$wp_db_version = 12208;
</del><ins>+$wp_db_version = 12217;
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Holds the TinyMCE version
</span></span></pre>
</div>
</div>
</body>
</html>