Ticket #10404: 10404.patch_case_insensitive_key_matching

Index: upgrade.php
===================================================================
--- upgrade.php (revision 26270)
+++ upgrade.php (working copy)
@@ -1501,15 +1501,15 @@
 }
 
 /**
- * {@internal Missing Short Description}}
+ * Create or update database tables based on analyis of SQL queries provided.
  *
  * {@internal Missing Long Description}}
  *
  * @since 1.5.0
  *
- * @param unknown_type $queries
- * @param unknown_type $execute
- * @return unknown
+ * @param string[] $queries single string or array of strings representing SQL queries
+ * @param boolean $execute
+ * @return string[]
  */
 function dbDelta( $queries = '', $execute = true ) {
        global $wpdb;
@@ -1577,7 +1577,11 @@
                        preg_match("|^([^ ]*)|", trim($fld), $fvals);
                        $fieldname = trim( $fvals[1], '`' );
 
-                       // Verify the found field name
+                       // Verify the found field name,
+            //
+            // Field names do NOT have index commands on the query line.
+            // Put those lines into the indices array for later inspection.
+            //
                        $validfield = true;
                        switch (strtolower($fieldname)) {
                        case '':
@@ -1587,7 +1591,7 @@
                        case 'unique':
                        case 'key':
                                $validfield = false;
-                               $indices[] = trim(trim($fld), ", \n");
+                               $indices[] = strtoupper(trim(trim($fld), ", \n"));
                                break;
                        }
                        $fld = trim($fld);
@@ -1679,11 +1683,11 @@
                                }
                                // Add the column list to the index create string
                                $index_string .= ' ('.$index_columns.')';
-                               if (!(($aindex = array_search($index_string, $indices)) === false)) {
+                               if (!(($aindex = array_search(strtoupper($index_string), $indices)) === false)) {
                                        unset($indices[$aindex]);
                                        //echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br />Found index:".$index_string."</pre>\n";
                                }
-                               //else echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br /><b>Did not find index:</b>".$index_string."<br />".print_r($indices, true)."</pre>\n";
+                               //else echo "<pre style=\"border:1px solid #ccc;margin-top:5px;\">{$table}:<br /><b>Did not find index:</b>".strtoupper($index_string)."<br />".print_r($indices, true)."</pre>\n";
                        }
                }