Changeset 19040

Timestamp:

10/21/2011 10:35:33 PM (15 years ago)

Author:

nacin

Message:

Have dbDelta() loop through tables it knows about, rather than loop through a potentially expensive and definitely unnecessary SHOW TABLES. fixes #17998.

File:

• trunk/wp-admin/includes/upgrade.php (modified) (3 diffs)

trunk/wp-admin/includes/upgrade.php

@@ -1460 +1460 @@
         $iqueries = apply_filters( 'dbdelta_insert_queries', $iqueries );
 
-        // Check to see which tables and fields exist
-        if ($tables = $wpdb->get_col('SHOW TABLES;')) {
-                // For every table in the database
-                $global_tables = $wpdb->tables( 'global' );
-                foreach ($tables as $table) {
-                        // Upgrade global tables only for the main site. Don't upgrade at all if DO_NOT_UPGRADE_GLOBAL_TABLES is defined.
-                        if ( in_array( $table, $global_tables ) && ( !is_main_site() || defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) )
-                                continue;
-
-                        // If a table query exists for the database table...
-                        if ( array_key_exists(strtolower($table), $cqueries) ) {
+        $global_tables = $wpdb->tables( 'global' );
+        foreach ( $cqueries as $table => $qry ) {
+                // Upgrade global tables only for the main site. Don't upgrade at all if DO_NOT_UPGRADE_GLOBAL_TABLES is defined.
+                if ( in_array( $table, $global_tables ) && ( !is_main_site() || defined( 'DO_NOT_UPGRADE_GLOBAL_TABLES' ) ) )
+                        continue;
+
+                // Fetch the table column structure from the database
+                $wpdb->suppress_errors();
+                $tablefields = $wpdb->get_results("DESCRIBE {$table};");
+                $wpdb->suppress_errors( false );
+
+                if ( ! $tablefields )
+                        continue;
+
                                 // Clear the field and index arrays
                                 $cfields = $indices = array();
                                 // Get all of the field names in the query from between the parens
-                                preg_match("|\((.*)\)|ms", $cqueries[strtolower($table)], $match2);
+                                preg_match("|\((.*)\)|ms", $qry, $match2);
                                 $qryline = trim($match2[1]);
 
@@ -1508 +1511 @@
                                         }
                                 }
-
-                                // Fetch the table column structure from the database
-                                $tablefields = $wpdb->get_results("DESCRIBE {$table};");
 
                                 // For every field in the table
@@ -1608 +1608 @@
                                 }
 
-                                // Remove the original table creation query from processing
-                                unset($cqueries[strtolower($table)]);
-                                unset($for_update[strtolower($table)]);
-                        } else {
-                                // This table exists in the database, but not in the creation queries?
-                        }
-                }
+                // Remove the original table creation query from processing
+                unset( $cqueries[ $table ], $for_update[ $table ] );
         }