better code for only inserting inboxes that don't already exist

darcs-hash:20081114074511-84dde-af2b2e5deee20bdf1ea72559411716cb756d2866.gz

diff --git a/scripts/fixup_inboxes.php b/scripts/fixup_inboxes.php
index 79cca5c7cd58fc62a009b898433c4b202275ec05..7bee347a4709c32acff4db68231461e412f7640b 100755 (executable)
--- a/scripts/fixup_inboxes.php
+++ b/scripts/fixup_inboxes.php
@@ -50,18 +50,15 @@ $cache = common_memcache();
 while ($user->fetch()) {
     common_log(LOG_INFO, 'Updating inbox for user ' . $user->id);
        $user->query('BEGIN');
-       $inbox = new Notice_inbox();
-       $inbox->user_id = $user->id;
-       $result = $inbox->delete();
-       if (is_null($result) || $result === false) {
-               common_log_db_error($inbox, 'DELETE', __FILE__);
-               continue;
-       }
        $result = $inbox->query('INSERT LOW_PRIORITY INTO notice_inbox (user_id, notice_id, created) ' .
                                                        'SELECT ' . $user->id . ', notice.id, notice.created ' .
                                                        'FROM subscription JOIN notice ON subscription.subscribed = notice.profile_id ' .
                                                        'WHERE subscription.subscriber = ' . $user->id . ' ' .
-                                                       'AND notice.created >= subscription.created');
+                                                       'AND notice.created >= subscription.created ' . 
+                                                       'AND NOT EXISTS (SELECT user_id, notice_id ' .
+                                                       'FROM notice_inbox ' .
+                                                       'WHERE user_id = ' . $user->id . ' ' . 
+                                                       'AND notice_id = notice.id)');
        if (is_null($result) || $result === false) {
                common_log_db_error($inbox, 'INSERT', __FILE__);
                continue;