From 3d4a482fd7527cfd8ee9b86df239b7a833535cd4 Mon Sep 17 00:00:00 2001 From: alecpl <alec@alec.pl> Date: Thu, 12 Jan 2012 02:16:51 -0500 Subject: [PATCH] - Fix failure on MySQL database upgrade from 0.7 - text column can't have default value (#1488300) --- SQL/mysql.update.sql | 34 +++++++++++++++++++++++++++++++++- 1 files changed, 33 insertions(+), 1 deletions(-) diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql index 7e8f98f..300ceb5 100644 --- a/SQL/mysql.update.sql +++ b/SQL/mysql.update.sql @@ -145,7 +145,9 @@ TRUNCATE TABLE `messages`; TRUNCATE TABLE `cache`; --- Updates from version 0.6-stable +-- Updates from version 0.6 + +/*!40014 SET FOREIGN_KEY_CHECKS=0 */; ALTER TABLE `users` CHANGE `alias` `alias` varchar(128) BINARY NOT NULL; ALTER TABLE `users` CHANGE `username` `username` varchar(128) BINARY NOT NULL; @@ -177,6 +179,7 @@ `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0', `mailbox` varchar(255) BINARY NOT NULL, `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00', + `valid` tinyint(1) NOT NULL DEFAULT '0', `data` longtext NOT NULL, CONSTRAINT `user_id_fk_cache_index` FOREIGN KEY (`user_id`) REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE, @@ -207,3 +210,32 @@ INDEX `changed_index` (`changed`), PRIMARY KEY (`user_id`, `mailbox`, `uid`) ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */; + +/*!40014 SET FOREIGN_KEY_CHECKS=1 */; + +-- Updates from version 0.7-beta + +ALTER TABLE `session` CHANGE `sess_id` `sess_id` varchar(128) NOT NULL; + +-- Updates from version 0.7 + +/*!40014 SET FOREIGN_KEY_CHECKS=0 */; + +ALTER TABLE `contacts` DROP FOREIGN KEY `user_id_fk_contacts`; +ALTER TABLE `contacts` DROP INDEX `user_contacts_index`; +ALTER TABLE `contacts` MODIFY `email` text NOT NULL; +ALTER TABLE `contacts` ADD INDEX `user_contacts_index` (`user_id`,`del`); +ALTER TABLE `contacts` ADD CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_id`) + REFERENCES `users`(`user_id`) ON DELETE CASCADE ON UPDATE CASCADE; + +ALTER TABLE `cache` ALTER `user_id` DROP DEFAULT; +ALTER TABLE `cache_index` ALTER `user_id` DROP DEFAULT; +ALTER TABLE `cache_thread` ALTER `user_id` DROP DEFAULT; +ALTER TABLE `cache_messages` ALTER `user_id` DROP DEFAULT; +ALTER TABLE `contacts` ALTER `user_id` DROP DEFAULT; +ALTER TABLE `contactgroups` ALTER `user_id` DROP DEFAULT; +ALTER TABLE `contactgroupmembers` ALTER `contact_id` DROP DEFAULT; +ALTER TABLE `identities` ALTER `user_id` DROP DEFAULT; +ALTER TABLE `searches` ALTER `user_id` DROP DEFAULT; + +/*!40014 SET FOREIGN_KEY_CHECKS=1 */; -- Gitblit v1.9.1