Move conversation table initialization to upgrade script

diff --git a/scripts/init_conversation.php b/scripts/init_conversation.php
deleted file mode 100755 (executable)
index 675e7ca..0000000
--- a/scripts/init_conversation.php
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env php
-<?php
-/*
- * StatusNet - the distributed open-source microblogging tool
- * Copyright (C) 2008, 2009, StatusNet, Inc.
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-
-require_once INSTALLDIR.'/scripts/commandline.inc';
-
-common_log(LOG_INFO, 'Initializing conversation table...');
-
-$notice = new Notice();
-$notice->query('select distinct conversation from notice');
-
-while ($notice->fetch()) {
-    $id = $notice->conversation;
-
-    if ($id) {
-        $uri = common_local_url('conversation', array('id' => $id));
-
-        // @fixme db_dataobject won't save our value for an autoincrement
-        // so we're bypassing the insert wrappers
-        $conv = new Conversation();
-        $sql = "insert into conversation (id,uri,created) values(%d,'%s','%s')";
-        $sql = sprintf($sql,
-                       $id,
-                       $conv->escape($uri),
-                       $conv->escape(common_sql_now()));
-        echo "$id ";
-        $conv->query($sql);
-        print "... ";
-    }
-}
-print "done.\n";

diff --git a/scripts/upgrade.php b/scripts/upgrade.php
index 6878d0e52d7b917385667d99f92ce009be43029b..64bc5da0e598d49b869af2314e563aa8ffc115d0 100755 (executable)
--- a/scripts/upgrade.php
+++ b/scripts/upgrade.php
@@ -40,6 +40,7 @@ function main()
 
     fixupNoticeRendered();
     fixupNoticeConversation();
+    initConversation();
     fixupGroupURI();
 }
 
@@ -153,4 +154,33 @@ function fixupGroupURI()
     printfnq("DONE.\n");
 }
 
+function initConversation()
+{
+    printfnq("Ensuring all conversations have a row in conversation table...");
+
+    $notice = new Notice();
+    $notice->query('select distinct notice.conversation from notice '.
+                   'where notice.conversation is not null '.
+                   'and not exists (select conversation.id from conversation where id = notice.conversation)');
+
+    while ($notice->fetch()) {
+
+        $id = $notice->conversation;
+
+        $uri = common_local_url('conversation', array('id' => $id));
+
+        // @fixme db_dataobject won't save our value for an autoincrement
+        // so we're bypassing the insert wrappers
+        $conv = new Conversation();
+        $sql = "insert into conversation (id,uri,created) values(%d,'%s','%s')";
+        $sql = sprintf($sql,
+                       $id,
+                       $conv->escape($uri),
+                       $conv->escape(common_sql_now()));
+        $conv->query($sql);
+    }
+
+    printfnq("DONE.\n");
+}
+
 main();