aboutsummaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2012-12-07 22:27:35 +0000
committerThomas Willingham <founder@kakste.com>2012-12-07 22:27:35 +0000
commit44263d5ac3e5189df28c92f58c2875137052b6ea (patch)
tree70aa75426f2b3c984faecdb5f684157bccedda3a /install
parent555226ada4946b78be5fa2966f5c8532a997953f (diff)
parent2452b822f909a3cac432a76d8c928733a7683c6a (diff)
downloadvolse-hubzilla-44263d5ac3e5189df28c92f58c2875137052b6ea.tar.gz
volse-hubzilla-44263d5ac3e5189df28c92f58c2875137052b6ea.tar.bz2
volse-hubzilla-44263d5ac3e5189df28c92f58c2875137052b6ea.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'install')
-rw-r--r--install/database.sql8
1 files changed, 6 insertions, 2 deletions
diff --git a/install/database.sql b/install/database.sql
index 24c9b9922..36b1003ae 100644
--- a/install/database.sql
+++ b/install/database.sql
@@ -425,6 +425,7 @@ CREATE TABLE IF NOT EXISTS `glink` (
CREATE TABLE IF NOT EXISTS `group` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
+ `hash` char(255) NOT NULL DEFAULT '',
`uid` int(10) unsigned NOT NULL,
`visible` tinyint(1) NOT NULL DEFAULT '0',
`deleted` tinyint(1) NOT NULL DEFAULT '0',
@@ -432,7 +433,8 @@ CREATE TABLE IF NOT EXISTS `group` (
PRIMARY KEY (`id`),
KEY `uid` (`uid`),
KEY `visible` (`visible`),
- KEY `deleted` (`deleted`)
+ KEY `deleted` (`deleted`),
+ KEY `hash` (`hash`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `group_member` (
@@ -708,6 +710,7 @@ CREATE TABLE IF NOT EXISTS `photo` (
`type` char(128) NOT NULL DEFAULT 'image/jpeg',
`height` smallint(6) NOT NULL,
`width` smallint(6) NOT NULL,
+ `size` int(10) unsigned NOT NULL DEFAULT '0',
`data` mediumblob NOT NULL,
`scale` tinyint(3) NOT NULL,
`profile` tinyint(1) NOT NULL DEFAULT '0',
@@ -724,7 +727,8 @@ CREATE TABLE IF NOT EXISTS `photo` (
KEY `type` (`type`),
KEY `contact-id` (`contact-id`),
KEY `aid` (`aid`),
- KEY `xchan` (`xchan`)
+ KEY `xchan` (`xchan`),
+ KEY `size` (`size`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
CREATE TABLE IF NOT EXISTS `profile` (