From bbd684807d0ed8065f31c587fdff1c6b12dc33a1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Tue, 19 Jul 2022 01:45:44 +0200 Subject: [PATCH] Don't merge: - updated database structure files from reverted commit #BlacklistIsNoRacism --- database.sql | 2 +- doc/database/db_cache.md | 12 ++++++------ doc/database/db_contact.md | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/database.sql b/database.sql index 53166dc6eb..62d5f5ffd7 100644 --- a/database.sql +++ b/database.sql @@ -482,7 +482,7 @@ CREATE TABLE IF NOT EXISTS `attach` ( -- TABLE cache -- CREATE TABLE IF NOT EXISTS `cache` ( - `k` varbinary(255) NOT NULL COMMENT 'cache key', + `k` varchar(255) NOT NULL COMMENT 'cache key', `v` mediumtext COMMENT 'cached serialized value', `expires` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of cache expiration', `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of cache insertion', diff --git a/doc/database/db_cache.md b/doc/database/db_cache.md index 27a11daa66..b2780d6224 100644 --- a/doc/database/db_cache.md +++ b/doc/database/db_cache.md @@ -6,12 +6,12 @@ Stores temporary data Fields ------ -| Field | Description | Type | Null | Key | Default | Extra | -| ------- | ---------------------------- | -------------- | ---- | --- | ------------------- | ----- | -| k | cache key | varbinary(255) | NO | PRI | NULL | | -| v | cached serialized value | mediumtext | YES | | NULL | | -| expires | datetime of cache expiration | datetime | NO | | 0001-01-01 00:00:00 | | -| updated | datetime of cache insertion | datetime | NO | | 0001-01-01 00:00:00 | | +| Field | Description | Type | Null | Key | Default | Extra | +| ------- | ---------------------------- | ------------ | ---- | --- | ------------------- | ----- | +| k | cache key | varchar(255) | NO | PRI | NULL | | +| v | cached serialized value | mediumtext | YES | | NULL | | +| expires | datetime of cache expiration | datetime | NO | | 0001-01-01 00:00:00 | | +| updated | datetime of cache insertion | datetime | NO | | 0001-01-01 00:00:00 | | Indexes ------------ diff --git a/doc/database/db_contact.md b/doc/database/db_contact.md index 66fc7e97ba..8c986661c7 100644 --- a/doc/database/db_contact.md +++ b/doc/database/db_contact.md @@ -70,7 +70,7 @@ Fields | info | | mediumtext | YES | | NULL | | | notify_new_posts | | boolean | NO | | 0 | | | fetch_further_information | | tinyint unsigned | NO | | 0 | | -| ffi_keyword_blacklist | | text | YES | | NULL | | +| ffi_keyword_blacklist | | text | YES | | NULL | | | photo | Link to the profile photo of the contact | varbinary(383) | YES | | | | | thumb | Link to the profile photo (thumb size) | varbinary(383) | YES | | | | | micro | Link to the profile photo (micro size) | varbinary(383) | YES | | | | @@ -96,7 +96,7 @@ Fields | profile-id | Deprecated | int unsigned | YES | | NULL | | Indexes -------- +------------ | Name | Fields | | --------------------------- | ------------------------------------ | -- 2.39.5