Also fixes MySQL upgrade file and SQLite regular file.

diff --git a/debian/changelog b/debian/changelog
index 3e935b0132c77d19d39b341f5dc27b7a8716114e..437e656c46928606f716bc2d049c7835e796d2cb 100644 (file)
--- 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 <bernat@debian.org>  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 (file)
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 bf994983f08912401385cbe62b96894dfb7399db..093ced4c9acdd3a80fff945883ec1ca1f93fc732 100644 (file)
--- 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;