From 3d4a482fd7527cfd8ee9b86df239b7a833535cd4 Mon Sep 17 00:00:00 2001 From: alecpl Date: Thu, 12 Jan 2012 07:16:51 +0000 Subject: - Fix failure on MySQL database upgrade from 0.7 - text column can't have default value (#1488300) --- SQL/mysql.initial.sql | 2 +- SQL/mysql.update.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'SQL') diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql index f66bb1eee..b0a7ee7a9 100644 --- a/SQL/mysql.initial.sql +++ b/SQL/mysql.initial.sql @@ -101,7 +101,7 @@ CREATE TABLE `contacts` ( `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00', `del` tinyint(1) NOT NULL DEFAULT '0', `name` varchar(128) NOT NULL DEFAULT '', - `email` text NOT NULL DEFAULT '', + `email` text NOT NULL, `firstname` varchar(128) NOT NULL DEFAULT '', `surname` varchar(128) NOT NULL DEFAULT '', `vcard` longtext NULL, diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql index 0967c92ba..300ceb59d 100644 --- a/SQL/mysql.update.sql +++ b/SQL/mysql.update.sql @@ -223,7 +223,7 @@ ALTER TABLE `session` CHANGE `sess_id` `sess_id` varchar(128) NOT NULL; 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; -- cgit v1.2.3