X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=update.php;h=5ab321b335f5720154bf1f965ec30270bc651313;hb=947b6073b1920dfcb7de273dd6dae9b1ff3d7458;hp=9c55f15cf554f4acfc66bca388b59e2ff30e59ba;hpb=1d35d1e5a1c807ea391d7958657b13a6bb471a0b;p=friendica.git

diff --git a/update.php b/update.php
index 9c55f15cf5..5ab321b335 100644
--- a/update.php
+++ b/update.php
@@ -1,6 +1,6 @@
 <?php
 
-define( 'UPDATE_VERSION' , 1076 );
+define( 'UPDATE_VERSION' , 1138 );
 
 /**
  *
@@ -623,4 +623,593 @@ function update_1075() {
 			);
 		}
 	}
-}
\ No newline at end of file
+}
+
+function update_1076() {
+	q("CREATE TABLE `guid` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+		`guid` CHAR( 16 ) NOT NULL , INDEX ( `guid` ) ) ENGINE = MYISAM ");
+
+}
+
+// There was a typo in 1076 so we'll try again in 1077 to make sure
+// We'll also make it big enough to allow for future growth, I seriously 
+// doubt Diaspora will be able to leave guids at 16 bytes,
+// and we can also use the same structure for our own larger guids
+
+function update_1077() {
+	q("CREATE TABLE IF NOT EXISTS `guid` ( `id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+		`guid` CHAR( 16 ) NOT NULL , INDEX ( `guid` ) ) ENGINE = MYISAM ");
+
+	q("ALTER TABLE `guid` CHANGE `guid` `guid` CHAR( 64 ) NOT NULL"); 
+}
+
+function update_1078() {
+	q("ALTER TABLE `item` ADD `guid` CHAR( 64 ) NOT NULL AFTER `id` , ADD INDEX ( `guid` ) ");
+}
+
+function update_1079() {
+	q("CREATE TABLE IF NOT EXISTS `sign` (
+	`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+	`iid` INT UNSIGNED NOT NULL ,
+	`signed_text` MEDIUMTEXT NOT NULL ,
+	`signature` TEXT NOT NULL ,
+	`signer` CHAR( 255 ) NOT NULL ,
+	INDEX ( `iid` )
+	) ENGINE = MYISAM ");
+
+	q("ALTER TABLE `fcontact` ADD `nick` CHAR( 255 ) NOT NULL ,
+	ADD `addr` CHAR( 255 ) NOT NULL ,
+	ADD `notify` CHAR( 255 ) NOT NULL ,
+	ADD `poll` CHAR( 255 ) NOT NULL ,
+	ADD `confirm` CHAR( 255 ) NOT NULL ,
+	ADD `priority` TINYINT( 1 ) NOT NULL ,
+	ADD `network` CHAR( 32 ) NOT NULL ,
+	ADD `alias` CHAR( 255 ) NOT NULL ,
+	ADD `pubkey` TEXT NOT NULL ,
+	ADD INDEX ( `addr` ) , 
+	ADD INDEX ( `network` ) ");
+
+}
+
+function update_1080() {
+	q("ALTER TABLE `fcontact` ADD `updated` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00'");
+}
+
+function update_1081() {
+	// there was a typo in update 1081 so it was corrected and moved up to 1082
+}
+
+function update_1082() {
+	q("ALTER TABLE `photo` ADD `guid` CHAR( 64 ) NOT NULL AFTER `contact-id`,
+		ADD INDEX ( `guid` )  ");
+	// make certain the following code is only executed once
+	$r = q("select `id` from `photo` where `guid` != '' limit 1");
+	if($r && count($r))
+		return;
+	$r = q("SELECT distinct(`resource-id`) FROM `photo` WHERE 1 group by `id`");
+	if(count($r)) {
+		foreach($r as $rr) {
+			$guid = get_guid();
+			q("update `photo` set `guid` = '%s' where `resource-id` = '%s'",
+				dbesc($guid),
+				dbesc($rr['resource-id'])
+			);
+		}
+	}
+}
+
+function update_1083() {
+	q("CREATE TABLE IF NOT EXISTS `deliverq` (
+	`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+	`cmd` CHAR( 32 ) NOT NULL ,
+	`item` INT NOT NULL ,
+	`contact` INT NOT NULL
+	) ENGINE = MYISAM ");
+
+}
+
+function update_1084() {
+	q("ALTER TABLE `contact` ADD `attag` CHAR( 255 ) NOT NULL AFTER `nick` ");
+}
+
+function update_1085() {
+	q("CREATE TABLE IF NOT EXISTS `search` (
+	`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+	`uid` INT NOT NULL ,
+	`term` CHAR( 255 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL,
+	INDEX ( `uid` ),
+	INDEX ( `term` )
+	) ENGINE = MYISAM ");
+}
+
+function update_1086() {
+	q("ALTER TABLE `item` ADD `bookmark` tinyint(1) NOT NULL DEFAULT '0' AFTER `starred` ");
+}
+
+function update_1087() {
+	q("ALTER TABLE `item` ADD `commented` datetime NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `edited` ");
+
+	$r = q("SELECT `id` FROM `item` WHERE `parent` = `id` ");
+	if(count($r)) {
+		foreach($r as $rr) {
+			$x = q("SELECT max(`created`) AS `cdate` FROM `item` WHERE `parent` = %d LIMIT 1",
+				intval($rr['id'])
+			);
+			if(count($x))
+				q("UPDATE `item` SET `commented` = '%s' WHERE `id` = %d LIMIT 1",
+					dbesc($x[0]['cdate']),
+					intval($rr['id'])
+				);
+		}
+	}
+}
+
+function update_1088() {
+	q("ALTER TABLE `user` ADD `account_expired` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `expire` ,
+		ADD `account_expires_on` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `account_expired` ,
+		ADD `expire_notification_sent` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `account_expires_on` ");
+}
+
+function update_1089() {
+	q("ALTER TABLE `user` ADD `blocktags` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `hidewall` ");
+}
+
+function update_1090() {
+	q("ALTER TABLE `contact` ADD `batch` char(255) NOT NULL AFTER `prvkey` ");
+
+	q("UPDATE `contact` SET `batch` = concat(substring_index(`url`,'/',3),'/receive/public') WHERE `network` = 'dspr' ");
+
+}
+
+function update_1091() {
+
+	// catch a few stragglers that may have crept in before we added this on remote connects
+	q("UPDATE `contact` SET `batch` = concat(substring_index(`url`,'/',3),'/receive/public') WHERE `network` = 'dspr' AND `batch` = '' ");
+	q("ALTER TABLE `queue` ADD `batch` TINYINT( 1 ) NOT NULL DEFAULT '0' ");
+	q("ALTER TABLE `fcontact` ADD `batch` char(255) NOT NULL AFTER `addr` ");
+
+}
+
+function update_1092() {
+	q("ALTER TABLE `user` ADD INDEX ( `login_date` ) ");
+	q("ALTER TABLE `user` ADD INDEX ( `account_expired` ) ");
+}
+
+function update_1093() {
+	q("CREATE TABLE IF NOT EXISTS `fserver` (
+	`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+	`server` CHAR( 255 ) NOT NULL ,
+	`posturl` CHAR( 255 ) NOT NULL ,
+	`key` TEXT NOT NULL,
+	INDEX ( `server` )
+	) ENGINE = MYISAM ");
+
+	q("ALTER TABLE `group` ADD `visible` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `uid` ");
+
+}
+
+function update_1094() {
+	q("ALTER TABLE `item` ADD `postopts` TEXT NOT NULL AFTER `target` ");
+}
+
+function update_1095() {
+	q("ALTER TABLE `contact` ADD `bd` DATE NOT NULL AFTER `bdyear` ");
+}
+
+function update_1096() {
+	q("ALTER TABLE `item` ADD `origin` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `deleted` , ADD INDEX ( `origin` ) ");
+}
+
+function update_1097() {
+	q("ALTER TABLE `queue` 
+		ADD INDEX (`cid`), 
+		ADD INDEX (`created`), 
+		ADD INDEX (`last`), 
+		ADD INDEX (`network`), 
+		ADD INDEX (`batch`) 
+	");
+}
+
+function update_1098() {
+	q("ALTER TABLE `contact` 
+		ADD INDEX (`network`), 
+		ADD INDEX (`name`), 
+		ADD INDEX (`nick`), 
+		ADD INDEX (`attag`), 
+		ADD INDEX (`url`),
+		ADD INDEX (`addr`), 
+		ADD INDEX (`batch`) 
+	");
+}
+
+function update_1099() {
+	q("CREATE TABLE IF NOT EXISTS `gcontact` (
+	`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+	`name` CHAR( 255 ) NOT NULL ,
+	`url` CHAR( 255 ) NOT NULL ,
+	`nurl` CHAR( 255 ) NOT NULL ,
+	`photo` CHAR( 255 ) NOT NULL
+	) ENGINE = MYISAM ");
+
+	q("CREATE TABLE IF NOT EXISTS `glink` (
+	`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+	`cid` INT NOT NULL ,
+	`uid` INT NOT NULL ,
+	`gcid` INT NOT NULL,
+	`updated` DATETIME NOT NULL
+	) ENGINE = MYISAM ");
+
+	q("ALTER TABLE `gcontact` ADD INDEX (`nurl`) ");
+	q("ALTER TABLE `glink` ADD INDEX (`cid`), ADD INDEX (`uid`), ADD INDEX (`gcid`), ADD INDEX (`updated`) ");
+
+	q("ALTER TABLE `contact` ADD `poco` TEXT NOT NULL AFTER `confirm` "); 
+
+}
+
+function update_1100() {
+	q("ALTER TABLE `contact` ADD `nurl` CHAR( 255 ) NOT NULL AFTER `url` ");
+	q("alter table contact add index (`nurl`) ");
+
+	require_once('include/text.php');
+
+	$r = q("select id, url from contact where url != '' and nurl = '' ");
+	if(count($r)) {
+		foreach($r as $rr) {
+			q("update contact set nurl = '%s' where id = %d limit 1",
+				dbesc(normalise_link($rr['url'])),
+				intval($rr['id'])
+			); 
+		}
+	}
+}
+
+
+function update_1101() {
+	q("CREATE TABLE IF NOT EXISTS `gcign` (
+	`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+	`uid` INT NOT NULL ,
+	`gcid` INT NOT NULL
+	) ENGINE = MYISAM ");
+
+	q("ALTER TABLE `gcign` ADD INDEX (`uid`), ADD INDEX (`gcid`) ");
+}
+
+function update_1102() {
+	q("ALTER TABLE `clients` ADD `name` TEXT NULL DEFAULT NULL AFTER `redirect_uri` "); 
+	q("ALTER TABLE `clients` ADD `icon` TEXT NULL DEFAULT NULL AFTER `name` "); 
+	q("ALTER TABLE `clients` ADD `uid` INT NOT NULL DEFAULT 0 AFTER `icon` "); 
+
+	q("ALTER TABLE `tokens` ADD `secret` TEXT NOT NULL AFTER `id` "); 
+	q("ALTER TABLE `tokens` ADD `uid` INT NOT NULL AFTER `scope` "); 
+}
+
+
+function update_1103() {
+//	q("ALTER TABLE `item` ADD INDEX ( `wall` ) ");
+	q("ALTER TABLE `item` ADD FULLTEXT ( `tag` ) "); 
+	q("ALTER TABLE `contact` ADD INDEX ( `pending` ) ");
+	q("ALTER TABLE `user` ADD INDEX ( `hidewall` ) ");
+	q("ALTER TABLE `user` ADD INDEX ( `blockwall` ) ");
+	q("ALTER TABLE `user` ADD INDEX ( `blocked` ) ");
+	q("ALTER TABLE `user` ADD INDEX ( `verified` ) ");
+
+}
+
+function update_1104() {
+	q("ALTER TABLE `item` ADD `forum_mode` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `origin` , ADD INDEX ( `forum_mode` ) ");
+
+}
+
+function update_1105() {
+	q("ALTER TABLE `mail` ADD `convid` INT NOT NULL AFTER `contact-id` ");
+	q("ALTER TABLE `mail` ADD `guid` CHAR( 64 ) NOT NULL AFTER `uid` ");
+
+	q("CREATE TABLE IF NOT EXISTS `conv` (
+	`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+	`guid` CHAR( 64 ) NOT NULL ,
+	`recips` MEDIUMTEXT NOT NULL ,
+	`uid` INT NOT NULL
+	) ENGINE = MYISAM ");
+}
+
+
+function update_1106() {
+	q("ALTER TABLE `item` ADD INDEX ( `author-link` ) ");
+
+}
+
+function update_1107() {
+	q("ALTER TABLE `item` ADD INDEX ( `bookmark` ) ");
+
+}
+
+function update_1108() { 
+	q("ALTER TABLE `contact` ADD `hidden` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `writable` ,
+ADD INDEX ( `hidden` ) ");
+
+}
+
+function update_1109() {
+	q("ALTER TABLE `conv` ADD `creator` CHAR( 255 ) NOT NULL ,
+		ADD `created` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+		ADD `updated` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00',
+		ADD `subject` MEDIUMTEXT NOT NULL,
+		ADD INDEX ( `created` ), ADD INDEX ( `updated` ) ");
+}
+
+function update_1110() {
+	q("ALTER TABLE `mail` ADD `reply` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `seen`,
+		ADD INDEX ( `reply` ), ADD INDEX ( `uid` ), ADD INDEX ( `guid` ), ADD INDEX ( `seen` ),
+		ADD INDEX ( `uri` ), ADD INDEX ( `parent-uri`), ADD INDEX ( `created` ), ADD INDEX ( `convid` ) ");
+
+}
+
+function update_1111() {
+	q("ALTER TABLE `gcontact` ADD `connect` CHAR( 255 ) NOT NULL ");
+}
+
+
+function update_1112() {
+
+	q("CREATE TABLE IF NOT EXISTS `notify` (
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`type` INT( 11 ) NOT NULL ,
+`name` CHAR( 255 ) NOT NULL ,
+`url` CHAR( 255 ) NOT NULL ,
+`photo` CHAR( 255 ) NOT NULL ,
+`date` DATETIME NOT NULL ,
+`msg` MEDIUMTEXT NOT NULL ,
+`uid` INT NOT NULL ,
+`link` CHAR( 255 ) NOT NULL ,
+`seen` TINYINT( 1 ) NOT NULL DEFAULT '0'
+) ENGINE = MYISAM ");
+
+	q("ALTER TABLE `notify` ADD INDEX ( `type` ), ADD INDEX ( `uid`), ADD INDEX (`seen`), ADD INDEX (`date`) ");
+
+}
+
+function update_1113() {
+	q("ALTER TABLE `notify` ADD `verb` CHAR( 255 ) NOT NULL ,
+ADD `otype` CHAR( 16 ) NOT NULL");
+}
+
+function update_1114() {
+	q("CREATE TABLE IF NOT EXISTS `item_id` (
+`iid` INT NOT NULL ,
+`uid` INT NOT NULL ,
+`face` CHAR( 255 ) NOT NULL ,
+`dspr` CHAR( 255 ) NOT NULL ,
+`twit` CHAR( 255 ) NOT NULL ,
+`stat` CHAR( 255 ) NOT NULL ,
+PRIMARY KEY ( `iid` ),
+INDEX ( `uid` ),
+INDEX ( `face` ),
+INDEX ( `dspr` ),
+INDEX ( `twit` ),
+INDEX ( `stat` )
+) ENGINE = MYISAM ");
+
+}
+
+function update_1115() {
+	q("ALTER TABLE `item` ADD `moderated` 
+		TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `pubmail`, 
+		ADD INDEX (`moderated`) ");
+}
+
+function update_1116() {
+	//typo! corrected update was rolled forward
+}
+
+function update_1117() {
+q("create table if not exists `manage` (
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`uid` INT NOT NULL ,
+`mid` INT NOT NULL,
+INDEX ( `uid` ),
+INDEX ( `mid` )
+) ENGINE = MYISAM ");
+
+}
+
+function update_1118() {
+	// rolled forward
+}
+
+function update_1119() {
+q("ALTER TABLE `contact` ADD `closeness` TINYINT( 2 ) NOT NULL DEFAULT '99' AFTER `reason` , ADD INDEX (`closeness`) ");
+q("update contact set closeness = 0 where self = 1");
+q("ALTER TABLE `item` ADD `spam` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `visible` , ADD INDEX (`spam`) ");
+}
+
+
+function update_1120() {
+
+	// item table update from 1119 did not get into database.sql file.
+	// might be missing on new installs. We'll check.
+
+	$r = q("describe item");
+	if($r && count($r)) {
+		foreach($r as $rr)
+			if($rr['Field'] == 'spam')
+				return;
+	}
+	q("ALTER TABLE `item` ADD `spam` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `visible` , ADD INDEX (`spam`) ");
+
+}
+
+function update_1121() {
+	q("CREATE TABLE IF NOT EXISTS `poll_result` (
+	`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+	`poll_id` INT NOT NULL ,
+	`choice` INT NOT NULL ,
+	INDEX ( `poll_id` ),
+	INDEX ( `choice` )
+	) ENGINE = MYISAM ");
+
+	q("CREATE TABLE IF NOT EXISTS `poll` (
+	`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+	`uid` INT NOT NULL ,
+	`q0` MEDIUMTEXT NOT NULL ,
+	`q1` MEDIUMTEXT NOT NULL ,
+	`q2` MEDIUMTEXT NOT NULL ,
+	`q3` MEDIUMTEXT NOT NULL ,
+	`q4` MEDIUMTEXT NOT NULL ,
+	`q5` MEDIUMTEXT NOT NULL ,
+	`q6` MEDIUMTEXT NOT NULL ,
+	`q7` MEDIUMTEXT NOT NULL ,
+	`q8` MEDIUMTEXT NOT NULL ,
+	`q9` MEDIUMTEXT NOT NULL ,
+	INDEX ( `uid` )
+	) ENGINE = MYISAM ");
+
+}
+
+function update_1122() {
+q("ALTER TABLE `notify` ADD `hash` CHAR( 64 ) NOT NULL AFTER `id` ,
+ADD INDEX ( `hash` ) ");
+}
+
+function update_1123() {
+set_config('system','allowed_themes','dispy,quattro,testbubble,vier,darkbubble,darkzero,duepuntozero,greenzero,purplezero,quattro-green,slackr');
+}
+
+function update_1124() {
+q("alter table item add index (`author-name`) ");
+}
+
+function update_1125() {
+  q("CREATE TABLE IF NOT EXISTS `notify-threads` (
+  `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+  `notify-id` INT NOT NULL,
+  `master-parent-item` INT( 10 ) unsigned NOT NULL DEFAULT '0',
+  `parent-item` INT( 10 ) unsigned NOT NULL DEFAULT '0',
+  `receiver-uid` INT NOT NULL,
+  INDEX ( `master-parent-item` ),
+  INDEX ( `receiver-uid` )
+  ) ENGINE = MyISAM DEFAULT CHARSET=utf8");
+}
+
+function update_1126() {
+	q("ALTER TABLE `mailacct` ADD `action` INT NOT NULL AFTER `pass`,
+		ADD `movetofolder` CHAR(255) NOT NULL AFTER `action`");
+}
+
+function update_1127() {
+	q("CREATE TABLE IF NOT EXISTS `spam` (
+  `id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+  `uid` INT NOT NULL,
+  `spam` INT NOT NULL DEFAULT '0',
+  `ham` INT NOT NULL DEFAULT '0',
+  `term` CHAR(255) NOT NULL,
+  INDEX ( `uid` ),
+  INDEX ( `spam` ),
+  INDEX ( `ham` ),
+  INDEX ( `term` )
+  ) ENGINE = MyISAM DEFAULT CHARSET=utf8");
+}
+
+
+function update_1128() {
+	q("alter table spam add `date` DATETIME NOT NULL DEFAULT '0000-00-00 00:00:00' AFTER `term` ");
+}
+
+function update_1129() {
+	q("ALTER TABLE `notify` ADD `parent` INT NOT NULL AFTER `link` , ADD INDEX ( `parent` ), ADD INDEX ( `link` ), ADD INDEX ( `otype` ) ");
+}
+
+function update_1130() {
+	q("ALTER TABLE `item` ADD `file` MEDIUMTEXT NOT NULL AFTER `inform`, ADD FULLTEXT KEY (`file`) ");
+}
+
+function update_1131() {
+	q("ALTER TABLE `contact` ADD `forum` TINYINT( 1 ) NOT NULL DEFAULT '0' AFTER `writable` , ADD INDEX ( `forum` ) ");
+}
+
+
+function update_1132() {
+	q("CREATE TABLE IF NOT EXISTS `userd` (
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`username` CHAR( 255 ) NOT NULL,
+INDEX ( `username` )
+) ENGINE = MYISAM ");
+
+}
+
+function update_1133() {
+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` ) ");
+}
+
+function update_1134() {
+	// faulty update merged forward
+	// had a hardwired tablename of 'friendica' which isn't the right name on most systems
+}
+
+function update_1135() {
+	//there can't be indexes with more than 1000 bytes in mysql, 
+	//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"); 
+	
+	//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` )"); 
+
+}
+
+
+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`) ");
+}
+