Changeset 3288 in subversion

Timestamp:

Feb 24, 2010 2:46:13 PM (3 years ago)

Author:

alec

Message:

• Fix adding contacts SQL error on mysql (#1486459)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• SQL/mysql.initial.sql (modified) (1 diff)
• SQL/mysql.update.sql (modified) (1 diff)

trunk/roundcubemail/CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix adding contacts SQL error on mysql (#1486459)
 - Squirrelmail_usercopy: support reply-to field (#1486506)
 - Fix IE spellcheck suggestion popup issue (#1486471)

trunk/roundcubemail/SQL/mysql.initial.sql

@@ -87 +87 @@
  `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',

trunk/roundcubemail/SQL/mysql.update.sql

@@ -78 +78 @@
  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 */;