Don't merge:

- updated database structure files from reverted commit #BlacklistIsNoRacism

diff --git a/database.sql b/database.sql
index 53166dc6eb8153a0409abfbce1f8120dad465b82..62d5f5ffd7c69bbfc1b5e8c0396ab50ae567101c 100644 (file)
--- 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 27a11daa66c7dbe8af06a5ae292b7ec2ff6d5aac..b2780d6224c89ab4ef97c9304c728c36d1948ac2 100644 (file)
--- 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 66fc7e97ba440967bfaa37274a37605987232aa3..8c986661c70b6b23c622f505028233768d48bd7f 100644 (file)
--- 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                               |
 | --------------------------- | ------------------------------------ |