Merge pull request #4473 from annando/issue-4228

[friendica.git] / database.sql

diff --git a/database.sql b/database.sql
index b55353994a6af09f64ddc6817f0aeab752214ed0..3f568a1dcf4a615b149907542ddc8cca460354a0 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 3.6-dev (Asparagus)
--- DB_UPDATE_VERSION 1242
+-- DB_UPDATE_VERSION 1253
 -- ------------------------------------------
 
 
@@ -781,7 +781,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
        `hide-friends` boolean NOT NULL DEFAULT '0' COMMENT '',
        `name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `pdesc` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-       `dob` varchar(32) NOT NULL DEFAULT '0001-01-01' COMMENT '',
+       `dob` varchar(32) NOT NULL DEFAULT '0000-00-00' COMMENT '',
        `address` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `locality` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `region` varchar(255) NOT NULL DEFAULT '' COMMENT '',
@@ -853,18 +853,18 @@ CREATE TABLE IF NOT EXISTS `push_subscriber` (
 --
 CREATE TABLE IF NOT EXISTS `queue` (
        `id` int NOT NULL auto_increment COMMENT '',
-       `cid` int NOT NULL DEFAULT 0 COMMENT '',
-       `network` varchar(32) NOT NULL DEFAULT '' COMMENT '',
-       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-       `last` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+       `cid` int NOT NULL DEFAULT 0 COMMENT 'Message receiver',
+       `network` varchar(32) NOT NULL DEFAULT '' COMMENT 'Receiver\'s network',
+       `guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'Unique GUID of the message',
+       `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date, when the message was created',
+       `last` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last trial',
+       `next` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Next retrial date',
+       `retrial` tinyint NOT NULL DEFAULT 0 COMMENT 'Retrial counter',
        `content` mediumtext COMMENT '',
        `batch` boolean NOT NULL DEFAULT '0' COMMENT '',
         PRIMARY KEY(`id`),
-        INDEX `cid` (`cid`),
-        INDEX `created` (`created`),
         INDEX `last` (`last`),
-        INDEX `network` (`network`),
-        INDEX `batch` (`batch`)
+        INDEX `next` (`next`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
 --
@@ -982,7 +982,7 @@ CREATE TABLE IF NOT EXISTS `thread` (
         INDEX `uid_created` (`uid`,`created`),
         INDEX `uid_commented` (`uid`,`commented`),
         INDEX `uid_wall_created` (`uid`,`wall`,`created`),
-        INDEX `private_wall_commented` (`private`,`wall`,`commented`)
+        INDEX `private_wall_origin_commented` (`private`,`wall`,`origin`,`commented`)
 ) DEFAULT COLLATE utf8mb4_general_ci;
 
 --
@@ -1003,9 +1003,11 @@ CREATE TABLE IF NOT EXISTS `tokens` (
 --
 CREATE TABLE IF NOT EXISTS `user` (
        `uid` mediumint NOT NULL auto_increment COMMENT '',
+       `parent-uid` mediumint NOT NULL DEFAULT 0 COMMENT 'The parent user that has full control about this user',
        `guid` varchar(64) NOT NULL DEFAULT '' COMMENT '',
        `username` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `password` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+       `legacy_password` boolean NOT NULL DEFAULT '0' COMMENT 'Is the password hash double-hashed?',
        `nickname` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `email` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `openid` varchar(255) NOT NULL DEFAULT '' COMMENT '',
@@ -1031,7 +1033,8 @@ CREATE TABLE IF NOT EXISTS `user` (
        `page-flags` tinyint NOT NULL DEFAULT 0 COMMENT '',
        `account-type` tinyint NOT NULL DEFAULT 0 COMMENT '',
        `prvnets` boolean NOT NULL DEFAULT '0' COMMENT '',
-       `pwdreset` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+       `pwdreset` varchar(255) COMMENT 'Password reset request token',
+       `pwdreset_time` datetime COMMENT 'Timestamp of the last password reset request',
        `maxreq` int NOT NULL DEFAULT 10 COMMENT '',
        `expire` int NOT NULL DEFAULT 0 COMMENT '',
        `account_removed` boolean NOT NULL DEFAULT '0' COMMENT '',
@@ -1063,7 +1066,7 @@ CREATE TABLE IF NOT EXISTS `userd` (
 --
 CREATE TABLE IF NOT EXISTS `workerqueue` (
        `id` int NOT NULL auto_increment COMMENT 'Auto incremented worker task id',
-       `parameter` text COMMENT 'Task command',
+       `parameter` mediumblob COMMENT 'Task command',
        `priority` tinyint NOT NULL DEFAULT 0 COMMENT 'Task priority',
        `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation date',
        `pid` int NOT NULL DEFAULT 0 COMMENT 'Process id of the worker',