Changeset 54384

Timestamp:

10/04/2022 03:39:28 PM (2 years ago)

Author:

SergeyBiryukov

Message:

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:

• ​php-src: #7972: MariaDB version prefix 5.5.5- is not stripped
• ​php-src: PR #7963 Fix GH-7932: MariaDB version prefix not always stripped
• ​MariaDB Documentation: utf8mb4_unicode_520_ci

Follow-up to [37523], [53919].

Props jamieburchell, SergeyBiryukov.
Fixes #54841.

Location:

trunk

Files:

• src/wp-includes/class-wpdb.php (modified) (3 diffs)
• tests/phpunit/tests/db/charset.php (modified) (2 diffs)

trunk/src/wp-includes/class-wpdb.php

@@ -3961 +3961 @@
      */
     public function has_cap( $db_cap ) {
-        $version = $this->db_version();
+        $db_version     = $this->db_version();
+        $db_server_info = $this->db_server_info();
+
+        // 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 );
+        }
 
         switch ( strtolower( $db_cap ) ) {
@@ -3967 +3977 @@
             case 'group_concat': // @since 2.7.0
             case 'subqueries':   // @since 2.7.0
-                return version_compare( $version, '4.1', '>=' );
+                return version_compare( $db_version, '4.1', '>=' );
             case 'set_charset':
-                return version_compare( $version, '5.0.7', '>=' );
+                return version_compare( $db_version, '5.0.7', '>=' );
             case 'utf8mb4':      // @since 4.1.0
-                if ( version_compare( $version, '5.5.3', '<' ) ) {
+                if ( version_compare( $db_version, '5.5.3', '<' ) ) {
                     return false;
                 }
@@ -3991 +4001 @@
                 }
             case 'utf8mb4_520': // @since 4.6.0
-                return version_compare( $version, '5.6', '>=' );
+                return version_compare( $db_version, '5.6', '>=' );
             case 'identifier_placeholders': // @since 6.1.0
                 /*

trunk/tests/phpunit/tests/db/charset.php

@@ -48 +48 @@
 
         // Account for MariaDB version being prefixed with '5.5.5-' on older PHP versions.
-        if ( str_contains( self::$db_server_info, 'MariaDB' ) && '5.5.5' === self::$db_version
+        if ( '5.5.5' === self::$db_version && str_contains( self::$db_server_info, 'MariaDB' )
             && PHP_VERSION_ID < 80016 // PHP 8.0.15 or older.
         ) {
@@ -1190 +1190 @@
         self::$_wpdb->set_charset( self::$_wpdb->dbh );
     }
+
+    /**
+     * @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' ) );
+    }
 }