Imported Upstream version 0.7.2

[roundcube.git] / SQL / mysql.update.sql

diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql
index 3e6b955fc379b74dbb7b361d5996dec5cf0945f8..177ba936bcd3d4204e03074cdb41def29b1c5549 100644 (file)
--- a/SQL/mysql.update.sql
+++ b/SQL/mysql.update.sql
@@ -215,9 +215,11 @@ 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 DEFAULT '';
+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;
@@ -231,3 +233,5 @@ 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 */;