Changeset 1229

Timestamp:

05/05/2004 08:00:13 AM (22 years ago)

Author:

saxmatt

Message:

Upgrades should run faster now.

Location:

trunk/wp-admin

Files:

• upgrade-functions.php (modified) (2 diffs)
• upgrade.php (modified) (2 diffs)

trunk/wp-admin/upgrade-functions.php

@@ -554 +554 @@
         }
         // Get the title and ID of every post, post_name to check if it already has a value
-        $posts = $wpdb->get_results("SELECT ID, post_title, post_name FROM $tableposts");
-        foreach($posts as $post) {
-                if ('' == $post->post_name) { 
-                        $newtitle = sanitize_title($post->post_title);
-                        $wpdb->query("UPDATE $tableposts SET post_name = '$newtitle' WHERE ID = '$post->ID'");
+        $posts = $wpdb->get_results("SELECT ID, post_title, post_name FROM $tableposts WHERE post_name = ''");
+        if ($posts) {
+                foreach($posts as $post) {
+                        if ('' == $post->post_name) { 
+                                $newtitle = sanitize_title($post->post_title);
+                                $wpdb->query("UPDATE $tableposts SET post_name = '$newtitle' WHERE ID = '$post->ID'");
+                        }
                 }
         }
@@ -624 +626 @@
                 )
                 ");
-        $allposts = $wpdb->get_results("SELECT ID, post_category FROM $tableposts");
-        foreach ($allposts as $post) {
-                // Check to see if it's already been imported
-                $cat = $wpdb->get_row("SELECT * FROM $tablepost2cat WHERE post_id = $post->ID AND category_id = $post->post_category");
-                if (!$cat && 0 != $post->post_category) { // If there's no result
-                        $wpdb->query("
-                                INSERT INTO $tablepost2cat
-                                (post_id, category_id)
-                                VALUES
-                                ('$post->ID', '$post->post_category')
-                                ");
-                }
-        }
+
+        $done_ids = $wpdb->get_results("SELECT DISTINCT post_id FROM $tablepost2cat");
+        if ($done_ids) :
+                foreach ($done_ids as $done_id) :
+                        $done_posts[] = $done_id->post_id;
+                endforeach;
+                $catwhere = ' AND ID NOT IN (' . implode(',', $done_posts) . ')';
+        else:
+                $catwhere = '';
+        endif;
+        
+        $allposts = $wpdb->get_results("SELECT ID, post_category FROM $tableposts WHERE post_category != '0' $catwhere");
+        if ($allposts) :
+                foreach ($allposts as $post) {
+                        // Check to see if it's already been imported
+                        $cat = $wpdb->get_row("SELECT * FROM $tablepost2cat WHERE post_id = $post->ID AND category_id = $post->post_category");
+                        if (!$cat && 0 != $post->post_category) { // If there's no result
+                                $wpdb->query("
+                                        INSERT INTO $tablepost2cat
+                                        (post_id, category_id)
+                                        VALUES
+                                        ('$post->ID', '$post->post_category')
+                                        ");
+                        }
+                }
+        endif;
 }
 

trunk/wp-admin/upgrade.php

@@ -3 +3 @@
 if (!file_exists('../wp-config.php')) die("There doesn't seem to be a wp-config.php file. Double check that you updated wp-config-sample.php with the proper database connection information and renamed it to wp-config.php.");
 require('../wp-config.php');
+timer_start();
 require('upgrade-functions.php');
 
@@ -55 +56 @@
 <h2>Step 1</h2> 
 <p>There's actually only one step. So if you see this, you're done. <a href="../">Have fun</a>! </p>
+
+<!--
+<pre>
+<?php echo $wpdb->num_queries; ?> queries
+
+<?php timer_stop(1); ?> seconds
+</pre>
+-->
+
 <?php
         break;