diff options
| author | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-05-05 20:48:16 +0530 |
|---|---|---|
| committer | Vasudev Kamath <kamathvasudev@gmail.com> | 2012-05-05 20:48:16 +0530 |
| commit | b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80 (patch) | |
| tree | 74234775d723e33378059f2fa45fa80e3bc6ac43 /database.sql | |
| parent | 214ec91a3f2c5fec6cced93f669b3a9725f0e40a (diff) | |
| parent | 8ae83201cf8f3c943972a8f246b7972aa640afb4 (diff) | |
| download | volse-hubzilla-b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80.tar.gz volse-hubzilla-b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80.tar.bz2 volse-hubzilla-b5e857c0e7ccf4ef3d33e5b6d0a4325b693a8e80.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
Diffstat (limited to 'database.sql')
| -rw-r--r-- | database.sql | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/database.sql b/database.sql index eadb53cc6..cf086796a 100644 --- a/database.sql +++ b/database.sql @@ -16,9 +16,11 @@ CREATE TABLE IF NOT EXISTS `addon` ( `name` char(255) NOT NULL, `version` char(255) NOT NULL, `installed` tinyint(1) NOT NULL DEFAULT '0', + `hidden` tinyint(1) NOT NULL DEFAULT '0', `timestamp` bigint(20) NOT NULL DEFAULT '0', `plugin_admin` tinyint(1) NOT NULL DEFAULT '0', - PRIMARY KEY (`id`) + PRIMARY KEY (`id`), + KEY `hidden` (`hidden`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- @@ -172,6 +174,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( `writable` tinyint(1) NOT NULL DEFAULT '0', `forum` tinyint(1) 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' COMMENT '0-5 reputation, 0 unknown, 1 call police, 5 inscrutable', `reason` text NOT NULL COMMENT 'why a rating was given - will help friends decide to make friends or not', @@ -197,6 +200,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( KEY `nurl` (`nurl`), KEY `pending` (`pending`), KEY `hidden` (`hidden`), + KEY `archive` (`archive`), KEY `forum` (`forum`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; @@ -380,11 +384,13 @@ CREATE TABLE IF NOT EXISTS `glink` ( `cid` int(11) NOT NULL, `uid` int(11) NOT NULL, `gcid` int(11) NOT NULL, + `zcid` int(11) NOT NULL, `updated` datetime NOT NULL, PRIMARY KEY (`id`), KEY `cid` (`cid`), KEY `uid` (`uid`), KEY `gcid` (`gcid`), + KEY `zcid` (`zcid`), KEY `updated` (`updated`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; @@ -1017,9 +1023,11 @@ CREATE TABLE IF NOT EXISTS `user` ( `pwdreset` char(255) NOT NULL, `maxreq` int(11) NOT NULL DEFAULT '10', `expire` int(10) unsigned NOT NULL DEFAULT '0', + `account_removed` tinyint(1) NOT NULL DEFAULT '0', `account_expired` tinyint(1) NOT NULL DEFAULT '0', `account_expires_on` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `expire_notification_sent` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `service_class` char(32) NOT NULL, `allow_cid` mediumtext NOT NULL, `allow_gid` mediumtext NOT NULL, `deny_cid` mediumtext NOT NULL, @@ -1034,7 +1042,9 @@ CREATE TABLE IF NOT EXISTS `user` ( KEY `blocked` (`blocked`), KEY `verified` (`verified`), KEY `unkmail` (`unkmail`), - KEY `cntunkmail` (`cntunkmail`) + KEY `cntunkmail` (`cntunkmail`), + KEY `account_removed` (`account_removed`), + KEY `service_class` (`service_class`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -- -------------------------------------------------------- |