Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge

2 files changed, 9 insertions, 5 deletions

diff --git a/install/schema_mysql.sql b/install/schema_mysql.sql
index c820fca25..49a2c476a 100644
--- a/install/schema_mysql.sql
+++ b/install/schema_mysql.sql
@@ -916,7 +916,6 @@ CREATE TABLE IF NOT EXISTS `outq` (
   KEY `outq_priority` (`outq_priority`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-
 CREATE TABLE IF NOT EXISTS pchan (
   `pchan_id` int(11) UNSIGNED NOT NULL AUTO_INCREMENT,
   `pchan_guid` char(191) NOT NULL DEFAULT '',
@@ -928,15 +927,16 @@ CREATE TABLE IF NOT EXISTS pchan (
   KEY `pchan_hash` (`pchan_hash`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4;
 
-
 CREATE TABLE IF NOT EXISTS `pconfig` (
   `id` int(11) NOT NULL AUTO_INCREMENT,
   `uid` int(11) NOT NULL DEFAULT 0 ,
   `cat` char(191) NOT NULL DEFAULT '',
   `k` char(191) NOT NULL DEFAULT '',
   `v` mediumtext NOT NULL,
+  `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY (`id`),
-  UNIQUE KEY `access` (`uid`,`cat`,`k`)
+  UNIQUE KEY `access` (`uid`,`cat`,`k`),
+  KEY `pconfig_updated` (`updated`)
 ) ENGINE=InnoDB  DEFAULT CHARSET=utf8mb4;
 
 CREATE TABLE IF NOT EXISTS `photo` (
@@ -947,6 +947,7 @@ CREATE TABLE IF NOT EXISTS `photo` (
   `resource_id` char(191) NOT NULL DEFAULT '',
   `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
+  `expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00',
   `title` char(191) NOT NULL DEFAULT '',
   `description` text NOT NULL,
   `album` char(191) NOT NULL DEFAULT '',
@@ -979,6 +980,7 @@ CREATE TABLE IF NOT EXISTS `photo` (
   KEY `xchan` (`xchan`),
   KEY `filesize` (`filesize`),
   KEY `resource_id` (`resource_id`),
+  KEY `expires` (`expires`),
   KEY `is_nsfw` (`is_nsfw`),
   KEY `os_storage` (`os_storage`),
   KEY `photo_usage` (`photo_usage`)
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 3bc256377..1b6cab51b 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -897,7 +897,6 @@ create index "outq_async" on outq ("outq_async");
 create index "outq_delivered" on outq ("outq_delivered");
 create index "outq_priority" on outq ("outq_priority");
 
-
 CREATE TABLE "pchan" (
   "pchan_id" serial NOT NULL,
   "pchan_guid" text NOT NULL,
@@ -906,7 +905,6 @@ CREATE TABLE "pchan" (
   "pchan_prvkey" text NOT NULL,
   PRIMARY KEY ("pchan_id")
 );
-
 create index "pchan_guid" on pchan ("pchan_guid");
 create index "pchan_hash" on pchan ("pchan_hash");
 
@@ -916,9 +914,11 @@ CREATE TABLE "pconfig" (
   "cat" text  NOT NULL,
   "k" text  NOT NULL,
   "v" text NOT NULL,
+  "updated" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
   PRIMARY KEY ("id"),
   UNIQUE ("uid","cat","k")
 );
+create index "pconfig_updated_idx" on pconfig ("updated");
 
 CREATE TABLE "photo" (
   "id" serial  NOT NULL,
@@ -928,6 +928,7 @@ CREATE TABLE "photo" (
   "resource_id" text NOT NULL,
   "created" timestamp NOT NULL,
   "edited" timestamp NOT NULL,
+  "expires" timestamp NOT NULL,
   "title" text NOT NULL,
   "description" text NOT NULL,
   "album" text NOT NULL,
@@ -961,6 +962,7 @@ create index "photo_aid" on photo ("aid");
 create index "photo_xchan" on photo ("xchan");
 create index "photo_filesize" on photo ("filesize");
 create index "photo_resource_id" on photo ("resource_id");
+create index "photo_expires_idx" on photo ("expires");
 create index "photo_usage" on photo ("photo_usage");
 create index "photo_is_nsfw" on photo ("is_nsfw");
 create index "photo_os_storage" on photo ("os_storage");