<!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" />
<title>[60497] trunk/src: Multisite: Enforce consistent types on ID columns in multisite database tables, to better allow for foreign keys to more reliably be defined between them.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { 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 { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#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>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/60497">60497</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/60497","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnjamesjacoby</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-07-22 17:46:31 +0000 (Tue, 22 Jul 2025)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Multisite: Enforce consistent types on ID columns in multisite database tables, to better allow for foreign keys to more reliably be defined between them.
This change adjusts the install & upgrade routines so all of ID-based database columns in the multisite database tables are `unsigned`, bringing them up-to-speed with ID-based columns in single-site tables.
Additionally, the `$wp_db_version` number is bumped, and the `pre_schema_upgrade()` upgrade function is modified to accommodate & use that new version.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/10852">[10852]</a>.
Props spacedmonkey, johnjamesjacoby.
Fixes <a href="https://core.trac.wordpress.org/ticket/40418">#40418</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpincludesversionphp">trunk/src/wp-includes/version.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesschemaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/schema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/schema.php 2025-07-22 16:23:35 UTC (rev 60496)
+++ trunk/src/wp-admin/includes/schema.php 2025-07-22 17:46:31 UTC (rev 60497)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -245,8 +245,8 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Multisite global tables.
</span><span class="cx" style="display: block; padding: 0 10px"> $ms_global_tables = "CREATE TABLE $wpdb->blogs (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- blog_id bigint(20) NOT NULL auto_increment,
- site_id bigint(20) NOT NULL default '0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ blog_id bigint(20) unsigned NOT NULL auto_increment,
+ site_id bigint(20) unsigned NOT NULL default '0',
</ins><span class="cx" style="display: block; padding: 0 10px"> domain varchar(200) NOT NULL default '',
</span><span class="cx" style="display: block; padding: 0 10px"> path varchar(100) NOT NULL default '',
</span><span class="cx" style="display: block; padding: 0 10px"> registered datetime NOT NULL default '0000-00-00 00:00:00',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,7 +263,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ) $charset_collate;
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE $wpdb->blogmeta (
</span><span class="cx" style="display: block; padding: 0 10px"> meta_id bigint(20) unsigned NOT NULL auto_increment,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- blog_id bigint(20) NOT NULL default '0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ blog_id bigint(20) unsigned NOT NULL default '0',
</ins><span class="cx" style="display: block; padding: 0 10px"> meta_key varchar(255) default NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> meta_value longtext,
</span><span class="cx" style="display: block; padding: 0 10px"> PRIMARY KEY (meta_id),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -271,16 +271,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> KEY blog_id (blog_id)
</span><span class="cx" style="display: block; padding: 0 10px"> ) $charset_collate;
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE $wpdb->registration_log (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ID bigint(20) NOT NULL auto_increment,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ID bigint(20) unsigned NOT NULL auto_increment,
</ins><span class="cx" style="display: block; padding: 0 10px"> email varchar(255) NOT NULL default '',
</span><span class="cx" style="display: block; padding: 0 10px"> IP varchar(30) NOT NULL default '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- blog_id bigint(20) NOT NULL default '0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ blog_id bigint(20) unsigned NOT NULL default '0',
</ins><span class="cx" style="display: block; padding: 0 10px"> date_registered datetime NOT NULL default '0000-00-00 00:00:00',
</span><span class="cx" style="display: block; padding: 0 10px"> PRIMARY KEY (ID),
</span><span class="cx" style="display: block; padding: 0 10px"> KEY IP (IP)
</span><span class="cx" style="display: block; padding: 0 10px"> ) $charset_collate;
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE $wpdb->site (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint(20) NOT NULL auto_increment,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) unsigned NOT NULL auto_increment,
</ins><span class="cx" style="display: block; padding: 0 10px"> domain varchar(200) NOT NULL default '',
</span><span class="cx" style="display: block; padding: 0 10px"> path varchar(100) NOT NULL default '',
</span><span class="cx" style="display: block; padding: 0 10px"> PRIMARY KEY (id),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -287,8 +287,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> KEY domain (domain(140),path(51))
</span><span class="cx" style="display: block; padding: 0 10px"> ) $charset_collate;
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE $wpdb->sitemeta (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- meta_id bigint(20) NOT NULL auto_increment,
- site_id bigint(20) NOT NULL default '0',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ meta_id bigint(20) unsigned NOT NULL auto_increment,
+ site_id bigint(20) unsigned NOT NULL default '0',
</ins><span class="cx" style="display: block; padding: 0 10px"> meta_key varchar(255) default NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> meta_value longtext,
</span><span class="cx" style="display: block; padding: 0 10px"> PRIMARY KEY (meta_id),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -296,7 +296,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> KEY site_id (site_id)
</span><span class="cx" style="display: block; padding: 0 10px"> ) $charset_collate;
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE $wpdb->signups (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- signup_id bigint(20) NOT NULL auto_increment,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ signup_id bigint(20) unsigned NOT NULL auto_increment,
</ins><span class="cx" style="display: block; padding: 0 10px"> domain varchar(200) NOT NULL default '',
</span><span class="cx" style="display: block; padding: 0 10px"> path varchar(100) NOT NULL default '',
</span><span class="cx" style="display: block; padding: 0 10px"> title longtext NOT NULL,
</span></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php 2025-07-22 16:23:35 UTC (rev 60496)
+++ trunk/src/wp-admin/includes/upgrade.php 2025-07-22 17:46:31 UTC (rev 60497)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3711,7 +3711,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Multisite schema upgrades.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $wp_current_db_version < 25448 && is_multisite() && wp_should_upgrade_global_tables() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( $wp_current_db_version < 60497 && is_multisite() && wp_should_upgrade_global_tables() ) {
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Upgrade versions prior to 3.7.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_current_db_version < 25179 ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3725,6 +3725,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived varchar(1) NOT NULL default '0'" );
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query( "ALTER TABLE $wpdb->blogs CHANGE COLUMN archived archived tinyint(2) NOT NULL default 0" );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Upgrade versions prior to 6.9
+ if ( $wp_current_db_version < 60497 ) {
+ // Convert ID columns from signed to unsigned
+ $wpdb->query( "ALTER TABLE $wpdb->blogs MODIFY blog_id bigint(20) unsigned NOT NULL auto_increment" );
+ $wpdb->query( "ALTER TABLE $wpdb->blogs MODIFY site_id bigint(20) unsigned NOT NULL default 0" );
+ $wpdb->query( "ALTER TABLE $wpdb->blogmeta MODIFY blog_id bigint(20) unsigned NOT NULL default 0" );
+ $wpdb->query( "ALTER TABLE $wpdb->registration_log MODIFY ID bigint(20) unsigned NOT NULL auto_increment" );
+ $wpdb->query( "ALTER TABLE $wpdb->registration_log MODIFY blog_id bigint(20) unsigned NOT NULL default 0" );
+ $wpdb->query( "ALTER TABLE $wpdb->site MODIFY id bigint(20) unsigned NOT NULL auto_increment" );
+ $wpdb->query( "ALTER TABLE $wpdb->sitemeta MODIFY meta_id bigint(20) unsigned NOT NULL auto_increment" );
+ $wpdb->query( "ALTER TABLE $wpdb->sitemeta MODIFY site_id bigint(20) unsigned NOT NULL default 0" );
+ $wpdb->query( "ALTER TABLE $wpdb->signups MODIFY signup_id bigint(20) unsigned NOT NULL auto_increment" );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Upgrade versions prior to 4.2.
</span></span></pre></div>
<a id="trunksrcwpincludesversionphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/version.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/version.php 2025-07-22 16:23:35 UTC (rev 60496)
+++ trunk/src/wp-includes/version.php 2025-07-22 17:46:31 UTC (rev 60497)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global int $wp_db_version
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$wp_db_version = 60421;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$wp_db_version = 60497;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Holds the TinyMCE version.
</span></span></pre>
</div>
</div>
</body>
</html>