Merge https://github.com/friendica/friendica into pull

[friendica.git] / update.php

diff --git a/update.php b/update.php
index c41acf6fbcf5e8d8c9d86209dae9e4f02f53ae3e..1bea71f4d7ded1d63e7692200439115f88d709a0 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1155 );
+define( 'UPDATE_VERSION' , 1158 );
 
 /**
  *
@@ -1345,8 +1345,44 @@ function update_1153() {
 }
 
 function update_1154() {
-       $r = q("UPDATE `item` SET `thr-parent`=`parent-uri` WHERE `id`!=`parent` AND `thr-parent`=''");
-       
+       $r = q("ALTER TABLE `event` ADD `ignore` TINYINT( 1 ) UNSIGNED NOT NULL DEFAULT '0' AFTER `adjust` , ADD INDEX ( `ignore` )");
+
        if(!$r) return UPDATE_FAILED;
        return UPDATE_SUCCESS;
 }
+
+function update_1155() {
+       $r1 = q("ALTER TABLE `item_id` DROP PRIMARY KEY");
+       $r2 = q("ALTER TABLE `item_id` ADD `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST");
+       $r3 = q("ALTER TABLE `item_id` ADD INDEX ( `iid` ) ");
+
+       if($r1 && $r2 && $r3)
+               return UPDATE_SUCCESS;
+
+       return UPDATE_FAILED;
+}
+
+function update_1156() {
+       $r = q("ALTER TABLE `photo` ADD `datasize` INT UNSIGNED NOT NULL DEFAULT '0' AFTER `width` ,
+ADD INDEX ( `datasize` ) ");
+
+       if(!$r) return UPDATE_FAILED;
+       return UPDATE_SUCCESS;
+}
+
+function update_1157() {
+       $r = q("CREATE TABLE  IF NOT EXISTS `dsprphotoq` (
+         `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+         `uid` int(11) NOT NULL,
+         `msg` mediumtext NOT NULL,
+         `attempt` tinyint(4) NOT NULL,
+         PRIMARY KEY (`id`)
+         ) ENGINE=MyISAM DEFAULT CHARSET=utf8"
+       );
+
+       if($r)
+               return UPDATE_SUCCESS;
+
+       return UPDATE_FAILED;
+}
+