Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index 7526be41d1d0c876a1e1dcd08faec0c355b1cdbc..0b322e9e020798adc4574fa9df8c4c09c8366577 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -56,12 +56,15 @@ CREATE TABLE IF NOT EXISTS `contact` (
   `duplex` tinyint(1) NOT NULL DEFAULT '0',
   `network` char(255) NOT NULL,
   `name` char(255) NOT NULL,
+  `nick` char(255) NOT NULL,
   `photo` text NOT NULL, 
   `thumb` text NOT NULL,
+  `micro` text NOT NULL,
   `site-pubkey` text NOT NULL,
   `issued-id` char(255) NOT NULL,
   `dfrn-id` char(255) NOT NULL,
   `url` char(255) NOT NULL,
+  `lrdd` char(255) NOT NULL,
   `pubkey` text NOT NULL,
   `prvkey` text NOT NULL,
   `request` text NOT NULL,
@@ -150,14 +153,15 @@ CREATE TABLE IF NOT EXISTS `intro` (
 
 CREATE TABLE IF NOT EXISTS `item` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
-  `uri` char(255) CHARACTER SET ascii NOT NULL,
+  `uri` char(255) NOT NULL,
   `uid` int(10) unsigned NOT NULL DEFAULT '0',
   `contact-id` int(10) unsigned NOT NULL DEFAULT '0',
   `type` char(255) NOT NULL,
   `wall` tinyint(1) NOT NULL DEFAULT '0',
   `gravity` tinyint(1) NOT NULL DEFAULT '0',
   `parent` int(10) unsigned NOT NULL DEFAULT '0',
-  `parent-uri` char(255) CHARACTER SET ascii NOT NULL,
+  `parent-uri` char(255) NOT NULL,
+  `thr-parent` char(255) NOT NULL,
   `created` datetime NOT NULL,
   `edited` datetime NOT NULL,
   `changed` datetime NOT NULL,
@@ -168,18 +172,22 @@ CREATE TABLE IF NOT EXISTS `item` (
   `author-link` char(255) NOT NULL,
   `author-avatar` char(255) NOT NULL,
   `title` char(255) NOT NULL,
-  `body` text NOT NULL,
+  `body` mediumtext NOT NULL,
   `verb` char(255) NOT NULL,
   `object-type` char(255) NOT NULL,
   `object` text NOT NULL,
+  `target-type` char(255) NOT NULL,
+  `target` text NOT NULL,
   `resource-id` char(255) NOT NULL,
   `tag` mediumtext NOT NULL,
+  `inform` mediumtext NOT NULL,
   `location` char(255) NOT NULL,
   `coord` char(255) NOT NULL,
   `allow_cid` mediumtext NOT NULL,
   `allow_gid` mediumtext NOT NULL,
   `deny_cid` mediumtext NOT NULL,
   `deny_gid` mediumtext NOT NULL,
+  `private` tinyint(1) NOT NULL DEFAULT '0',
   `visible` tinyint(1) NOT NULL DEFAULT '0',
   `unseen` tinyint(1) NOT NULL DEFAULT '1',
   `deleted` tinyint(1) NOT NULL DEFAULT '0',
@@ -221,7 +229,6 @@ CREATE TABLE IF NOT EXISTS `mail` (
   `contact-id` char(255) NOT NULL,
   `title` char(255) NOT NULL,
   `body` text NOT NULL,
-  `delivered` tinyint(1) NOT NULL,
   `seen` tinyint(1) NOT NULL,
   `replied` tinyint(1) NOT NULL,
   `uri` char(255) NOT NULL,
@@ -280,6 +287,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
   `country-name` char(255) NOT NULL,
   `gender` char(32) NOT NULL,
   `marital` char(255) NOT NULL,
+  `showwith` tinyint(1) NOT NULL DEFAULT '0',
   `with` text NOT NULL,
   `sexual` char(255) NOT NULL,
   `politic` char(255) NOT NULL,
@@ -312,7 +320,9 @@ CREATE TABLE IF NOT EXISTS `profile` (
 CREATE TABLE IF NOT EXISTS `profile_check` (
   `id` int(10) unsigned NOT NULL AUTO_INCREMENT,
   `uid` int(10) unsigned NOT NULL,
+  `cid` int(10) unsigned NOT NULL,
   `dfrn_id` char(255) NOT NULL,
+  `sec` char(255) NOT NULL,
   `expire` int(11) NOT NULL,
   PRIMARY KEY (`id`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=utf8;
@@ -345,6 +355,7 @@ CREATE TABLE IF NOT EXISTS `user` (
   `password` char(255) NOT NULL,
   `nickname` char(255) NOT NULL,
   `email` char(255) NOT NULL,
+  `openid` char(255) NOT NULL,
   `timezone` char(128) NOT NULL,
   `default-location` char(255) NOT NULL,
   `allow_location` tinyint(1) NOT NULL DEFAULT '0',
@@ -374,4 +385,37 @@ CREATE TABLE IF NOT EXISTS `register` (
   `uid` INT(11) UNSIGNED NOT NULL,
   `password` CHAR(255) NOT NULL,
   PRIMARY KEY (`id`)
-) ENGINE = MYISAM DEFAULT CHARSET=utf8;
\ No newline at end of file
+) ENGINE = MYISAM DEFAULT CHARSET=utf8;
+
+
+CREATE TABLE IF NOT EXISTS `clients` (
+`client_id` VARCHAR( 20 ) NOT NULL ,
+`pw` VARCHAR( 20 ) NOT NULL ,
+`redirect_uri` VARCHAR( 200 ) NOT NULL ,
+PRIMARY KEY ( `client_id` )
+) ENGINE = MYISAM DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `tokens` (
+`id` VARCHAR( 40 ) NOT NULL ,
+`client_id` VARCHAR( 20 ) NOT NULL ,
+`expires` INT NOT NULL ,
+`scope` VARCHAR( 200 ) NOT NULL ,
+PRIMARY KEY ( `id` )
+) ENGINE = MYISAM DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `auth_codes` (
+`id` VARCHAR( 40 ) NOT NULL ,
+`client_id` VARCHAR( 20 ) NOT NULL ,
+`redirect_uri` VARCHAR( 200 ) NOT NULL ,
+`expires` INT NOT NULL ,
+`scope` VARCHAR( 250 ) NOT NULL ,
+PRIMARY KEY ( `id` )
+) ENGINE = MYISAM DEFAULT CHARSET=utf8;
+
+CREATE TABLE IF NOT EXISTS `queue` (
+`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY ,
+`cid` INT NOT NULL ,
+`created` DATETIME NOT NULL ,
+`last` DATETIME NOT NULL ,
+`content` MEDIUMTEXT NOT NULL
+) ENGINE = MYISAM DEFAULT CHARSET=utf8;