aboutsummaryrefslogtreecommitdiffstats
path: root/install
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-06-11 16:28:40 -0700
committerzotlabs <mike@macgirvin.com>2017-06-11 16:28:40 -0700
commit425e13843ecd7e7b6bce480be5ea45ed05ededd9 (patch)
tree2eb07c873089bd8e3951d453acf80883f7f0ded4 /install
parentf1629930019ae57f00ddf6180de23c753e9a0d96 (diff)
parent643a62038e002c8944dda37f4023129bb50272c1 (diff)
downloadvolse-hubzilla-425e13843ecd7e7b6bce480be5ea45ed05ededd9.tar.gz
volse-hubzilla-425e13843ecd7e7b6bce480be5ea45ed05ededd9.tar.bz2
volse-hubzilla-425e13843ecd7e7b6bce480be5ea45ed05ededd9.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'install')
-rw-r--r--install/schema_mysql.sql6
1 files changed, 3 insertions, 3 deletions
diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index 27586c759..37b8f1ac0 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -607,6 +607,7 @@ CREATE TABLE IF NOT EXISTS `item` (
`resource_type` char(16) NOT NULL DEFAULT '',
`attach` mediumtext NOT NULL,
`sig` text NOT NULL,
+ `diaspora_meta` mediumtext NOT NULL,
`location` char(191) NOT NULL DEFAULT '',
`coord` char(191) NOT NULL DEFAULT '',
`public_policy` char(191) NOT NULL DEFAULT '',
@@ -897,14 +898,13 @@ CREATE TABLE IF NOT EXISTS `outq` (
CREATE TABLE IF NOT EXISTS `pconfig` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`uid` int(11) NOT NULL DEFAULT 0 ,
- `cat` char(100) NOT NULL DEFAULT '',
- `k` char(100) NOT NULL DEFAULT '',
+ `cat` char(191) NOT NULL DEFAULT '',
+ `k` char(191) NOT NULL DEFAULT '',
`v` mediumtext NOT NULL,
PRIMARY KEY (`id`),
UNIQUE KEY `access` (`uid`,`cat`,`k`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
-
CREATE TABLE IF NOT EXISTS `photo` (
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
`aid` int(10) unsigned NOT NULL DEFAULT 0 ,