<!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>[54384] trunk: Database: Correct MariaDB version check in `wpdb::has_cap()`.</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/54384">54384</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/54384","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-10-04 15:39:28 +0000 (Tue, 04 Oct 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: Correct MariaDB version check in `wpdb::has_cap()`.
MariaDB version is reported differently between PHP versions:
* PHP 8.0.16 or later: `10.6.8-MariaDB`
* PHP 8.0.15 or earlier: `5.5.5-10.6.8-MariaDB`
The latter includes PHP 7.4.x and PHP 5.6.x as well, where the version is also reported with the `5.5.5-` prefix.
This commit makes an adjustment to `wpdb::has_cap()` to check for the correct MariaDB version.
This resolves an issue where the `utf8mb4_unicode_520_ci` collation, which is available in MariaDB since version 10.2, was previously not detected correctly.
References:
* [https://github.com/php/php-src/issues/7972 php-src: <a href="https://core.trac.wordpress.org/ticket/7972">#7972</a>: MariaDB version prefix 5.5.5- is not stripped]
* [https://github.com/php/php-src/pull/7963 php-src: PR <a href="https://core.trac.wordpress.org/ticket/7963">#7963</a> Fix GH-7932: MariaDB version prefix not always stripped]
* [https://mariadb.com/docs/reference/mdb/collations/utf8mb4_unicode_520_ci/ MariaDB Documentation: utf8mb4_unicode_520_ci]
Follow-up to <a href="https://core.trac.wordpress.org/changeset/37523">[37523]</a>, <a href="https://core.trac.wordpress.org/changeset/53919">[53919]</a>.
Props jamieburchell, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/54841">#54841</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpdbphp">trunk/src/wp-includes/class-wpdb.php</a></li>
<li><a href="#trunktestsphpunittestsdbcharsetphp">trunk/tests/phpunit/tests/db/charset.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpdbphp"></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/class-wpdb.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wpdb.php 2022-10-04 15:04:52 UTC (rev 54383)
+++ trunk/src/wp-includes/class-wpdb.php 2022-10-04 15:39:28 UTC (rev 54384)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3960,17 +3960,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @return bool True when the database feature is supported, false otherwise.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function has_cap( $db_cap ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $version = $this->db_version();
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $db_version = $this->db_version();
+ $db_server_info = $this->db_server_info();
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Account for MariaDB version being prefixed with '5.5.5-' on older PHP versions.
+ if ( '5.5.5' === $db_version && str_contains( $db_server_info, 'MariaDB' )
+ && PHP_VERSION_ID < 80016 // PHP 8.0.15 or older.
+ ) {
+ // Strip the '5.5.5-' prefix and set the version to the correct value.
+ $db_server_info = preg_replace( '/^5\.5\.5-(.*)/', '$1', $db_server_info );
+ $db_version = preg_replace( '/[^0-9.].*/', '', $db_server_info );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> switch ( strtolower( $db_cap ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'collation': // @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> case 'group_concat': // @since 2.7.0
</span><span class="cx" style="display: block; padding: 0 10px"> case 'subqueries': // @since 2.7.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return version_compare( $version, '4.1', '>=' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return version_compare( $db_version, '4.1', '>=' );
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'set_charset':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return version_compare( $version, '5.0.7', '>=' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return version_compare( $db_version, '5.0.7', '>=' );
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'utf8mb4': // @since 4.1.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( version_compare( $version, '5.5.3', '<' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( version_compare( $db_version, '5.5.3', '<' ) ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return false;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $this->use_mysqli ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3990,7 +4000,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return version_compare( $client_version, '5.5.3', '>=' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> case 'utf8mb4_520': // @since 4.6.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return version_compare( $version, '5.6', '>=' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return version_compare( $db_version, '5.6', '>=' );
</ins><span class="cx" style="display: block; padding: 0 10px"> case 'identifier_placeholders': // @since 6.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="cx" style="display: block; padding: 0 10px"> * As of WordPress 6.1, wpdb::prepare() supports identifiers via '%i',
</span></span></pre></div>
<a id="trunktestsphpunittestsdbcharsetphp"></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/db/charset.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/db/charset.php 2022-10-04 15:04:52 UTC (rev 54383)
+++ trunk/tests/phpunit/tests/db/charset.php 2022-10-04 15:39:28 UTC (rev 54384)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -47,7 +47,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::$db_server_info = self::$_wpdb->db_server_info();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // Account for MariaDB version being prefixed with '5.5.5-' on older PHP versions.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( str_contains( self::$db_server_info, 'MariaDB' ) && '5.5.5' === self::$db_version
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( '5.5.5' === self::$db_version && str_contains( self::$db_server_info, 'MariaDB' )
</ins><span class="cx" style="display: block; padding: 0 10px"> && PHP_VERSION_ID < 80016 // PHP 8.0.15 or older.
</span><span class="cx" style="display: block; padding: 0 10px"> ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Strip the '5.5.5-' prefix and set the version to the correct value.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1189,4 +1189,20 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> self::$_wpdb->set_charset( self::$_wpdb->dbh );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 54841
+ */
+ public function test_mariadb_supports_utf8mb4_520() {
+ global $wpdb;
+
+ // utf8mb4_520 is available in MariaDB since version 10.2.
+ if ( ! str_contains( self::$db_server_info, 'MariaDB' )
+ || version_compare( self::$db_version, '10.2', '<' )
+ ) {
+ $this->markTestSkipped( 'This test requires MariaDB 10.2 or later.' );
+ }
+
+ $this->assertTrue( $wpdb->has_cap( 'utf8mb4_520' ) );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>