Improved database.sql

diff --git a/database.sql b/database.sql
index c1b64fbed7877b4eeca1a3cd29206363de5ca84e..ab8c300a88ad30383cfd70e8f1ca384b65706825 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -1,6 +1,6 @@
 -- ------------------------------------------
 -- Friendica 2022.12-dev (Giant Rhubarb)
--- DB_UPDATE_VERSION 1485
+-- DB_UPDATE_VERSION 1486
 -- ------------------------------------------
 
 
@@ -1292,6 +1292,7 @@ CREATE TABLE IF NOT EXISTS `post-media` (
        `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
        `uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
        `url` varbinary(1024) NOT NULL COMMENT 'Media URL',
+       `media-uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the activities uri-id',
        `type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Media type',
        `mimetype` varchar(60) COMMENT '',
        `height` smallint unsigned COMMENT 'Height of the media',
@@ -1311,7 +1312,9 @@ CREATE TABLE IF NOT EXISTS `post-media` (
         PRIMARY KEY(`id`),
         UNIQUE INDEX `uri-id-url` (`uri-id`,`url`(512)),
         INDEX `uri-id-id` (`uri-id`,`id`),
-       FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
+        INDEX `media-uri-id` (`media-uri-id`),
+       FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+       FOREIGN KEY (`media-uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Attached media';
 
 --

diff --git a/doc/database/db_post-media.md b/doc/database/db_post-media.md
index 59c87cd369e647bcbd017aaa80f11e383e03fbad..d6e3a703c63a2831dc3533ab8e57869e5807a56c 100644 (file)
--- a/doc/database/db_post-media.md
+++ b/doc/database/db_post-media.md
@@ -6,36 +6,38 @@ Attached media
 Fields
 ------
 
-| Field           | Description                                               | Type              | Null | Key | Default | Extra          |
-| --------------- | --------------------------------------------------------- | ----------------- | ---- | --- | ------- | -------------- |
-| id              | sequential ID                                             | int unsigned      | NO   | PRI | NULL    | auto_increment |
-| uri-id          | Id of the item-uri table entry that contains the item uri | int unsigned      | NO   |     | NULL    |                |
-| url             | Media URL                                                 | varbinary(1024)   | NO   |     | NULL    |                |
-| type            | Media type                                                | tinyint unsigned  | NO   |     | 0       |                |
-| mimetype        |                                                           | varchar(60)       | YES  |     | NULL    |                |
-| height          | Height of the media                                       | smallint unsigned | YES  |     | NULL    |                |
-| width           | Width of the media                                        | smallint unsigned | YES  |     | NULL    |                |
-| size            | Media size                                                | bigint unsigned   | YES  |     | NULL    |                |
-| preview         | Preview URL                                               | varbinary(512)    | YES  |     | NULL    |                |
-| preview-height  | Height of the preview picture                             | smallint unsigned | YES  |     | NULL    |                |
-| preview-width   | Width of the preview picture                              | smallint unsigned | YES  |     | NULL    |                |
-| description     |                                                           | text              | YES  |     | NULL    |                |
-| name            | Name of the media                                         | varchar(255)      | YES  |     | NULL    |                |
-| author-url      | URL of the author of the media                            | varbinary(383)    | YES  |     | NULL    |                |
-| author-name     | Name of the author of the media                           | varchar(255)      | YES  |     | NULL    |                |
-| author-image    | Image of the author of the media                          | varbinary(383)    | YES  |     | NULL    |                |
-| publisher-url   | URL of the publisher of the media                         | varbinary(383)    | YES  |     | NULL    |                |
-| publisher-name  | Name of the publisher of the media                        | varchar(255)      | YES  |     | NULL    |                |
-| publisher-image | Image of the publisher of the media                       | varbinary(383)    | YES  |     | NULL    |                |
+| Field           | Description                                                        | Type              | Null | Key | Default | Extra          |
+| --------------- | ------------------------------------------------------------------ | ----------------- | ---- | --- | ------- | -------------- |
+| id              | sequential ID                                                      | int unsigned      | NO   | PRI | NULL    | auto_increment |
+| uri-id          | Id of the item-uri table entry that contains the item uri          | int unsigned      | NO   |     | NULL    |                |
+| url             | Media URL                                                          | varbinary(1024)   | NO   |     | NULL    |                |
+| media-uri-id    | Id of the item-uri table entry that contains the activities uri-id | int unsigned      | YES  |     | NULL    |                |
+| type            | Media type                                                         | tinyint unsigned  | NO   |     | 0       |                |
+| mimetype        |                                                                    | varchar(60)       | YES  |     | NULL    |                |
+| height          | Height of the media                                                | smallint unsigned | YES  |     | NULL    |                |
+| width           | Width of the media                                                 | smallint unsigned | YES  |     | NULL    |                |
+| size            | Media size                                                         | bigint unsigned   | YES  |     | NULL    |                |
+| preview         | Preview URL                                                        | varbinary(512)    | YES  |     | NULL    |                |
+| preview-height  | Height of the preview picture                                      | smallint unsigned | YES  |     | NULL    |                |
+| preview-width   | Width of the preview picture                                       | smallint unsigned | YES  |     | NULL    |                |
+| description     |                                                                    | text              | YES  |     | NULL    |                |
+| name            | Name of the media                                                  | varchar(255)      | YES  |     | NULL    |                |
+| author-url      | URL of the author of the media                                     | varbinary(383)    | YES  |     | NULL    |                |
+| author-name     | Name of the author of the media                                    | varchar(255)      | YES  |     | NULL    |                |
+| author-image    | Image of the author of the media                                   | varbinary(383)    | YES  |     | NULL    |                |
+| publisher-url   | URL of the publisher of the media                                  | varbinary(383)    | YES  |     | NULL    |                |
+| publisher-name  | Name of the publisher of the media                                 | varchar(255)      | YES  |     | NULL    |                |
+| publisher-image | Image of the publisher of the media                                | varbinary(383)    | YES  |     | NULL    |                |
 
 Indexes
 ------------
 
-| Name       | Fields                   |
-| ---------- | ------------------------ |
-| PRIMARY    | id                       |
-| uri-id-url | UNIQUE, uri-id, url(512) |
-| uri-id-id  | uri-id, id               |
+| Name         | Fields                   |
+| ------------ | ------------------------ |
+| PRIMARY      | id                       |
+| uri-id-url   | UNIQUE, uri-id, url(512) |
+| uri-id-id    | uri-id, id               |
+| media-uri-id | media-uri-id             |
 
 Foreign Keys
 ------------
@@ -43,5 +45,6 @@ Foreign Keys
 | Field | Target Table | Target Field |
 |-------|--------------|--------------|
 | uri-id | [item-uri](help/database/db_item-uri) | id |
+| media-uri-id | [item-uri](help/database/db_item-uri) | id |
 
 Return to [database documentation](help/database)