Changeset 6129

Timestamp:

11/30/2016 02:21:32 PM (8 years ago)

Author:

johnjamesjacoby

Message:

Converter: Set maximum key index length to 191.

Fixes bug where table would not be created because utf8mb4 character sets do not have room for that many bytes.

(Also, pass query as an array into dbDelta() so it doesn't need to do the work for us anymore.)

See #3026. (Trunk, for 2.6)

File:

• trunk/src/includes/admin/converter.php (modified) (2 diffs)

trunk/src/includes/admin/converter.php

@@ -650 +650 @@
         }
 
+        $sql = array();
+        $max_index_length = 191;
+
         /** Translator ****************************************************/
 
-        $sql = "CREATE TABLE {$table_name} (
+        $sql[] = "CREATE TABLE {$table_name} (
                     meta_id mediumint(8) unsigned not null auto_increment,
                     value_type varchar(25) null,
@@ -658 +661 @@
                     meta_key varchar(255) null,
                     meta_value varchar(255) null,
-                PRIMARY KEY  (meta_id),
+                PRIMARY KEY (meta_id),
                     KEY value_id (value_id),
-                    KEY meta_join (meta_key, meta_value) ) {$charset_collate};";
+                    KEY meta_join (meta_key({$max_index_length}), meta_value({$max_index_length}))
+                ) {$charset_collate};";
 
         dbDelta( $sql );