Merge pull request #1105 from noplanman/mysql_fixes

MySQL fixes

Author: noplanman

CHANGELOG.md

@@ -19,6 +19,7 @@ Exclamation symbols (:exclamation:) note something of importance e.g. breaking c
 ### Removed
 ### Fixed
 - Primary key for `poll_answer` also requires the `user_id`.
+- Small SQL foreign key fixes.
 ### Security
 
 ## [0.62.0] - 2020-04-08

structure.sql

@@ -133,7 +133,6 @@ CREATE TABLE IF NOT EXISTS `message` (
   FOREIGN KEY (`forward_from`) REFERENCES `user` (`id`),
   FOREIGN KEY (`forward_from_chat`) REFERENCES `chat` (`id`),
   FOREIGN KEY (`reply_to_chat`, `reply_to_message`) REFERENCES `message` (`chat_id`, `id`),
-  FOREIGN KEY (`forward_from`) REFERENCES `user` (`id`),
   FOREIGN KEY (`left_chat_member`) REFERENCES `user` (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci;
 

utils/db-schema-update/0.60.0-0.61.0.sql

@@ -1,4 +1,10 @@
+SET FOREIGN_KEY_CHECKS=0;
+
+ALTER TABLE `telegram_update`
+DROP KEY `message_id`;
+
 ALTER TABLE `telegram_update`
-DROP KEY `message_id`,
 ADD KEY `message_id` (`message_id`),
 ADD KEY `chat_message_id` (`chat_id`, `message_id`);
+
+SET FOREIGN_KEY_CHECKS=1;

utils/db-schema-update/0.62.0-unreleased.sql

@@ -4,3 +4,5 @@ ALTER TABLE `poll` ADD COLUMN `open_period` int UNSIGNED DEFAULT NULL COMMENT 'A
 ALTER TABLE `poll` ADD COLUMN `close_date` timestamp NULL DEFAULT NULL COMMENT 'Point in time (Unix timestamp) when the poll will be automatically closed' AFTER `open_period`;
 
 ALTER TABLE `poll_answer` DROP PRIMARY KEY, ADD PRIMARY KEY (`poll_id`, `user_id`);
+
+ALTER TABLE `message` DROP CONSTRAINT `message_ibfk_6`;