From 63d223c409d3dca2f330bdc4497a47075d162ce3 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Sun, 25 Dec 2011 16:20:51 +0100 Subject: [PATCH] Also fixes MySQL upgrade file and SQLite regular file. --- debian/changelog | 1 + debian/patches/sql-fixes.patch | 35 ++++++++++++++++++++++++++++++++++ debian/sql/mysql/0.7-1 | 4 ++++ 3 files changed, 40 insertions(+) create mode 100644 debian/patches/sql-fixes.patch diff --git a/debian/changelog b/debian/changelog index 3e935b0..437e656 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ roundcube (0.7-2) unstable; urgency=low * Fix SQLite upgrade file. Closes: #653217. + * Also fixes MySQL upgrade file and SQLite regular file. -- Vincent Bernat Sun, 25 Dec 2011 16:14:04 +0100 diff --git a/debian/patches/sql-fixes.patch b/debian/patches/sql-fixes.patch new file mode 100644 index 0000000..1b11749 --- /dev/null +++ b/debian/patches/sql-fixes.patch @@ -0,0 +1,35 @@ +Various SQL fixes for 0.7. +--- roundcubemail/SQL/mysql.update.sql (revision 5468) ++++ roundcubemail/SQL/mysql.update.sql (revision 5618) +@@ -147,4 +147,6 @@ + + -- Updates from version 0.6 ++ ++/*!40014 SET FOREIGN_KEY_CHECKS=0 */; + + ALTER TABLE `users` CHANGE `alias` `alias` varchar(128) BINARY NOT NULL; +@@ -210,4 +212,6 @@ + ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */; + ++/*!40014 SET FOREIGN_KEY_CHECKS=1 */; ++ + -- Updates from version 0.7-beta + +--- roundcubemail/SQL/sqlite.update.sql (revision 5468) ++++ roundcubemail/SQL/sqlite.update.sql (revision 5615) +@@ -247,5 +247,5 @@ + ); + +-CREATE UNIQUE INDEX ix_searches_user_type_name (user_id, type, name); ++CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name); + + DROP TABLE messages; +--- roundcubemail/SQL/sqlite.initial.sql (revision 5460) ++++ roundcubemail/SQL/sqlite.initial.sql (revision 5615) +@@ -148,5 +148,5 @@ + ); + +-CREATE UNIQUE INDEX ix_searches_user_type_name (user_id, type, name); ++CREATE UNIQUE INDEX ix_searches_user_type_name ON searches (user_id, type, name); + + -- -------------------------------------------------------- diff --git a/debian/sql/mysql/0.7-1 b/debian/sql/mysql/0.7-1 index bf99498..093ced4 100644 --- a/debian/sql/mysql/0.7-1 +++ b/debian/sql/mysql/0.7-1 @@ -1,5 +1,7 @@ -- Updates from version 0.6 +/*!40014 SET FOREIGN_KEY_CHECKS=0 */; + ALTER TABLE `users` CHANGE `alias` `alias` varchar(128) BINARY NOT NULL; ALTER TABLE `users` CHANGE `username` `username` varchar(128) BINARY NOT NULL; @@ -62,6 +64,8 @@ CREATE TABLE `cache_messages` ( PRIMARY KEY (`user_id`, `mailbox`, `uid`) ) /*!40000 ENGINE=INNODB */ /*!40101 CHARACTER SET utf8 COLLATE utf8_general_ci */; +/*!40014 SET FOREIGN_KEY_CHECKS=1 */; + -- Updates from version 0.7-beta ALTER TABLE `session` CHANGE `sess_id` `sess_id` varchar(128) NOT NULL; -- 2.39.2