<!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>[53897] trunk: Database: Ignore display width for integer data types in `dbDelta()` on MySQL 8.0.17 or later.</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/53897">53897</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/53897","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-08-15 13:16:22 +0000 (Mon, 15 Aug 2022)</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'>Database: Ignore display width for integer data types in `dbDelta()` on MySQL 8.0.17 or later.
MySQL 8.0.17 deprecated the display width attribute for integer data types:
> As of MySQL 8.0.17, the `ZEROFILL` attribute is deprecated for numeric data types, as is the display width attribute for integer data types. You should expect support for `ZEROFILL` and display widths for integer data types to be removed in a future version of MySQL. Consider using an alternative means of producing the effect of these attributes. For example, applications can use the `LPAD()` function to zero-pad numbers up to the desired width, or they can store the formatted numbers in `CHAR` columns.
In practice, this means that display width is removed for integer types when creating a table:
* `BIGINT(20)` {U+2192} `BIGINT`
* `INT(11)` {U+2192} `INT`
* `MEDIUMINT(9)` {U+2192} `MEDIUMINT`
* `SMALLINT(6)` {U+2192} `SMALLINT`
* `TINYINT(4)` {U+2192} `TINYINT`
Note: This only applies specifically to MySQL 8.0.17 or later. In MariaDB, display width for integer types is still available and expected.
This commit ensures that `dbDelta()`, which relies on the `DESCRIBE` SQL command to get the existing table structure and field types, when running on MySQL 8.0.17 or later, does not unnecessarily attempt to convert `BIGINT` fields back to `BIGINT(20)`, `INT` back to `INT(11)`, etc. When comparing the field type in the query with the existing field type, if display width is the only difference, it can be safely ignored to match MySQL behavior.
The change is covered by existing `dbDelta()` unit tests:
* A test for not altering `wp_get_db_schema()` queries on an existing install using MySQL 8.0.17+ now passes.
* More than twenty tests which previously failed on PHP 8.0.x + MariaDB due to incorrect expectations, caused by MariaDB version reporting not being consistent between PHP versions, now pass.
References:
* [https://dev.mysql.com/doc/refman/8.0/en/numeric-type-attributes.html MySQL: Nymeric Type Attributes]
* [https://mariadb.com/kb/en/data-types-numeric-data-types/ MariaDB: Numeric Data Types]
Follow-up to <a href="https://core.trac.wordpress.org/changeset/1575">[1575]</a>, <a href="https://core.trac.wordpress.org/changeset/18899">[18899]</a>, <a href="https://core.trac.wordpress.org/changeset/37525">[37525]</a>, <a href="https://core.trac.wordpress.org/changeset/47183">[47183]</a>, <a href="https://core.trac.wordpress.org/changeset/47184">[47184]</a>.
Props SergeyBiryukov, pbearne, leewillis77, JavierCasares, desrosj, costdev, johnbillion.
Fixes <a href="https://core.trac.wordpress.org/ticket/49364">#49364</a>. See <a href="https://core.trac.wordpress.org/ticket/51740">#51740</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunktestsphpunittestsdbdeltaphp">trunk/tests/phpunit/tests/dbdelta.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<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 2022-08-14 02:12:22 UTC (rev 53896)
+++ trunk/src/wp-admin/includes/upgrade.php 2022-08-15 13:16:22 UTC (rev 53897)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2713,6 +2713,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Useful for creating new tables and updating existing tables to a new structure.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.1.0 Ignores display width for integer data types on MySQL 8.0.17 or later,
+ * to match MySQL behavior. Note: This does not affect MariaDB.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2789,8 +2791,12 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $text_fields = array( 'tinytext', 'text', 'mediumtext', 'longtext' );
</span><span class="cx" style="display: block; padding: 0 10px"> $blob_fields = array( 'tinyblob', 'blob', 'mediumblob', 'longblob' );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $int_fields = array( 'tinyint', 'smallint', 'mediumint', 'int', 'integer', 'bigint' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $global_tables = $wpdb->tables( 'global' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $global_tables = $wpdb->tables( 'global' );
+ $db_version = $wpdb->db_version();
+ $db_server_info = $wpdb->db_server_info();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> foreach ( $cqueries as $table => $qry ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Upgrade global tables only for the main site. Don't upgrade at all if conditions are not optimal.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( in_array( $table, $global_tables, true ) && ! wp_should_upgrade_global_tables() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2948,6 +2954,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $tablefield_field_lowercased = strtolower( $tablefield->Field );
</span><span class="cx" style="display: block; padding: 0 10px"> $tablefield_type_lowercased = strtolower( $tablefield->Type );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $tablefield_type_without_parentheses = preg_replace(
+ '/'
+ . '(.+)' // Field type, e.g. `int`.
+ . '\(\d*\)' // Display width.
+ . '(.*)' // Optional attributes, e.g. `unsigned`.
+ . '/',
+ '$1$2',
+ $tablefield_type_lowercased
+ );
+
+ // Get the type without attributes, e.g. `int`.
+ $tablefield_type_base = strtok( $tablefield_type_without_parentheses, ' ' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // If the table field exists in the field array...
</span><span class="cx" style="display: block; padding: 0 10px"> if ( array_key_exists( $tablefield_field_lowercased, $cfields ) ) {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2956,6 +2975,19 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $fieldtype = $matches[1];
</span><span class="cx" style="display: block; padding: 0 10px"> $fieldtype_lowercased = strtolower( $fieldtype );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $fieldtype_without_parentheses = preg_replace(
+ '/'
+ . '(.+)' // Field type, e.g. `int`.
+ . '\(\d*\)' // Display width.
+ . '(.*)' // Optional attributes, e.g. `unsigned`.
+ . '/',
+ '$1$2',
+ $fieldtype_lowercased
+ );
+
+ // Get the type without attributes, e.g. `int`.
+ $fieldtype_base = strtok( $fieldtype_without_parentheses, ' ' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Is actual field type different from the field type in query?
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $tablefield->Type != $fieldtype ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $do_change = true;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2971,6 +3003,21 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( in_array( $fieldtype_base, $int_fields, true ) && in_array( $tablefield_type_base, $int_fields, true )
+ && $fieldtype_without_parentheses === $tablefield_type_without_parentheses
+ ) {
+ /*
+ * MySQL 8.0.17 or later does not support display width for integer data types,
+ * so if display width is the only difference, it can be safely ignored.
+ * Note: This is specific to MySQL and does not affect MariaDB.
+ */
+ if ( version_compare( $db_version, '8.0.17', '>=' )
+ && ! str_contains( $db_server_info, 'MariaDB' )
+ ) {
+ $do_change = false;
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $do_change ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Add a query to change the column type.
</span><span class="cx" style="display: block; padding: 0 10px"> $cqueries[] = "ALTER TABLE {$table} CHANGE COLUMN `{$tablefield->Field}` " . $cfields[ $tablefield_field_lowercased ];
</span></span></pre></div>
<a id="trunktestsphpunittestsdbdeltaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/dbdelta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/dbdelta.php 2022-08-14 02:12:22 UTC (rev 53896)
+++ trunk/tests/phpunit/tests/dbdelta.php 2022-08-15 13:16:22 UTC (rev 53897)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,21 +22,32 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected $db_engine = '';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Display width for BIGINT data type.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The database server version.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Prior to MySQL 8.0.17, default width of 20 digits was used: BIGINT(20).
- * Since MySQL 8.0.17, display width for integer data types is no longer supported.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @var string
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- protected $bigint_display_width = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ private static $db_version;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Full database server information.
+ *
+ * @var string
+ */
+ private static $db_server_info;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Make sure the upgrade code is loaded before the tests are run.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public static function set_up_before_class() {
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::set_up_before_class();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> require_once ABSPATH . 'wp-admin/includes/upgrade.php';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ self::$db_version = $wpdb->db_version();
+ self::$db_server_info = $wpdb->db_server_info();
</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"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,24 +57,17 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $db_version = $wpdb->db_version();
-
- if ( version_compare( $db_version, '5.7', '<' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( version_compare( self::$db_version, '5.7', '<' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> // Prior to MySQL 5.7, InnoDB did not support FULLTEXT indexes, so MyISAM is used instead.
</span><span class="cx" style="display: block; padding: 0 10px"> $this->db_engine = 'ENGINE=MyISAM';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( version_compare( $db_version, '8.0.17', '<' ) ) {
- // Prior to MySQL 8.0.17, default width of 20 digits was used: BIGINT(20).
- $this->bigint_display_width = '(20)';
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> $wpdb->query(
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->prepare(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (" .
</span><span class="cx" style="display: block; padding: 0 10px"> // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -70,7 +74,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> PRIMARY KEY (id),
</span><span class="cx" style="display: block; padding: 0 10px"> KEY key_1 (column_1(%d)),
</span><span class="cx" style="display: block; padding: 0 10px"> KEY compound_key (id,column_1(%d)),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- FULLTEXT KEY fulltext_key (column_1)" .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ FULLTEXT KEY fulltext_key (column_1)' .
</ins><span class="cx" style="display: block; padding: 0 10px"> // phpcs:ignore WordPress.DB.PreparedSQL.InterpolatedNotPrepared
</span><span class="cx" style="display: block; padding: 0 10px"> ") {$this->db_engine}
</span><span class="cx" style="display: block; padding: 0 10px"> ",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,7 +113,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "CREATE TABLE {$wpdb->prefix}dbdelta_create_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> PRIMARY KEY (id)
</span><span class="cx" style="display: block; padding: 0 10px"> );"
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -144,7 +148,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> PRIMARY KEY (id),
</span><span class="cx" style="display: block; padding: 0 10px"> KEY key_1 (column_1($this->max_index_length)),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -163,7 +167,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // id: bigint => int(11)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // id: bigint(20) => int(11)
</ins><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -176,10 +180,23 @@
</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">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $bigint_display_width = '(20)';
+
+ /*
+ * MySQL 8.0.17 or later does not support display width for integer data types,
+ * so if display width is the only difference, it can be safely ignored.
+ * Note: This is specific to MySQL and does not affect MariaDB.
+ */
+ if ( version_compare( self::$db_version, '8.0.17', '>=' )
+ && ! str_contains( self::$db_server_info, 'MariaDB' )
+ ) {
+ $bigint_display_width = '';
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->assertSame(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> "{$wpdb->prefix}dbdelta_test.id"
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- => "Changed type of {$wpdb->prefix}dbdelta_test.id from bigint{$this->bigint_display_width} to int(11)",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ => "Changed type of {$wpdb->prefix}dbdelta_test.id from bigint{$bigint_display_width} to int(11)",
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> $updates
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -195,7 +212,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> extra_col longtext,
</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">@@ -230,7 +247,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> PRIMARY KEY (id),
</span><span class="cx" style="display: block; padding: 0 10px"> KEY key_1 (column_1($this->max_index_length)),
</span><span class="cx" style="display: block; padding: 0 10px"> KEY compound_key (id,column_1($this->max_index_length))
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -254,7 +271,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> extra_col longtext,
</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">@@ -306,7 +323,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> PRIMARY KEY (id),
</span><span class="cx" style="display: block; padding: 0 10px"> KEY key_1 (column_1($this->max_index_length)),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,7 +468,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 tinytext,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -476,7 +493,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 tinyblob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -501,7 +518,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 bigtext,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -532,7 +549,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $result = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 mediumblob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -562,7 +579,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $schema = "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test2 (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- `id` bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ `id` bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> `column_1` varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> PRIMARY KEY (id),
</span><span class="cx" style="display: block; padding: 0 10px"> KEY compound_key (id,column_1($this->max_index_length))
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -585,24 +602,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_spatial_indices() {
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $db_version = $wpdb->db_version();
-
- if ( version_compare( $db_version, '5.4', '<' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( version_compare( self::$db_version, '5.4', '<' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->markTestSkipped( 'Spatial indices require MySQL 5.4 and above.' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $geomcollection_name = 'geomcollection';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $geometrycollection_name = 'geometrycollection';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( version_compare( $db_version, '8.0.11', '<' ) ) {
- // Prior to MySQL 8.0.11, GeometryCollection data type name was used.
- $geomcollection_name = 'geometrycollection';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( version_compare( self::$db_version, '8.0.11', '>=' )
+ && ! str_contains( self::$db_server_info, 'MariaDB' )
+ ) {
+ /*
+ * MySQL 8.0.11 or later uses GeomCollection data type name
+ * as the preferred synonym for GeometryCollection.
+ * Note: This is specific to MySQL and does not affect MariaDB.
+ */
+ $geometrycollection_name = 'geomcollection';
</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"> $schema =
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}spatial_index_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- non_spatial bigint{$this->bigint_display_width} unsigned NOT NULL,
- spatial_value {$geomcollection_name} NOT NULL,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ non_spatial bigint(20) unsigned NOT NULL,
+ spatial_value {$geometrycollection_name} NOT NULL,
</ins><span class="cx" style="display: block; padding: 0 10px"> KEY non_spatial (non_spatial),
</span><span class="cx" style="display: block; padding: 0 10px"> SPATIAL KEY spatial_key (spatial_value)
</span><span class="cx" style="display: block; padding: 0 10px"> ) {$this->db_engine};
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -618,9 +639,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $schema =
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}spatial_index_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- non_spatial bigint{$this->bigint_display_width} unsigned NOT NULL,
- spatial_value {$geomcollection_name} NOT NULL,
- spatial_value2 {$geomcollection_name} NOT NULL,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ non_spatial bigint(20) unsigned NOT NULL,
+ spatial_value {$geometrycollection_name} NOT NULL,
+ spatial_value2 {$geometrycollection_name} NOT NULL,
</ins><span class="cx" style="display: block; padding: 0 10px"> KEY non_spatial (non_spatial),
</span><span class="cx" style="display: block; padding: 0 10px"> SPATIAL KEY spatial_key (spatial_value)
</span><span class="cx" style="display: block; padding: 0 10px"> SPATIAL KEY spatial_key2 (spatial_value2)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -648,7 +669,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $schema = "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test2 (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- `id` bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ `id` bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> `references` varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> PRIMARY KEY (`id`),
</span><span class="cx" style="display: block; padding: 0 10px"> KEY `compound_key` (`id`,`references`($this->max_index_length))
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -678,7 +699,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -708,7 +729,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 20263
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function test_wp_get_db_schema_does_no_alter_queries_on_existing_install() {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function test_wp_get_db_schema_does_not_alter_queries_on_existing_install() {
</ins><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta( wp_get_db_schema() );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->assertEmpty( $updates );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -722,7 +743,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $schema = "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -761,7 +782,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -784,7 +805,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $schema = "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -819,7 +840,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -843,7 +864,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -867,7 +888,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -891,7 +912,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -915,7 +936,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -940,7 +961,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -965,7 +986,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -988,7 +1009,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1006,7 +1027,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1024,7 +1045,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $updates = dbDelta(
</span><span class="cx" style="display: block; padding: 0 10px"> "
</span><span class="cx" style="display: block; padding: 0 10px"> CREATE TABLE {$wpdb->prefix}dbdelta_test (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- id bigint{$this->bigint_display_width} NOT NULL AUTO_INCREMENT,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ id bigint(20) NOT NULL AUTO_INCREMENT,
</ins><span class="cx" style="display: block; padding: 0 10px"> column_1 varchar(255) NOT NULL,
</span><span class="cx" style="display: block; padding: 0 10px"> column_2 text,
</span><span class="cx" style="display: block; padding: 0 10px"> column_3 blob,
</span></span></pre>
</div>
</div>
</body>
</html>