diff options
author | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-16 06:52:33 +0100 |
---|---|---|
committer | Tobias Diekershoff <tobias.diekershoff@gmx.net> | 2011-03-16 06:52:33 +0100 |
commit | c43f647049c78b594c90e95d06d12f29f300d5d3 (patch) | |
tree | a6b02ad763a5d539158721edbe8ca73e158d8ca4 /database.sql | |
parent | a2ee5ebe427522228dc03dc81da11f348a399c4d (diff) | |
parent | e2ea341094c53e78ae7473a83d2b6c85b1cde4eb (diff) | |
download | volse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.tar.gz volse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.tar.bz2 volse-hubzilla-c43f647049c78b594c90e95d06d12f29f300d5d3.zip |
Merge branch 'master' of git://github.com/friendika/friendika
Diffstat (limited to 'database.sql')
-rw-r--r-- | database.sql | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/database.sql b/database.sql index f47a5967e..0ecf0ea20 100644 --- a/database.sql +++ b/database.sql @@ -297,7 +297,8 @@ CREATE TABLE IF NOT EXISTS `profile` ( `sexual` char(255) NOT NULL, `politic` char(255) NOT NULL, `religion` char(255) NOT NULL, - `keywords` text NOT NULL, + `pub_keywords` text NOT NULL, + `prv_keywords` text NOT NULL, `about` text NOT NULL, `summary` char(255) NOT NULL, `music` text NOT NULL, @@ -378,6 +379,7 @@ CREATE TABLE IF NOT EXISTS `user` ( `page-flags` int(11) unsigned NOT NULL DEFAULT '0', `pwdreset` char(255) NOT NULL, `maxreq` int(11) NOT NULL DEFAULT '10', + `expire` int(11) unsigned NOT NULL DEFAULT '0', `allow_cid` mediumtext NOT NULL, `allow_gid` mediumtext NOT NULL, `deny_cid` mediumtext NOT NULL, @@ -479,3 +481,19 @@ CREATE TABLE IF NOT EXISTS `cache` ( `v` TEXT NOT NULL, `updated` DATETIME NOT NULL ) ENGINE = MYISAM DEFAULT CHARSET=utf8; + + +CREATE TABLE IF NOT EXISTS `fcontact` ( +`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , +`url` CHAR( 255 ) NOT NULL , +`name` CHAR( 255 ) NOT NULL , +`photo` CHAR( 255 ) NOT NULL +) ENGINE = MYISAM DEFAULT CHARSET=utf8; + +CREATE TABLE IF NOT EXISTS `ffinder` ( +`id` INT UNSIGNED NOT NULL AUTO_INCREMENT PRIMARY KEY , +`uid` INT UNSIGNED NOT NULL , +`cid` INT UNSIGNED NOT NULL , +`fid` INT UNSIGNED NOT NULL +) ENGINE = MYISAM DEFAULT CHARSET=utf8; + |