X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=database.sql;h=7cbe4858a803061c14127776409672b67c844454;hb=fc9dbc0899aed223378be677356cd74e722dfd14;hp=95a163cfbd6f7f009d670d04b779b009ddabbc84;hpb=59ff309ee5113cc4a07be3a1245d679a5952f4d4;p=friendica.git

diff --git a/database.sql b/database.sql
index 95a163cfbd..7cbe4858a8 100644
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
--- Friendica 3.5-dev (Asparagus)
--- DB_UPDATE_VERSION 1200
+-- Friendica 3.5.1-dev (Asparagus)
+-- DB_UPDATE_VERSION 1208
 -- ------------------------------------------
 
 
@@ -31,10 +31,10 @@ CREATE TABLE IF NOT EXISTS `attach` (
 	`data` longblob NOT NULL,
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`allow_cid` mediumtext NOT NULL,
-	`allow_gid` mediumtext NOT NULL,
-	`deny_cid` mediumtext NOT NULL,
-	`deny_gid` mediumtext NOT NULL,
+	`allow_cid` mediumtext,
+	`allow_gid` mediumtext,
+	`deny_cid` mediumtext,
+	`deny_gid` mediumtext,
 	 PRIMARY KEY(`id`)
 ) DEFAULT CHARSET=utf8mb4;
 
@@ -55,11 +55,12 @@ CREATE TABLE IF NOT EXISTS `auth_codes` (
 --
 CREATE TABLE IF NOT EXISTS `cache` (
 	`k` varchar(255) NOT NULL,
-	`v` text NOT NULL,
+	`v` text,
 	`expire_mode` int(11) NOT NULL DEFAULT 0,
 	`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	 PRIMARY KEY(`k`),
-	 INDEX `updated` (`updated`)
+	 PRIMARY KEY(`k`(191)),
+	 INDEX `updated` (`updated`),
+	 INDEX `expire_mode_updated` (`expire_mode`,`updated`)
 ) DEFAULT CHARSET=utf8mb4;
 
 --
@@ -95,9 +96,9 @@ CREATE TABLE IF NOT EXISTS `config` (
 	`id` int(10) unsigned NOT NULL auto_increment,
 	`cat` varchar(255) NOT NULL DEFAULT '',
 	`k` varchar(255) NOT NULL DEFAULT '',
-	`v` text NOT NULL,
+	`v` text,
 	 PRIMARY KEY(`id`),
-	 INDEX `cat_k` (`cat`(30),`k`(30))
+	 UNIQUE INDEX `cat_k` (`cat`(30),`k`(30))
 ) DEFAULT CHARSET=utf8mb4;
 
 --
@@ -115,29 +116,30 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	`name` varchar(255) NOT NULL DEFAULT '',
 	`nick` varchar(255) NOT NULL DEFAULT '',
 	`location` varchar(255) NOT NULL DEFAULT '',
-	`about` text NOT NULL,
-	`keywords` text NOT NULL,
+	`about` text,
+	`keywords` text,
 	`gender` varchar(32) NOT NULL DEFAULT '',
+	`xmpp` varchar(255) NOT NULL DEFAULT '',
 	`attag` varchar(255) NOT NULL DEFAULT '',
 	`avatar` varchar(255) NOT NULL DEFAULT '',
-	`photo` text NOT NULL,
-	`thumb` text NOT NULL,
-	`micro` text NOT NULL,
-	`site-pubkey` text NOT NULL,
+	`photo` text,
+	`thumb` text,
+	`micro` text,
+	`site-pubkey` text,
 	`issued-id` varchar(255) NOT NULL DEFAULT '',
 	`dfrn-id` varchar(255) NOT NULL DEFAULT '',
 	`url` varchar(255) NOT NULL DEFAULT '',
 	`nurl` varchar(255) NOT NULL DEFAULT '',
 	`addr` varchar(255) NOT NULL DEFAULT '',
 	`alias` varchar(255) NOT NULL DEFAULT '',
-	`pubkey` text NOT NULL,
-	`prvkey` text NOT NULL,
+	`pubkey` text,
+	`prvkey` text,
 	`batch` varchar(255) NOT NULL DEFAULT '',
-	`request` text NOT NULL,
-	`notify` text NOT NULL,
-	`poll` text NOT NULL,
-	`confirm` text NOT NULL,
-	`poco` text NOT NULL,
+	`request` text,
+	`notify` text,
+	`poll` text,
+	`confirm` text,
+	`poco` text,
 	`aes_allow` tinyint(1) NOT NULL DEFAULT 0,
 	`ret-aes` tinyint(1) NOT NULL DEFAULT 0,
 	`usehub` tinyint(1) NOT NULL DEFAULT 0,
@@ -157,21 +159,23 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	`writable` tinyint(1) NOT NULL DEFAULT 0,
 	`forum` tinyint(1) NOT NULL DEFAULT 0,
 	`prv` tinyint(1) NOT NULL DEFAULT 0,
+	`contact-type` int(11) unsigned NOT NULL DEFAULT 0,
 	`hidden` tinyint(1) NOT NULL DEFAULT 0,
 	`archive` tinyint(1) NOT NULL DEFAULT 0,
 	`pending` tinyint(1) NOT NULL DEFAULT 1,
 	`rating` tinyint(1) NOT NULL DEFAULT 0,
-	`reason` text NOT NULL,
+	`reason` text,
 	`closeness` tinyint(2) NOT NULL DEFAULT 99,
-	`info` mediumtext NOT NULL,
+	`info` mediumtext,
 	`profile-id` int(11) NOT NULL DEFAULT 0,
 	`bdyear` varchar(4) NOT NULL DEFAULT '',
 	`bd` date NOT NULL DEFAULT '0000-00-00',
 	`notify_new_posts` tinyint(1) NOT NULL DEFAULT 0,
 	`fetch_further_information` tinyint(1) NOT NULL DEFAULT 0,
-	`ffi_keyword_blacklist` mediumtext NOT NULL,
+	`ffi_keyword_blacklist` mediumtext,
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`),
+	 INDEX `addr_uid` (`addr`,`uid`),
 	 INDEX `nurl` (`nurl`)
 ) DEFAULT CHARSET=utf8mb4;
 
@@ -181,12 +185,12 @@ CREATE TABLE IF NOT EXISTS `contact` (
 CREATE TABLE IF NOT EXISTS `conv` (
 	`id` int(10) unsigned NOT NULL auto_increment,
 	`guid` varchar(64) NOT NULL DEFAULT '',
-	`recips` mediumtext NOT NULL,
+	`recips` mediumtext,
 	`uid` int(11) NOT NULL DEFAULT 0,
 	`creator` varchar(255) NOT NULL DEFAULT '',
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`subject` mediumtext NOT NULL,
+	`subject` mediumtext,
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -199,7 +203,8 @@ CREATE TABLE IF NOT EXISTS `deliverq` (
 	`cmd` varchar(32) NOT NULL DEFAULT '',
 	`item` int(11) NOT NULL DEFAULT 0,
 	`contact` int(11) NOT NULL DEFAULT 0,
-	 PRIMARY KEY(`id`)
+	 PRIMARY KEY(`id`),
+	 UNIQUE INDEX `cmd_item_contact` (`cmd`,`item`,`contact`)
 ) DEFAULT CHARSET=utf8mb4;
 
 --
@@ -214,17 +219,17 @@ CREATE TABLE IF NOT EXISTS `event` (
 	`edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`start` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`finish` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`summary` text NOT NULL,
-	`desc` text NOT NULL,
-	`location` text NOT NULL,
+	`summary` text,
+	`desc` text,
+	`location` text,
 	`type` varchar(255) NOT NULL DEFAULT '',
 	`nofinish` tinyint(1) NOT NULL DEFAULT 0,
 	`adjust` tinyint(1) NOT NULL DEFAULT 1,
 	`ignore` tinyint(1) unsigned NOT NULL DEFAULT 0,
-	`allow_cid` mediumtext NOT NULL,
-	`allow_gid` mediumtext NOT NULL,
-	`deny_cid` mediumtext NOT NULL,
-	`deny_gid` mediumtext NOT NULL,
+	`allow_cid` mediumtext,
+	`allow_gid` mediumtext,
+	`deny_cid` mediumtext,
+	`deny_gid` mediumtext,
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -248,7 +253,7 @@ CREATE TABLE IF NOT EXISTS `fcontact` (
 	`priority` tinyint(1) NOT NULL DEFAULT 0,
 	`network` varchar(32) NOT NULL DEFAULT '',
 	`alias` varchar(255) NOT NULL DEFAULT '',
-	`pubkey` text NOT NULL,
+	`pubkey` text,
 	`updated` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	 PRIMARY KEY(`id`),
 	 INDEX `addr` (`addr`)
@@ -272,7 +277,7 @@ CREATE TABLE IF NOT EXISTS `fserver` (
 	`id` int(11) NOT NULL auto_increment,
 	`server` varchar(255) NOT NULL DEFAULT '',
 	`posturl` varchar(255) NOT NULL DEFAULT '',
-	`key` text NOT NULL,
+	`key` text,
 	 PRIMARY KEY(`id`),
 	 INDEX `server` (`server`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -288,7 +293,7 @@ CREATE TABLE IF NOT EXISTS `fsuggest` (
 	`url` varchar(255) NOT NULL DEFAULT '',
 	`request` varchar(255) NOT NULL DEFAULT '',
 	`photo` varchar(255) NOT NULL DEFAULT '',
-	`note` text NOT NULL,
+	`note` text,
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	 PRIMARY KEY(`id`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -321,16 +326,17 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
 	`last_contact` datetime DEFAULT '0000-00-00 00:00:00',
 	`last_failure` datetime DEFAULT '0000-00-00 00:00:00',
 	`location` varchar(255) NOT NULL DEFAULT '',
-	`about` text NOT NULL,
-	`keywords` text NOT NULL,
+	`about` text,
+	`keywords` text,
 	`gender` varchar(32) NOT NULL DEFAULT '',
 	`birthday` varchar(32) NOT NULL DEFAULT '0000-00-00',
 	`community` tinyint(1) NOT NULL DEFAULT 0,
+	`contact-type` tinyint(1) NOT NULL DEFAULT -1,
 	`hide` tinyint(1) NOT NULL DEFAULT 0,
 	`nsfw` tinyint(1) NOT NULL DEFAULT 0,
 	`network` varchar(255) NOT NULL DEFAULT '',
 	`addr` varchar(255) NOT NULL DEFAULT '',
-	`notify` text NOT NULL,
+	`notify` text,
 	`alias` varchar(255) NOT NULL DEFAULT '',
 	`generation` tinyint(3) NOT NULL DEFAULT 0,
 	`server_url` varchar(255) NOT NULL DEFAULT '',
@@ -392,7 +398,7 @@ CREATE TABLE IF NOT EXISTS `gserver` (
 	`nurl` varchar(255) NOT NULL DEFAULT '',
 	`version` varchar(255) NOT NULL DEFAULT '',
 	`site_name` varchar(255) NOT NULL DEFAULT '',
-	`info` text NOT NULL,
+	`info` text,
 	`register_policy` tinyint(1) NOT NULL DEFAULT 0,
 	`poco` varchar(255) NOT NULL DEFAULT '',
 	`noscrape` varchar(255) NOT NULL DEFAULT '',
@@ -429,7 +435,7 @@ CREATE TABLE IF NOT EXISTS `intro` (
 	`contact-id` int(11) NOT NULL DEFAULT 0,
 	`knowyou` tinyint(1) NOT NULL DEFAULT 0,
 	`duplex` tinyint(1) NOT NULL DEFAULT 0,
-	`note` text NOT NULL,
+	`note` text,
 	`hash` varchar(255) NOT NULL DEFAULT '',
 	`datetime` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`blocked` tinyint(1) NOT NULL DEFAULT 1,
@@ -468,27 +474,27 @@ CREATE TABLE IF NOT EXISTS `item` (
 	`author-link` varchar(255) NOT NULL DEFAULT '',
 	`author-avatar` varchar(255) NOT NULL DEFAULT '',
 	`title` varchar(255) NOT NULL DEFAULT '',
-	`body` mediumtext NOT NULL,
+	`body` mediumtext,
 	`app` varchar(255) NOT NULL DEFAULT '',
 	`verb` varchar(255) NOT NULL DEFAULT '',
 	`object-type` varchar(255) NOT NULL DEFAULT '',
-	`object` text NOT NULL,
+	`object` text,
 	`target-type` varchar(255) NOT NULL DEFAULT '',
-	`target` text NOT NULL,
-	`postopts` text NOT NULL,
+	`target` text,
+	`postopts` text,
 	`plink` varchar(255) NOT NULL DEFAULT '',
 	`resource-id` varchar(255) NOT NULL DEFAULT '',
 	`event-id` int(11) NOT NULL DEFAULT 0,
-	`tag` mediumtext NOT NULL,
-	`attach` mediumtext NOT NULL,
-	`inform` mediumtext NOT NULL,
-	`file` mediumtext NOT NULL,
+	`tag` mediumtext,
+	`attach` mediumtext,
+	`inform` mediumtext,
+	`file` mediumtext,
 	`location` varchar(255) NOT NULL DEFAULT '',
 	`coord` varchar(255) NOT NULL DEFAULT '',
-	`allow_cid` mediumtext NOT NULL,
-	`allow_gid` mediumtext NOT NULL,
-	`deny_cid` mediumtext NOT NULL,
-	`deny_gid` mediumtext NOT NULL,
+	`allow_cid` mediumtext,
+	`allow_gid` mediumtext,
+	`deny_cid` mediumtext,
+	`deny_gid` mediumtext,
 	`private` tinyint(1) NOT NULL DEFAULT 0,
 	`pubmail` tinyint(1) NOT NULL DEFAULT 0,
 	`moderated` tinyint(1) NOT NULL DEFAULT 0,
@@ -504,7 +510,7 @@ CREATE TABLE IF NOT EXISTS `item` (
 	`mention` tinyint(1) NOT NULL DEFAULT 0,
 	`network` varchar(32) NOT NULL DEFAULT '',
 	`rendered-hash` varchar(32) NOT NULL DEFAULT '',
-	`rendered-html` mediumtext NOT NULL,
+	`rendered-html` mediumtext,
 	`global` tinyint(1) NOT NULL DEFAULT 0,
 	 PRIMARY KEY(`id`),
 	 INDEX `guid` (`guid`),
@@ -585,7 +591,7 @@ CREATE TABLE IF NOT EXISTS `mail` (
 	`contact-id` varchar(255) NOT NULL DEFAULT '',
 	`convid` int(11) unsigned NOT NULL DEFAULT 0,
 	`title` varchar(255) NOT NULL DEFAULT '',
-	`body` mediumtext NOT NULL,
+	`body` mediumtext,
 	`seen` tinyint(1) NOT NULL DEFAULT 0,
 	`reply` tinyint(1) NOT NULL DEFAULT 0,
 	`replied` tinyint(1) NOT NULL DEFAULT 0,
@@ -613,7 +619,7 @@ CREATE TABLE IF NOT EXISTS `mailacct` (
 	`ssltype` varchar(16) NOT NULL DEFAULT '',
 	`mailbox` varchar(255) NOT NULL DEFAULT '',
 	`user` varchar(255) NOT NULL DEFAULT '',
-	`pass` text NOT NULL,
+	`pass` text,
 	`reply_to` varchar(255) NOT NULL DEFAULT '',
 	`action` int(11) NOT NULL DEFAULT 0,
 	`movetofolder` varchar(255) NOT NULL DEFAULT '',
@@ -644,7 +650,7 @@ CREATE TABLE IF NOT EXISTS `notify` (
 	`url` varchar(255) NOT NULL DEFAULT '',
 	`photo` varchar(255) NOT NULL DEFAULT '',
 	`date` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`msg` mediumtext NOT NULL,
+	`msg` mediumtext,
 	`uid` int(11) NOT NULL DEFAULT 0,
 	`link` varchar(255) NOT NULL DEFAULT '',
 	`iid` int(11) NOT NULL DEFAULT 0,
@@ -652,6 +658,8 @@ CREATE TABLE IF NOT EXISTS `notify` (
 	`seen` tinyint(1) NOT NULL DEFAULT 0,
 	`verb` varchar(255) NOT NULL DEFAULT '',
 	`otype` varchar(16) NOT NULL DEFAULT '',
+	`name_cache` tinytext,
+	`msg_cache` mediumtext,
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -675,9 +683,9 @@ CREATE TABLE IF NOT EXISTS `notify-threads` (
 --
 CREATE TABLE IF NOT EXISTS `oembed` (
 	`url` varchar(255) NOT NULL,
-	`content` text NOT NULL,
+	`content` text,
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	 PRIMARY KEY(`url`),
+	 PRIMARY KEY(`url`(191)),
 	 INDEX `created` (`created`)
 ) DEFAULT CHARSET=utf8mb4;
 
@@ -688,9 +696,9 @@ CREATE TABLE IF NOT EXISTS `parsed_url` (
 	`url` varchar(255) NOT NULL,
 	`guessing` tinyint(1) NOT NULL DEFAULT 0,
 	`oembed` tinyint(1) NOT NULL DEFAULT 0,
-	`content` text NOT NULL,
+	`content` text,
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	 PRIMARY KEY(`url`,`guessing`,`oembed`),
+	 PRIMARY KEY(`url`(191),`guessing`,`oembed`),
 	 INDEX `created` (`created`)
 ) DEFAULT CHARSET=utf8mb4;
 
@@ -702,9 +710,9 @@ CREATE TABLE IF NOT EXISTS `pconfig` (
 	`uid` int(11) NOT NULL DEFAULT 0,
 	`cat` varchar(255) NOT NULL DEFAULT '',
 	`k` varchar(255) NOT NULL DEFAULT '',
-	`v` mediumtext NOT NULL,
+	`v` mediumtext,
 	 PRIMARY KEY(`id`),
-	 INDEX `uid_cat_k` (`uid`,`cat`(30),`k`(30))
+	 UNIQUE INDEX `uid_cat_k` (`uid`,`cat`(30),`k`(30))
 ) DEFAULT CHARSET=utf8mb4;
 
 --
@@ -719,7 +727,7 @@ CREATE TABLE IF NOT EXISTS `photo` (
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`title` varchar(255) NOT NULL DEFAULT '',
-	`desc` text NOT NULL,
+	`desc` text,
 	`album` varchar(255) NOT NULL DEFAULT '',
 	`filename` varchar(255) NOT NULL DEFAULT '',
 	`type` varchar(128) NOT NULL DEFAULT 'image/jpeg',
@@ -729,12 +737,14 @@ CREATE TABLE IF NOT EXISTS `photo` (
 	`data` mediumblob NOT NULL,
 	`scale` tinyint(3) NOT NULL DEFAULT 0,
 	`profile` tinyint(1) NOT NULL DEFAULT 0,
-	`allow_cid` mediumtext NOT NULL,
-	`allow_gid` mediumtext NOT NULL,
-	`deny_cid` mediumtext NOT NULL,
-	`deny_gid` mediumtext NOT NULL,
+	`allow_cid` mediumtext,
+	`allow_gid` mediumtext,
+	`deny_cid` mediumtext,
+	`deny_gid` mediumtext,
 	 PRIMARY KEY(`id`),
-	 INDEX `uid` (`uid`),
+	 INDEX `uid_contactid` (`uid`,`contact-id`),
+	 INDEX `uid_profile` (`uid`,`profile`),
+	 INDEX `uid_album_created` (`uid`,`album`,`created`),
 	 INDEX `resource-id` (`resource-id`),
 	 INDEX `guid` (`guid`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -745,16 +755,16 @@ CREATE TABLE IF NOT EXISTS `photo` (
 CREATE TABLE IF NOT EXISTS `poll` (
 	`id` int(11) NOT NULL auto_increment,
 	`uid` int(11) NOT NULL DEFAULT 0,
-	`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,
+	`q0` mediumtext,
+	`q1` mediumtext,
+	`q2` mediumtext,
+	`q3` mediumtext,
+	`q4` mediumtext,
+	`q5` mediumtext,
+	`q6` mediumtext,
+	`q7` mediumtext,
+	`q8` mediumtext,
+	`q9` mediumtext,
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -771,6 +781,17 @@ CREATE TABLE IF NOT EXISTS `poll_result` (
 	 INDEX `choice` (`choice`)
 ) DEFAULT CHARSET=utf8mb4;
 
+--
+-- TABLE process
+--
+CREATE TABLE IF NOT EXISTS `process` (
+	`pid` int(10) unsigned NOT NULL,
+	`command` varchar(32) NOT NULL DEFAULT '',
+	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
+	 PRIMARY KEY(`pid`),
+	 INDEX `command` (`command`)
+) DEFAULT CHARSET=utf8mb4;
+
 --
 -- TABLE profile
 --
@@ -791,27 +812,28 @@ CREATE TABLE IF NOT EXISTS `profile` (
 	`hometown` varchar(255) NOT NULL DEFAULT '',
 	`gender` varchar(32) NOT NULL DEFAULT '',
 	`marital` varchar(255) NOT NULL DEFAULT '',
-	`with` text NOT NULL,
+	`with` text,
 	`howlong` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`sexual` varchar(255) NOT NULL DEFAULT '',
 	`politic` varchar(255) NOT NULL DEFAULT '',
 	`religion` varchar(255) NOT NULL DEFAULT '',
-	`pub_keywords` text NOT NULL,
-	`prv_keywords` text NOT NULL,
-	`likes` text NOT NULL,
-	`dislikes` text NOT NULL,
-	`about` text NOT NULL,
+	`pub_keywords` text,
+	`prv_keywords` text,
+	`likes` text,
+	`dislikes` text,
+	`about` text,
 	`summary` varchar(255) NOT NULL DEFAULT '',
-	`music` text NOT NULL,
-	`book` text NOT NULL,
-	`tv` text NOT NULL,
-	`film` text NOT NULL,
-	`interest` text NOT NULL,
-	`romance` text NOT NULL,
-	`work` text NOT NULL,
-	`education` text NOT NULL,
-	`contact` text NOT NULL,
+	`music` text,
+	`book` text,
+	`tv` text,
+	`film` text,
+	`interest` text,
+	`romance` text,
+	`work` text,
+	`education` text,
+	`contact` text,
 	`homepage` varchar(255) NOT NULL DEFAULT '',
+	`xmpp` varchar(255) NOT NULL DEFAULT '',
 	`photo` varchar(255) NOT NULL DEFAULT '',
 	`thumb` varchar(255) NOT NULL DEFAULT '',
 	`publish` tinyint(1) NOT NULL DEFAULT 0,
@@ -857,7 +879,7 @@ CREATE TABLE IF NOT EXISTS `queue` (
 	`network` varchar(32) NOT NULL DEFAULT '',
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`last` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
-	`content` mediumtext NOT NULL,
+	`content` mediumtext,
 	`batch` tinyint(1) NOT NULL DEFAULT 0,
 	 PRIMARY KEY(`id`),
 	 INDEX `cid` (`cid`),
@@ -877,6 +899,7 @@ CREATE TABLE IF NOT EXISTS `register` (
 	`uid` int(11) unsigned NOT NULL DEFAULT 0,
 	`password` varchar(255) NOT NULL DEFAULT '',
 	`language` varchar(16) NOT NULL DEFAULT '',
+	`note` text,
 	 PRIMARY KEY(`id`)
 ) DEFAULT CHARSET=utf8mb4;
 
@@ -898,7 +921,7 @@ CREATE TABLE IF NOT EXISTS `search` (
 CREATE TABLE IF NOT EXISTS `session` (
 	`id` bigint(20) unsigned NOT NULL auto_increment,
 	`sid` varchar(255) NOT NULL DEFAULT '',
-	`data` text NOT NULL,
+	`data` text,
 	`expire` int(10) unsigned NOT NULL DEFAULT 0,
 	 PRIMARY KEY(`id`),
 	 INDEX `sid` (`sid`),
@@ -911,8 +934,8 @@ CREATE TABLE IF NOT EXISTS `session` (
 CREATE TABLE IF NOT EXISTS `sign` (
 	`id` int(10) unsigned NOT NULL auto_increment,
 	`iid` int(10) unsigned NOT NULL DEFAULT 0,
-	`signed_text` mediumtext NOT NULL,
-	`signature` text NOT NULL,
+	`signed_text` mediumtext,
+	`signature` text,
 	`signer` varchar(255) NOT NULL DEFAULT '',
 	 PRIMARY KEY(`id`),
 	 INDEX `iid` (`iid`)
@@ -957,6 +980,7 @@ CREATE TABLE IF NOT EXISTS `term` (
 	 INDEX `type_term` (`type`,`term`),
 	 INDEX `uid_otype_type_term_global_created` (`uid`,`otype`,`type`,`term`,`global`,`created`),
 	 INDEX `otype_type_term_tid` (`otype`,`type`,`term`,`tid`),
+	 INDEX `uid_otype_type_url` (`uid`,`otype`,`type`,`url`),
 	 INDEX `guid` (`guid`)
 ) DEFAULT CHARSET=utf8mb4;
 
@@ -1009,7 +1033,7 @@ CREATE TABLE IF NOT EXISTS `thread` (
 --
 CREATE TABLE IF NOT EXISTS `tokens` (
 	`id` varchar(40) NOT NULL,
-	`secret` text NOT NULL,
+	`secret` text,
 	`client_id` varchar(20) NOT NULL DEFAULT '',
 	`expires` int(11) NOT NULL DEFAULT 0,
 	`scope` varchar(200) NOT NULL DEFAULT '',
@@ -1035,10 +1059,10 @@ CREATE TABLE IF NOT EXISTS `user` (
 	`default-location` varchar(255) NOT NULL DEFAULT '',
 	`allow_location` tinyint(1) NOT NULL DEFAULT 0,
 	`theme` varchar(255) NOT NULL DEFAULT '',
-	`pubkey` text NOT NULL,
-	`prvkey` text NOT NULL,
-	`spubkey` text NOT NULL,
-	`sprvkey` text NOT NULL,
+	`pubkey` text,
+	`prvkey` text,
+	`spubkey` text,
+	`sprvkey` text,
 	`verified` tinyint(1) unsigned NOT NULL DEFAULT 0,
 	`blocked` tinyint(1) unsigned NOT NULL DEFAULT 0,
 	`blockwall` tinyint(1) unsigned NOT NULL DEFAULT 0,
@@ -1048,6 +1072,7 @@ CREATE TABLE IF NOT EXISTS `user` (
 	`cntunkmail` int(11) NOT NULL DEFAULT 10,
 	`notify-flags` int(11) unsigned NOT NULL DEFAULT 65535,
 	`page-flags` int(11) unsigned NOT NULL DEFAULT 0,
+	`account-type` int(11) unsigned NOT NULL DEFAULT 0,
 	`prvnets` tinyint(1) NOT NULL DEFAULT 0,
 	`pwdreset` varchar(255) NOT NULL DEFAULT '',
 	`maxreq` int(11) NOT NULL DEFAULT 10,
@@ -1058,11 +1083,11 @@ CREATE TABLE IF NOT EXISTS `user` (
 	`expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`service_class` varchar(32) NOT NULL DEFAULT '',
 	`def_gid` int(11) NOT NULL DEFAULT 0,
-	`allow_cid` mediumtext NOT NULL,
-	`allow_gid` mediumtext NOT NULL,
-	`deny_cid` mediumtext NOT NULL,
-	`deny_gid` mediumtext NOT NULL,
-	`openidserver` text NOT NULL,
+	`allow_cid` mediumtext,
+	`allow_gid` mediumtext,
+	`deny_cid` mediumtext,
+	`deny_gid` mediumtext,
+	`openidserver` text,
 	 PRIMARY KEY(`uid`),
 	 INDEX `nickname` (`nickname`)
 ) DEFAULT CHARSET=utf8mb4;
@@ -1082,7 +1107,7 @@ CREATE TABLE IF NOT EXISTS `userd` (
 --
 CREATE TABLE IF NOT EXISTS `workerqueue` (
 	`id` int(11) NOT NULL auto_increment,
-	`parameter` text NOT NULL,
+	`parameter` text,
 	`priority` tinyint(3) unsigned NOT NULL DEFAULT 0,
 	`created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00',
 	`pid` int(11) NOT NULL DEFAULT 0,