Merge pull request #317 from CatoTH/master

[friendica.git] / update.php

diff --git a/update.php b/update.php
index 0c8486c316e35cf824a21d4e30963af6445a3535..f25d16f9df13e6411381181a0f32725c7e606363 100644 (file)
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1136 );
+define( 'UPDATE_VERSION' , 1144 );
 
 /**
  *
@@ -1152,12 +1152,106 @@ function update_1135() {
        //so change charset to be smaller
        q("ALTER TABLE `config` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
 CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); 
-       //and add the index
-       q("ALTER TABLE `config` ADD UNIQUE `access` ( `cat` , `k` ) "); 
        
        //same thing for pconfig
        q("ALTER TABLE `pconfig` CHANGE `cat` `cat` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL ,
        CHANGE `k` `k` CHAR( 255 ) CHARACTER SET ascii COLLATE ascii_general_ci NOT NULL"); 
-       
+       // faulty update merged forward. Bad update in 1134 caused duplicate k,cat pairs
+       // these have to be cleared before the unique keys can be added.        
+}
+
+function update_1136() {
+
+       $arr = array();
+
+       // order in reverse so that we save the newest entry
+
+       $r = q("select * from config where 1 order by id desc");
+       if(count($r)) {
+               foreach($r as $rr) {
+                       $found = false;
+                       foreach($arr as $x) {
+                               if($x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
+                                       $found = true;
+                                       q("delete from config where id = %d limit 1",
+                                               intval($rr['id'])
+                                       );
+                               }
+                       }
+                       if(! $found) {
+                               $arr[] = $rr;
+                       }
+               }
+       }
+                       
+       $arr = array();
+       $r = q("select * from pconfig where 1 order by id desc");
+       if(count($r)) {
+               foreach($r as $rr) {
+                       $found = false;
+                       foreach($arr as $x) {
+                               if($x['uid'] == $rr['uid'] && $x['cat'] == $rr['cat'] && $x['k'] == $rr['k']) {
+                                       $found = true;
+                                       q("delete from pconfig where id = %d limit 1",
+                                               intval($rr['id'])
+                                       );
+                               }
+                       }
+                       if(! $found) {
+                               $arr[] = $rr;
+                       }
+               }
+       }
+       q("ALTER TABLE `config` ADD UNIQUE `access` ( `cat` , `k` ) "); 
        q("ALTER TABLE `pconfig` ADD UNIQUE `access` ( `uid` , `cat` , `k` )"); 
-}
\ No newline at end of file
+
+}
+
+
+function update_1137() {
+       q("alter table item_id DROP `face` , DROP `dspr` , DROP `twit` , DROP `stat` ");
+       q("ALTER TABLE `item_id` ADD `sid` CHAR( 255 ) NOT NULL AFTER `uid` , ADD `service` CHAR( 255 ) NOT NULL AFTER `sid` , add index (`sid`), add index ( `service`) ");
+}
+
+function update_1138() {
+       q("alter table contact add archive tinyint(1) not null default '0' after hidden, add index (archive)");
+}
+
+function update_1139() {
+       $r = q("alter table user add account_removed tinyint(1) not null default '0' after expire, add index(account_removed) ");
+       if(! $r)
+               return UPDATE_FAILED ;
+       return UPDATE_SUCCESS ;
+}
+
+function update_1140() {
+       $r = q("alter table addon add hidden tinyint(1) not null default '0' after installed, add index(hidden) ");
+       if(! $r)
+               return UPDATE_FAILED ;
+       return UPDATE_SUCCESS ;
+}
+
+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 ;
+}
+
+
+