From 951c07b1b16e1635f4563239cf55664a92b7c290 Mon Sep 17 00:00:00 2001 From: alecpl Date: Wed, 24 Feb 2010 19:46:13 +0000 Subject: - Fix adding contacts SQL error on mysql (#1486459) --- SQL/mysql.initial.sql | 6 +++--- SQL/mysql.update.sql | 4 ++++ 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'SQL') diff --git a/SQL/mysql.initial.sql b/SQL/mysql.initial.sql index cca908899..25d11b50f 100644 --- a/SQL/mysql.initial.sql +++ b/SQL/mysql.initial.sql @@ -86,10 +86,10 @@ CREATE TABLE `contacts` ( `contact_id` int(10) UNSIGNED NOT NULL AUTO_INCREMENT, `changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00', `del` tinyint(1) NOT NULL DEFAULT '0', - `name` varchar(128) NOT NULL, + `name` varchar(128) NOT NULL DEFAULT '', `email` varchar(128) NOT NULL, - `firstname` varchar(128) NOT NULL, - `surname` varchar(128) NOT NULL, + `firstname` varchar(128) NOT NULL DEFAULT '', + `surname` varchar(128) NOT NULL DEFAULT '', `vcard` text NULL, `user_id` int(10) UNSIGNED NOT NULL DEFAULT '0', PRIMARY KEY(`contact_id`), diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql index 2e47aeab8..495b600ed 100644 --- a/SQL/mysql.update.sql +++ b/SQL/mysql.update.sql @@ -77,4 +77,8 @@ ALTER TABLE `contacts` ADD CONSTRAINT `user_id_fk_contacts` FOREIGN KEY (`user_i ALTER TABLE `identities` ADD CONSTRAINT `user_id_fk_identities` FOREIGN KEY (`user_id`) REFERENCES `users`(`user_id`) /*!40008 ON DELETE CASCADE ON UPDATE CASCADE */; +ALTER TABLE `contacts` ALTER `name` SET DEFAULT ''; +ALTER TABLE `contacts` ALTER `firstname` SET DEFAULT ''; +ALTER TABLE `contacts` ALTER `surname` SET DEFAULT ''; + /*!40014 SET FOREIGN_KEY_CHECKS=1 */; -- cgit v1.2.3