From c8d1bf4cdf1e1d0f16538b3121f8c022c17d02bf Mon Sep 17 00:00:00 2001 From: Michael Date: Mon, 1 Aug 2022 07:06:30 +0000 Subject: [PATCH] Code standards and updated database documentation --- database.sql | 17 ++++++++++++++- doc/database.md | 1 + doc/database/db_fetch-entry.md | 33 ++++++++++++++++++++++++++++++ src/Protocol/ActivityPub/Fetch.php | 1 - 4 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 doc/database/db_fetch-entry.md diff --git a/database.sql b/database.sql index a2f09e1c38..7663b71590 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ -- Friendica 2022.09-dev (Giant Rhubarb) --- DB_UPDATE_VERSION 1476 +-- DB_UPDATE_VERSION 1477 -- ------------------------------------------ @@ -632,6 +632,21 @@ CREATE TABLE IF NOT EXISTS `fcontact` ( FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Diaspora compatible contacts - used in the Diaspora implementation'; +-- +-- TABLE fetch-entry +-- +CREATE TABLE IF NOT EXISTS `fetch-entry` ( + `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', + `url` varbinary(255) COMMENT 'url that awaiting to be fetched', + `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation date of the fetch request', + `wid` int unsigned COMMENT 'Workerqueue id', + PRIMARY KEY(`id`), + UNIQUE INDEX `url` (`url`), + INDEX `created` (`created`), + INDEX `wid` (`wid`), + FOREIGN KEY (`wid`) REFERENCES `workerqueue` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE +) DEFAULT COLLATE utf8mb4_general_ci COMMENT=''; + -- -- TABLE fsuggest -- diff --git a/doc/database.md b/doc/database.md index 9932ee307a..2bd2fa5f49 100644 --- a/doc/database.md +++ b/doc/database.md @@ -24,6 +24,7 @@ Database Tables | [endpoint](help/database/db_endpoint) | ActivityPub endpoints - used in the ActivityPub implementation | | [event](help/database/db_event) | Events | | [fcontact](help/database/db_fcontact) | Diaspora compatible contacts - used in the Diaspora implementation | +| [fetch-entry](help/database/db_fetch-entry) | | | [fsuggest](help/database/db_fsuggest) | friend suggestion stuff | | [group](help/database/db_group) | privacy groups, group info | | [group_member](help/database/db_group_member) | privacy groups, member info | diff --git a/doc/database/db_fetch-entry.md b/doc/database/db_fetch-entry.md new file mode 100644 index 0000000000..4b3cba1042 --- /dev/null +++ b/doc/database/db_fetch-entry.md @@ -0,0 +1,33 @@ +Table fetch-entry +=========== + + + +Fields +------ + +| Field | Description | Type | Null | Key | Default | Extra | +| ------- | ---------------------------------- | -------------- | ---- | --- | ------------------- | -------------- | +| id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | +| url | url that awaiting to be fetched | varbinary(255) | YES | | NULL | | +| created | Creation date of the fetch request | datetime | NO | | 0001-01-01 00:00:00 | | +| wid | Workerqueue id | int unsigned | YES | | NULL | | + +Indexes +------------ + +| Name | Fields | +| ------- | ----------- | +| PRIMARY | id | +| url | UNIQUE, url | +| created | created | +| wid | wid | + +Foreign Keys +------------ + +| Field | Target Table | Target Field | +|-------|--------------|--------------| +| wid | [workerqueue](help/database/db_workerqueue) | id | + +Return to [database documentation](help/database) diff --git a/src/Protocol/ActivityPub/Fetch.php b/src/Protocol/ActivityPub/Fetch.php index 198202b1c1..54666e691e 100644 --- a/src/Protocol/ActivityPub/Fetch.php +++ b/src/Protocol/ActivityPub/Fetch.php @@ -80,5 +80,4 @@ class Fetch return DBA::exists('workerqueue', ['id' => $fetch['wid'], 'done' => false]); } - }