sQL: No "NOT NULL" on text fields.

diff --git a/database.sql b/database.sql
index 95a163cfbd6f7f009d670d04b779b009ddabbc84..03ebc5fe4a801092e3a5c64ad234d9f2e49cecb2 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -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,7 +55,7 @@ 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`),
@@ -95,7 +95,7 @@ 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))
 ) DEFAULT CHARSET=utf8mb4;
@@ -115,29 +115,29 @@ 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 '',
        `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,
@@ -161,15 +161,15 @@ CREATE TABLE IF NOT EXISTS `contact` (
        `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 `nurl` (`nurl`)
@@ -181,12 +181,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;
@@ -214,17 +214,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 +248,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 +272,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 +288,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,8 +321,8 @@ 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,
@@ -330,7 +330,7 @@ CREATE TABLE IF NOT EXISTS `gcontact` (
        `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 +392,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 +429,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 +468,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 +504,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 +585,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 +613,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 +644,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,
@@ -675,7 +675,7 @@ 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`),
         INDEX `created` (`created`)
@@ -688,7 +688,7 @@ 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`),
         INDEX `created` (`created`)
@@ -702,7 +702,7 @@ 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))
 ) DEFAULT CHARSET=utf8mb4;
@@ -719,7 +719,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,10 +729,10 @@ 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 `resource-id` (`resource-id`),
@@ -745,16 +745,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;
@@ -791,26 +791,26 @@ 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 '',
        `photo` varchar(255) NOT NULL DEFAULT '',
        `thumb` varchar(255) NOT NULL DEFAULT '',
@@ -857,7 +857,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`),
@@ -898,7 +898,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 +911,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`)
@@ -1009,7 +1009,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 +1035,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,
@@ -1058,11 +1058,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 +1082,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,

diff --git a/include/dbm.php b/include/dbm.php
index fdd9f40e762a1b1443de691390f3cca572703634..72d309b22ef16c940e0d41ca3963dc501a245cf1 100644 (file)
--- a/include/dbm.php
+++ b/include/dbm.php
@@ -20,8 +20,8 @@ class dbm {
                foreach ($r AS $process) {
                        $state = trim($process["State"]);
 
-                       // Filter out all idle processes
-                       if (!in_array($state, array("", "init", "statistics"))) {
+                       // Filter out all non blocking processes
+                       if (!in_array($state, array("", "init", "statistics", "updating"))) {
                                ++$states[$state];
                                ++$processes;
                        }

diff --git a/include/dbstructure.php b/include/dbstructure.php
index dedd916a8eb1ad0fc3a1487aad8857ad4d8558c4..53b94b46a807eb74f50adf3cb59f5a59d3b07bd6 100644 (file)
--- a/include/dbstructure.php
+++ b/include/dbstructure.php
@@ -372,10 +372,10 @@ function db_definition() {
                                        "data" => array("type" => "longblob", "not null" => "1"),
                                        "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
                                        "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "allow_cid" => array("type" => "mediumtext", "not null" => "1"),
-                                       "allow_gid" => array("type" => "mediumtext", "not null" => "1"),
-                                       "deny_cid" => array("type" => "mediumtext", "not null" => "1"),
-                                       "deny_gid" => array("type" => "mediumtext", "not null" => "1"),
+                                       "allow_cid" => array("type" => "mediumtext"),
+                                       "allow_gid" => array("type" => "mediumtext"),
+                                       "deny_cid" => array("type" => "mediumtext"),
+                                       "deny_gid" => array("type" => "mediumtext"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -396,7 +396,7 @@ function db_definition() {
        $database["cache"] = array(
                        "fields" => array(
                                        "k" => array("type" => "varchar(255)", "not null" => "1", "primary" => "1"),
-                                       "v" => array("type" => "text", "not null" => "1"),
+                                       "v" => array("type" => "text"),
                                        "expire_mode" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
                                        ),
@@ -436,7 +436,7 @@ function db_definition() {
                                        "id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "cat" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "k" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "v" => array("type" => "text", "not null" => "1"),
+                                       "v" => array("type" => "text"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -456,29 +456,29 @@ function db_definition() {
                                        "name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "nick" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "about" => array("type" => "text", "not null" => "1"),
-                                       "keywords" => array("type" => "text", "not null" => "1"),
+                                       "about" => array("type" => "text"),
+                                       "keywords" => array("type" => "text"),
                                        "gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
                                        "attag" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "avatar" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "photo" => array("type" => "text", "not null" => "1"),
-                                       "thumb" => array("type" => "text", "not null" => "1"),
-                                       "micro" => array("type" => "text", "not null" => "1"),
-                                       "site-pubkey" => array("type" => "text", "not null" => "1"),
+                                       "photo" => array("type" => "text"),
+                                       "thumb" => array("type" => "text"),
+                                       "micro" => array("type" => "text"),
+                                       "site-pubkey" => array("type" => "text"),
                                        "issued-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "dfrn-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "nurl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "addr" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "alias" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "pubkey" => array("type" => "text", "not null" => "1"),
-                                       "prvkey" => array("type" => "text", "not null" => "1"),
+                                       "pubkey" => array("type" => "text"),
+                                       "prvkey" => array("type" => "text"),
                                        "batch" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "request" => array("type" => "text", "not null" => "1"),
-                                       "notify" => array("type" => "text", "not null" => "1"),
-                                       "poll" => array("type" => "text", "not null" => "1"),
-                                       "confirm" => array("type" => "text", "not null" => "1"),
-                                       "poco" => array("type" => "text", "not null" => "1"),
+                                       "request" => array("type" => "text"),
+                                       "notify" => array("type" => "text"),
+                                       "poll" => array("type" => "text"),
+                                       "confirm" => array("type" => "text"),
+                                       "poco" => array("type" => "text"),
                                        "aes_allow" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "ret-aes" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "usehub" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@@ -502,15 +502,15 @@ function db_definition() {
                                        "archive" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "pending" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
                                        "rating" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
-                                       "reason" => array("type" => "text", "not null" => "1"),
+                                       "reason" => array("type" => "text"),
                                        "closeness" => array("type" => "tinyint(2)", "not null" => "1", "default" => "99"),
-                                       "info" => array("type" => "mediumtext", "not null" => "1"),
+                                       "info" => array("type" => "mediumtext"),
                                        "profile-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "bdyear" => array("type" => "varchar(4)", "not null" => "1", "default" => ""),
                                        "bd" => array("type" => "date", "not null" => "1", "default" => "0000-00-00"),
                                        "notify_new_posts" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "fetch_further_information" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
-                                       "ffi_keyword_blacklist" => array("type" => "mediumtext", "not null" => "1"),
+                                       "ffi_keyword_blacklist" => array("type" => "mediumtext"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -522,12 +522,12 @@ function db_definition() {
                        "fields" => array(
                                        "id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "guid" => array("type" => "varchar(64)", "not null" => "1", "default" => ""),
-                                       "recips" => array("type" => "mediumtext", "not null" => "1"),
+                                       "recips" => array("type" => "mediumtext"),
                                        "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "creator" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
                                        "updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "subject" => array("type" => "mediumtext", "not null" => "1"),
+                                       "subject" => array("type" => "mediumtext"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -555,17 +555,17 @@ function db_definition() {
                                        "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
                                        "start" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
                                        "finish" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "summary" => array("type" => "text", "not null" => "1"),
-                                       "desc" => array("type" => "text", "not null" => "1"),
-                                       "location" => array("type" => "text", "not null" => "1"),
+                                       "summary" => array("type" => "text"),
+                                       "desc" => array("type" => "text"),
+                                       "location" => array("type" => "text"),
                                        "type" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "nofinish" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "adjust" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
                                        "ignore" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
-                                       "allow_cid" => array("type" => "mediumtext", "not null" => "1"),
-                                       "allow_gid" => array("type" => "mediumtext", "not null" => "1"),
-                                       "deny_cid" => array("type" => "mediumtext", "not null" => "1"),
-                                       "deny_gid" => array("type" => "mediumtext", "not null" => "1"),
+                                       "allow_cid" => array("type" => "mediumtext"),
+                                       "allow_gid" => array("type" => "mediumtext"),
+                                       "deny_cid" => array("type" => "mediumtext"),
+                                       "deny_gid" => array("type" => "mediumtext"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -589,7 +589,7 @@ function db_definition() {
                                        "priority" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
                                        "alias" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "pubkey" => array("type" => "text", "not null" => "1"),
+                                       "pubkey" => array("type" => "text"),
                                        "updated" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
                                        ),
                        "indexes" => array(
@@ -613,7 +613,7 @@ function db_definition() {
                                        "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "server" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "posturl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "key" => array("type" => "text", "not null" => "1"),
+                                       "key" => array("type" => "text"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -629,7 +629,7 @@ function db_definition() {
                                        "url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "request" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "note" => array("type" => "text", "not null" => "1"),
+                                       "note" => array("type" => "text"),
                                        "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
                                        ),
                        "indexes" => array(
@@ -662,8 +662,8 @@ function db_definition() {
                                        "last_contact" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
                                        "last_failure" => array("type" => "datetime", "default" => "0000-00-00 00:00:00"),
                                        "location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "about" => array("type" => "text", "not null" => "1"),
-                                       "keywords" => array("type" => "text", "not null" => "1"),
+                                       "about" => array("type" => "text"),
+                                       "keywords" => array("type" => "text"),
                                        "gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
                                        "birthday" => array("type" => "varchar(32)", "not null" => "1", "default" => "0000-00-00"),
                                        "community" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@@ -671,7 +671,7 @@ function db_definition() {
                                        "nsfw" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "network" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "addr" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "notify" => array("type" => "text", "not null" => "1"),
+                                       "notify" => array("type" => "text"),
                                        "alias" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "generation" => array("type" => "tinyint(3)", "not null" => "1", "default" => "0"),
                                        "server_url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -733,7 +733,7 @@ function db_definition() {
                                        "nurl" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "version" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "site_name" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "info" => array("type" => "text", "not null" => "1"),
+                                       "info" => array("type" => "text"),
                                        "register_policy" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "poco" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "noscrape" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -770,7 +770,7 @@ function db_definition() {
                                        "contact-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "knowyou" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "duplex" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
-                                       "note" => array("type" => "text", "not null" => "1"),
+                                       "note" => array("type" => "text"),
                                        "hash" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "datetime" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
                                        "blocked" => array("type" => "tinyint(1)", "not null" => "1", "default" => "1"),
@@ -809,27 +809,27 @@ function db_definition() {
                                        "author-link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "author-avatar" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "title" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "body" => array("type" => "mediumtext", "not null" => "1"),
+                                       "body" => array("type" => "mediumtext"),
                                        "app" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "verb" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "object-type" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "object" => array("type" => "text", "not null" => "1"),
+                                       "object" => array("type" => "text"),
                                        "target-type" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "target" => array("type" => "text", "not null" => "1"),
-                                       "postopts" => array("type" => "text", "not null" => "1"),
+                                       "target" => array("type" => "text"),
+                                       "postopts" => array("type" => "text"),
                                        "plink" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "resource-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "event-id" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "tag" => array("type" => "mediumtext", "not null" => "1"),
-                                       "attach" => array("type" => "mediumtext", "not null" => "1"),
-                                       "inform" => array("type" => "mediumtext", "not null" => "1"),
-                                       "file" => array("type" => "mediumtext", "not null" => "1"),
+                                       "tag" => array("type" => "mediumtext"),
+                                       "attach" => array("type" => "mediumtext"),
+                                       "inform" => array("type" => "mediumtext"),
+                                       "file" => array("type" => "mediumtext"),
                                        "location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "coord" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "allow_cid" => array("type" => "mediumtext", "not null" => "1"),
-                                       "allow_gid" => array("type" => "mediumtext", "not null" => "1"),
-                                       "deny_cid" => array("type" => "mediumtext", "not null" => "1"),
-                                       "deny_gid" => array("type" => "mediumtext", "not null" => "1"),
+                                       "allow_cid" => array("type" => "mediumtext"),
+                                       "allow_gid" => array("type" => "mediumtext"),
+                                       "deny_cid" => array("type" => "mediumtext"),
+                                       "deny_gid" => array("type" => "mediumtext"),
                                        "private" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "pubmail" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "moderated" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@@ -845,7 +845,7 @@ function db_definition() {
                                        "mention" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
                                        "rendered-hash" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
-                                       "rendered-html" => array("type" => "mediumtext", "not null" => "1"),
+                                       "rendered-html" => array("type" => "mediumtext"),
                                        "global" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        ),
                        "indexes" => array(
@@ -926,7 +926,7 @@ function db_definition() {
                                        "contact-id" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "convid" => array("type" => "int(11) unsigned", "not null" => "1", "default" => "0"),
                                        "title" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "body" => array("type" => "mediumtext", "not null" => "1"),
+                                       "body" => array("type" => "mediumtext"),
                                        "seen" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "reply" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "replied" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
@@ -954,7 +954,7 @@ function db_definition() {
                                        "ssltype" => array("type" => "varchar(16)", "not null" => "1", "default" => ""),
                                        "mailbox" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "user" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "pass" => array("type" => "text", "not null" => "1"),
+                                       "pass" => array("type" => "text"),
                                        "reply_to" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "action" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "movetofolder" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -985,7 +985,7 @@ function db_definition() {
                                        "url" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "date" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "msg" => array("type" => "mediumtext", "not null" => "1"),
+                                       "msg" => array("type" => "mediumtext"),
                                        "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "link" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "iid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
@@ -1016,7 +1016,7 @@ function db_definition() {
        $database["oembed"] = array(
                        "fields" => array(
                                        "url" => array("type" => "varchar(255)", "not null" => "1", "primary" => "1"),
-                                       "content" => array("type" => "text", "not null" => "1"),
+                                       "content" => array("type" => "text"),
                                        "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
                                        ),
                        "indexes" => array(
@@ -1029,7 +1029,7 @@ function db_definition() {
                                        "url" => array("type" => "varchar(255)", "not null" => "1", "primary" => "1"),
                                        "guessing" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0", "primary" => "1"),
                                        "oembed" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0", "primary" => "1"),
-                                       "content" => array("type" => "text", "not null" => "1"),
+                                       "content" => array("type" => "text"),
                                        "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
                                        ),
                        "indexes" => array(
@@ -1043,7 +1043,7 @@ function db_definition() {
                                        "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "cat" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "k" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "v" => array("type" => "mediumtext", "not null" => "1"),
+                                       "v" => array("type" => "mediumtext"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -1060,7 +1060,7 @@ function db_definition() {
                                        "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
                                        "edited" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
                                        "title" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "desc" => array("type" => "text", "not null" => "1"),
+                                       "desc" => array("type" => "text"),
                                        "album" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "filename" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "type" => array("type" => "varchar(128)", "not null" => "1", "default" => "image/jpeg"),
@@ -1070,10 +1070,10 @@ function db_definition() {
                                        "data" => array("type" => "mediumblob", "not null" => "1"),
                                        "scale" => array("type" => "tinyint(3)", "not null" => "1", "default" => "0"),
                                        "profile" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
-                                       "allow_cid" => array("type" => "mediumtext", "not null" => "1"),
-                                       "allow_gid" => array("type" => "mediumtext", "not null" => "1"),
-                                       "deny_cid" => array("type" => "mediumtext", "not null" => "1"),
-                                       "deny_gid" => array("type" => "mediumtext", "not null" => "1"),
+                                       "allow_cid" => array("type" => "mediumtext"),
+                                       "allow_gid" => array("type" => "mediumtext"),
+                                       "deny_cid" => array("type" => "mediumtext"),
+                                       "deny_gid" => array("type" => "mediumtext"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -1086,16 +1086,16 @@ function db_definition() {
                        "fields" => array(
                                        "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "uid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "q0" => array("type" => "mediumtext", "not null" => "1"),
-                                       "q1" => array("type" => "mediumtext", "not null" => "1"),
-                                       "q2" => array("type" => "mediumtext", "not null" => "1"),
-                                       "q3" => array("type" => "mediumtext", "not null" => "1"),
-                                       "q4" => array("type" => "mediumtext", "not null" => "1"),
-                                       "q5" => array("type" => "mediumtext", "not null" => "1"),
-                                       "q6" => array("type" => "mediumtext", "not null" => "1"),
-                                       "q7" => array("type" => "mediumtext", "not null" => "1"),
-                                       "q8" => array("type" => "mediumtext", "not null" => "1"),
-                                       "q9" => array("type" => "mediumtext", "not null" => "1"),
+                                       "q0" => array("type" => "mediumtext"),
+                                       "q1" => array("type" => "mediumtext"),
+                                       "q2" => array("type" => "mediumtext"),
+                                       "q3" => array("type" => "mediumtext"),
+                                       "q4" => array("type" => "mediumtext"),
+                                       "q5" => array("type" => "mediumtext"),
+                                       "q6" => array("type" => "mediumtext"),
+                                       "q7" => array("type" => "mediumtext"),
+                                       "q8" => array("type" => "mediumtext"),
+                                       "q9" => array("type" => "mediumtext"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("id"),
@@ -1132,26 +1132,26 @@ function db_definition() {
                                        "hometown" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "gender" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
                                        "marital" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "with" => array("type" => "text", "not null" => "1"),
+                                       "with" => array("type" => "text"),
                                        "howlong" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
                                        "sexual" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "politic" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "religion" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "pub_keywords" => array("type" => "text", "not null" => "1"),
-                                       "prv_keywords" => array("type" => "text", "not null" => "1"),
-                                       "likes" => array("type" => "text", "not null" => "1"),
-                                       "dislikes" => array("type" => "text", "not null" => "1"),
-                                       "about" => array("type" => "text", "not null" => "1"),
+                                       "pub_keywords" => array("type" => "text"),
+                                       "prv_keywords" => array("type" => "text"),
+                                       "likes" => array("type" => "text"),
+                                       "dislikes" => array("type" => "text"),
+                                       "about" => array("type" => "text"),
                                        "summary" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "music" => array("type" => "text", "not null" => "1"),
-                                       "book" => array("type" => "text", "not null" => "1"),
-                                       "tv" => array("type" => "text", "not null" => "1"),
-                                       "film" => array("type" => "text", "not null" => "1"),
-                                       "interest" => array("type" => "text", "not null" => "1"),
-                                       "romance" => array("type" => "text", "not null" => "1"),
-                                       "work" => array("type" => "text", "not null" => "1"),
-                                       "education" => array("type" => "text", "not null" => "1"),
-                                       "contact" => array("type" => "text", "not null" => "1"),
+                                       "music" => array("type" => "text"),
+                                       "book" => array("type" => "text"),
+                                       "tv" => array("type" => "text"),
+                                       "film" => array("type" => "text"),
+                                       "interest" => array("type" => "text"),
+                                       "romance" => array("type" => "text"),
+                                       "work" => array("type" => "text"),
+                                       "education" => array("type" => "text"),
+                                       "contact" => array("type" => "text"),
                                        "homepage" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "photo" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "thumb" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
@@ -1198,7 +1198,7 @@ function db_definition() {
                                        "network" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
                                        "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
                                        "last" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
-                                       "content" => array("type" => "mediumtext", "not null" => "1"),
+                                       "content" => array("type" => "mediumtext"),
                                        "batch" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        ),
                        "indexes" => array(
@@ -1239,7 +1239,7 @@ function db_definition() {
                        "fields" => array(
                                        "id" => array("type" => "bigint(20) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "sid" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "data" => array("type" => "text", "not null" => "1"),
+                                       "data" => array("type" => "text"),
                                        "expire" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
                                        ),
                        "indexes" => array(
@@ -1252,8 +1252,8 @@ function db_definition() {
                        "fields" => array(
                                        "id" => array("type" => "int(10) unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
                                        "iid" => array("type" => "int(10) unsigned", "not null" => "1", "default" => "0"),
-                                       "signed_text" => array("type" => "mediumtext", "not null" => "1"),
-                                       "signature" => array("type" => "text", "not null" => "1"),
+                                       "signed_text" => array("type" => "mediumtext"),
+                                       "signature" => array("type" => "text"),
                                        "signer" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        ),
                        "indexes" => array(
@@ -1350,7 +1350,7 @@ function db_definition() {
        $database["tokens"] = array(
                        "fields" => array(
                                        "id" => array("type" => "varchar(40)", "not null" => "1", "primary" => "1"),
-                                       "secret" => array("type" => "text", "not null" => "1"),
+                                       "secret" => array("type" => "text"),
                                        "client_id" => array("type" => "varchar(20)", "not null" => "1", "default" => ""),
                                        "expires" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
                                        "scope" => array("type" => "varchar(200)", "not null" => "1", "default" => ""),
@@ -1376,10 +1376,10 @@ function db_definition() {
                                        "default-location" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
                                        "allow_location" => array("type" => "tinyint(1)", "not null" => "1", "default" => "0"),
                                        "theme" => array("type" => "varchar(255)", "not null" => "1", "default" => ""),
-                                       "pubkey" => array("type" => "text", "not null" => "1"),
-                                       "prvkey" => array("type" => "text", "not null" => "1"),
-                                       "spubkey" => array("type" => "text", "not null" => "1"),
-                                       "sprvkey" => array("type" => "text", "not null" => "1"),
+                                       "pubkey" => array("type" => "text"),
+                                       "prvkey" => array("type" => "text"),
+                                       "spubkey" => array("type" => "text"),
+                                       "sprvkey" => array("type" => "text"),
                                        "verified" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
                                        "blocked" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
                                        "blockwall" => array("type" => "tinyint(1) unsigned", "not null" => "1", "default" => "0"),
@@ -1399,11 +1399,11 @@ function db_definition() {
                                        "expire_notification_sent" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
                                        "service_class" => array("type" => "varchar(32)", "not null" => "1", "default" => ""),
                                        "def_gid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),
-                                       "allow_cid" => array("type" => "mediumtext", "not null" => "1"),
-                                       "allow_gid" => array("type" => "mediumtext", "not null" => "1"),
-                                       "deny_cid" => array("type" => "mediumtext", "not null" => "1"),
-                                       "deny_gid" => array("type" => "mediumtext", "not null" => "1"),
-                                       "openidserver" => array("type" => "text", "not null" => "1"),
+                                       "allow_cid" => array("type" => "mediumtext"),
+                                       "allow_gid" => array("type" => "mediumtext"),
+                                       "deny_cid" => array("type" => "mediumtext"),
+                                       "deny_gid" => array("type" => "mediumtext"),
+                                       "openidserver" => array("type" => "text"),
                                        ),
                        "indexes" => array(
                                        "PRIMARY" => array("uid"),
@@ -1423,7 +1423,7 @@ function db_definition() {
        $database["workerqueue"] = array(
                        "fields" => array(
                                        "id" => array("type" => "int(11)", "not null" => "1", "extra" => "auto_increment", "primary" => "1"),
-                                       "parameter" => array("type" => "text", "not null" => "1"),
+                                       "parameter" => array("type" => "text"),
                                        "priority" => array("type" => "tinyint(3) unsigned", "not null" => "1", "default" => "0"),
                                        "created" => array("type" => "datetime", "not null" => "1", "default" => "0000-00-00 00:00:00"),
                                        "pid" => array("type" => "int(11)", "not null" => "1", "default" => "0"),