Opps, PEAR sucks. Need to call find() before fetch() ... :-(

[quix0rs-gnu-social.git] / scripts / upgrade.php

diff --git a/scripts/upgrade.php b/scripts/upgrade.php
index 902a1aa85d8c622bcfc728f898e8aede8a5e9f2f..ec859e8f43e4c4eb033e305763ebff3c181e7b8b 100644 (file)
--- a/scripts/upgrade.php
+++ b/scripts/upgrade.php
@@ -29,11 +29,13 @@ Upgrade database schema and data to latest software
 
 END_OF_UPGRADE_HELP;
 
-require_once INSTALLDIR.'/scripts/commandline.inc';
+require_once INSTALLDIR.'/scripts/commandline.inc.php';
 
 function main()
 {
     if (Event::handle('StartUpgrade')) {
+        fixupConversationURIs();
+
         updateSchemaCore();
         updateSchemaPlugins();
 
@@ -51,7 +53,6 @@ function main()
         initLocalGroup();
         initNoticeReshare();
     
-        initFaveURI();
         initSubscriptionURI();
         initGroupMemberURI();
 
@@ -200,6 +201,29 @@ function initConversation()
     printfnq("DONE.\n");
 }
 
+function fixupConversationURIs()
+{
+    printfnq("Ensuring all conversations have a URI...");
+
+    $conv = new Conversation();
+    $conv->whereAdd('uri IS NULL');
+
+    if ($conv->find()) {
+        $rounds = 0;
+        while ($conv->fetch()) {
+            $uri = common_local_url('conversation', array('id' => $conv->id));
+            $sql = sprintf('UPDATE conversation SET uri="%1$s" WHERE id="%2$d";',
+                            $conv->escape($uri), $conv->id);
+            $conv->query($sql);
+            if (($conv->N-++$rounds) % 500 == 0) {
+                printfnq(sprintf(' %d items left...', $conv->N-$rounds));
+            }
+        }
+    }
+
+    printfnq("DONE.\n");
+}
+
 function initGroupProfileId()
 {
     printfnq("Ensuring all User_group entries have a Profile and profile_id...");
@@ -292,35 +316,6 @@ function initNoticeReshare()
     printfnq("DONE.\n");
 }
 
-function initFaveURI() 
-{
-    printfnq("Ensuring all faves have a URI...");
-
-    $fave = new Fave();
-    $fave->whereAdd('uri IS NULL');
-
-    if ($fave->find()) {
-        while ($fave->fetch()) {
-            try {
-                $fave->decache();
-                $fave->query(sprintf('update fave '.
-                                     'set uri = "%s", '.
-                                     '    modified = "%s" '.
-                                     'where user_id = %d '.
-                                     'and notice_id = %d',
-                                     Fave::newURI($fave->user_id, $fave->notice_id, $fave->modified),
-                                     common_sql_date(strtotime($fave->modified)),
-                                     $fave->user_id,
-                                     $fave->notice_id));
-            } catch (Exception $e) {
-                common_log(LOG_ERR, "Error updated fave URI: " . $e->getMessage());
-            }
-        }
-    }
-
-    printfnq("DONE.\n");
-}
-
 function initSubscriptionURI()
 {
     printfnq("Ensuring all subscriptions have a URI...");