Changeset 5755 in subversion

Timestamp:

Jan 12, 2012 2:16:51 AM (16 months ago)

Author:

alec

Message:

• Fix failure on MySQL database upgrade from 0.7 - text column can't have default value (#1488300)

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 failure on MySQL database upgrade from 0.7 - text column can't have default value (#1488300)
 - Added address book widget on compose screen
 - Use proper timezones from PHP's internal timezonedb (#1485592)

trunk/roundcubemail/SQL/mysql.initial.sql

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

trunk/roundcubemail/SQL/mysql.update.sql

@@ -224 +224 @@
 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`)