aboutsummaryrefslogtreecommitdiffstats
path: root/database.sql
diff options
context:
space:
mode:
authorzottel <github@zottel.net>2012-05-01 08:21:12 +0200
committerzottel <github@zottel.net>2012-05-01 08:21:12 +0200
commit2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177 (patch)
tree2ca4af49655a3cf4f1a2d2cf4ea7b5936b8d9a17 /database.sql
parent43f9ea7cfc77d2dcb5fd6f8d7a90b1511cc67720 (diff)
parentf175af05f92384fab7adb75390a8aa52dc1bd7e1 (diff)
downloadvolse-hubzilla-2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177.tar.gz
volse-hubzilla-2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177.tar.bz2
volse-hubzilla-2e2bb5e8b0d2ab4a732cafd2ada30a76c4883177.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'database.sql')
-rw-r--r--database.sql8
1 files changed, 6 insertions, 2 deletions
diff --git a/database.sql b/database.sql
index 78b26922b..16e3964b5 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;
-- --------------------------------------------------------
@@ -1019,6 +1021,7 @@ 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',
@@ -1036,7 +1039,8 @@ 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`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- --------------------------------------------------------