Merge pull request #803 from annando/master

[friendica.git] / update.php

diff --git a/update.php b/update.php
index 2ab2f300c04a3be538d50dc5abe3ee175e29fd88..2d2d2d178b7c5bcfe320bfc8f5a796ca31a596a8 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1159 );
+define( 'UPDATE_VERSION' , 1165 );
 
 /**
  *
@@ -1371,16 +1371,6 @@ ADD INDEX ( `datasize` ) ");
 }
 
 function update_1157() {
-<<<<<<< HEAD
-       $r = q("ALTER TABLE `term` ADD `aid` int(10) unsigned NOT NULL DEFAULT '0',
-               ADD `uid` int(10) unsigned NOT NULL DEFAULT '0',
-               ADD INDEX (`uid`),
-               ADD INDEX (`aid`)");
-
-       if(!$r) return UPDATE_FAILED;
-       return UPDATE_SUCCESS;
-}
-function update_1158() {
        $r = q("CREATE TABLE  IF NOT EXISTS `dsprphotoq` (
          `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
          `uid` int(11) NOT NULL,
@@ -1390,6 +1380,20 @@ function update_1158() {
          ) ENGINE=MyISAM DEFAULT CHARSET=utf8"
        );
 
+       if($r)
+               return UPDATE_SUCCESS;
+}
+
+function update_1158() {
+       set_config('system', 'maintenance', 1);
+
+       // Wait for 15 seconds for current requests to
+       // clear before locking up the database
+       sleep(15);
+
+       $r = q("CREATE INDEX event_id ON item(`event-id`)");
+       set_config('system', 'maintenance', 0);
+
        if($r)
                return UPDATE_SUCCESS;
 
@@ -1402,13 +1406,106 @@ function update_1159() {
                ADD INDEX (`uid`),
                ADD INDEX (`aid`)");
 
-       if(!$r) return UPDATE_FAILED;
+       if(!$r)
+               return UPDATE_FAILED;
+
        return UPDATE_SUCCESS;
 }
 
 function update_1160() {
+       set_config('system', 'maintenance', 1);
+
+       // Wait for 15 seconds for current requests to
+       // clear before locking up the database
+       sleep(15);
+
        $r = q("ALTER TABLE `item` ADD `mention` TINYINT(1) NOT NULL DEFAULT '0', ADD INDEX (`mention`)");
-// KEY `mention` (`mention`)
-       if(!$r) return UPDATE_FAILED;
+       set_config('system', 'maintenance', 0);
+
+       if(!$r)
+               return UPDATE_FAILED;
+
+       return UPDATE_SUCCESS;
+}
+
+function update_1161() {
+       $r = q("ALTER TABLE `pconfig` ADD INDEX (`cat`)");
+
+       if(!$r)
+               return UPDATE_FAILED;
+
+       return UPDATE_SUCCESS;
+}
+
+function update_1162() {
+       require_once('include/tags.php');
+       update_items();
+
+       return UPDATE_SUCCESS;
+}
+
+function update_1163() {
+       set_config('system', 'maintenance', 1);
+
+       $r = q("ALTER TABLE `item` ADD `network` char(32) NOT NULL,
+               ADD INDEX (`network`)");
+
+       set_config('system', 'maintenance', 0);
+
+       if(!$r)
+               return UPDATE_FAILED;
+
+       return UPDATE_SUCCESS;
+}
+function update_1164() {
+       set_config('system', 'maintenance', 1);
+
+       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '' AND `contact`.`uid` = `item`.`uid`)",
+               NETWORK_DFRN);
+
+       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
+               NETWORK_DFRN, NETWORK_DFRN);
+
+       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
+               NETWORK_ZOT, NETWORK_ZOT);
+
+       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
+               NETWORK_OSTATUS, NETWORK_OSTATUS);
+
+       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
+               NETWORK_FEED, NETWORK_FEED);
+
+       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
+               NETWORK_DIASPORA, NETWORK_DIASPORA);
+
+       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
+               NETWORK_MAIL, NETWORK_MAIL);
+
+       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
+               NETWORK_MAIL2, NETWORK_MAIL2);
+
+       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
+               NETWORK_FACEBOOK, NETWORK_FACEBOOK);
+
+       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
+               NETWORK_LINKEDIN, NETWORK_LINKEDIN);
+
+       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
+               NETWORK_XMPP, NETWORK_XMPP);
+
+       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
+               NETWORK_MYSPACE, NETWORK_MYSPACE);
+
+       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
+               NETWORK_GPLUS, NETWORK_GPLUS);
+
+       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
+               NETWORK_PUMPIO, NETWORK_PUMPIO);
+
+       $r = q("UPDATE `item` SET `network`='%s' WHERE `contact-id` IN (SELECT `id` FROM`contact` WHERE `network` = '%s' AND `contact`.`uid` = `item`.`uid`)",
+               NETWORK_TWITTER, NETWORK_TWITTER);
+
+       set_config('system', 'maintenance', 0);
+
        return UPDATE_SUCCESS;
 }