diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-26 11:42:48 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2011-09-26 11:42:48 +0200 |
| commit | 5792b3d3580b9f09460305858293398d8d8a9abf (patch) | |
| tree | 90d60e9db4ed733a60c2890c7305d45ddd48be42 /database.sql | |
| parent | 991656a3ef396d9a6bd43ddb752627c2880b17ba (diff) | |
| parent | 428e6766411d2c6708ad25f726c4bcf1d64af1cc (diff) | |
| download | volse-hubzilla-5792b3d3580b9f09460305858293398d8d8a9abf.tar.gz volse-hubzilla-5792b3d3580b9f09460305858293398d8d8a9abf.tar.bz2 volse-hubzilla-5792b3d3580b9f09460305858293398d8d8a9abf.zip | |
Merge branch 'master' into newui
Diffstat (limited to 'database.sql')
| -rw-r--r-- | database.sql | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/database.sql b/database.sql index ff339929e..08d02d67e 100644 --- a/database.sql +++ b/database.sql @@ -70,6 +70,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( `alias` char(255) NOT NULL, `pubkey` text NOT NULL, `prvkey` text NOT NULL, + `batch` char(255) NOT NULL, `request` text NOT NULL, `notify` text NOT NULL, `poll` text NOT NULL, @@ -174,6 +175,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `thr-parent` char(255) NOT NULL, `created` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `edited` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', + `commented` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `received` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `changed` datetime NOT NULL DEFAULT '0000-00-00 00:00:00', `owner-name` char(255) NOT NULL, @@ -406,12 +408,16 @@ CREATE TABLE IF NOT EXISTS `user` ( `blocked` tinyint(1) unsigned NOT NULL DEFAULT '0', `blockwall` tinyint(1) unsigned NOT NULL DEFAULT '0', `hidewall` tinyint(1) unsigned NOT NULL DEFAULT '0', + `blocktags` tinyint(1) unsigned NOT NULL DEFAULT '0', `notify-flags` int(11) unsigned NOT NULL DEFAULT '65535', `page-flags` int(11) unsigned NOT NULL DEFAULT '0', `prvnets` tinyint(1) NOT NULL DEFAULT '0', `pwdreset` char(255) NOT NULL, `maxreq` int(11) NOT NULL DEFAULT '10', `expire` int(11) unsigned 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', `allow_cid` mediumtext NOT NULL, `allow_gid` mediumtext NOT NULL, `deny_cid` mediumtext NOT NULL, @@ -463,7 +469,8 @@ CREATE TABLE IF NOT EXISTS `queue` ( `network` CHAR( 32 ) NOT NULL, `created` DATETIME NOT NULL , `last` DATETIME NOT NULL , -`content` MEDIUMTEXT NOT NULL +`content` MEDIUMTEXT NOT NULL, +`batch` TINYINT( 1 ) NOT NULL DEFAULT '0' ) ENGINE = MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `pconfig` ( @@ -528,6 +535,7 @@ CREATE TABLE IF NOT EXISTS `fcontact` ( `request` CHAR( 255 ) NOT NULL, `nick` CHAR( 255 ) NOT NULL , `addr` CHAR( 255 ) NOT NULL , +`batch` CHAR( 255) NOT NULL, `notify` CHAR( 255 ) NOT NULL , `poll` CHAR( 255 ) NOT NULL , `confirm` CHAR( 255 ) NOT NULL , |