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

[friendica.git] / update.php

diff --git a/update.php b/update.php
index f793b89dd59edb6ab8d7711e66c52a757341dbac..35a6771b00e99f1aa64775c25eadccd05d4c608d 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1141 );
+define( 'UPDATE_VERSION' , 1148 );
 
 /**
  *
@@ -1137,8 +1137,8 @@ INDEX ( `username` )
 }
 
 function update_1133() {
-q("ALTER TABLE `user` ADD `unkmail` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocktags` , ADD INDEX ( `unkmail` ) ");\r
-q("ALTER TABLE `user` ADD `cntunkmail` INT NOT NULL DEFAULT '10' AFTER `unkmail` , ADD INDEX ( `cntunkmail` ) ");\r
+q("ALTER TABLE `user` ADD `unkmail` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `blocktags` , ADD INDEX ( `unkmail` ) ");
+q("ALTER TABLE `user` ADD `cntunkmail` INT NOT NULL DEFAULT '10' AFTER `unkmail` , ADD INDEX ( `cntunkmail` ) ");
 q("ALTER TABLE `mail` ADD `unknown` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `replied` , ADD INDEX ( `unknown` ) ");
 }
 
@@ -1229,4 +1229,57 @@ function update_1140() {
        if(! $r)
                return UPDATE_FAILED ;
        return UPDATE_SUCCESS ;
-}
\ No newline at end of file
+}
+
+function update_1141() {
+       $r = q("alter table glink add zcid int(11) not null after gcid, add index(zcid) ");
+       if(! $r)
+               return UPDATE_FAILED ;
+       return UPDATE_SUCCESS ;
+}
+
+
+function update_1142() {
+       $r = q("alter table user add service_class char(32) not null after expire_notification_sent, add index(service_class) ");
+       if(! $r)
+               return UPDATE_FAILED ;
+       return UPDATE_SUCCESS ;
+}
+
+function update_1143() {
+       $r = q("alter table user add def_gid int(11) not null default '0' after service_class");
+       if(! $r)
+               return UPDATE_FAILED ;
+       return UPDATE_SUCCESS ;
+}
+
+function update_1144() {
+       $r = q("alter table contact add prv tinyint(1) not null default '0' after forum");
+       if(! $r)
+               return UPDATE_FAILED ;
+       return UPDATE_SUCCESS ;
+}
+
+function update_1145() {
+       $r = q("alter table profile add howlong datetime not null default '0000-00-00 00:00:00' after `with`");
+       if(! $r)
+               return UPDATE_FAILED ;
+       return UPDATE_SUCCESS ;
+}
+
+function update_1146() {
+       $r = q("alter table profile add hometown char(255) not null after `country-name`, add index ( `hometown` ) ");
+       if(! $r)
+               return UPDATE_FAILED ;
+       return UPDATE_SUCCESS ;
+}
+
+function update_1147() {
+       $r1 = q("ALTER TABLE `sign` ALTER `iid` SET DEFAULT '0'");
+       $r2 = q("ALTER TABLE `sign` ADD `retract_iid` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `iid`");
+       $r3 = q("ALTER TABLE `sign` ADD INDEX ( `retract_iid` )");  
+       if((! $r1) || (! $r2) || (! $r3))
+               return UPDATE_FAILED ;
+       return UPDATE_SUCCESS ;
+}
+