Try to repair bug #610725.

diff --git a/debian/changelog b/debian/changelog
index 9c9db1b1dc961f503d9cf7d78b93854d39876167..7d4bc865b877f672a5ff425c984b9aeae8e58aa5 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+roundcube (0.5-2) experimental; urgency=low
+
+  * If 0.3.1 was installed from scratch, upgrade does not work on MySQL
+    and PostgreSQL because we try to create an index which already
+    exists. With SQLite, the error is ignored. When using PostgreSQL, drop
+    the index if it already exists. Nothing similar seems to exist with
+    MySQL. Therefore, just don't create the index. We need to handle this
+    later. See bug #610725. Not closing.
+
+ -- Vincent Bernat <bernat@debian.org>  Fri, 21 Jan 2011 21:44:05 +0100
+
 roundcube (0.5-1) experimental; urgency=low
 
   * New upstream release. Closes: #592312.

diff --git a/debian/sql/mysql/0.5-1 b/debian/sql/mysql/0.5-1
index 9d7f7586c59bb985f1607b8fe2685f47368ed951..f9eecba41977c617197cc19f06aa6096194c0fa2 100644 (file)
--- a/debian/sql/mysql/0.5-1
+++ b/debian/sql/mysql/0.5-1
@@ -11,14 +11,14 @@ ALTER TABLE `identities` ENGINE=InnoDB;
 
 TRUNCATE `messages`;
 
-ALTER TABLE `messages`
-    ADD INDEX `index_index` (`user_id`, `cache_key`, `idx`);
+-- ALTER TABLE `messages`
+--    ADD INDEX `index_index` (`user_id`, `cache_key`, `idx`);
 
-ALTER TABLE `session` 
-    CHANGE `vars` `vars` MEDIUMTEXT NOT NULL;
+-- ALTER TABLE `session` 
+--    CHANGE `vars` `vars` MEDIUMTEXT NOT NULL;
 
-ALTER TABLE `contacts`
-    ADD INDEX `user_contacts_index` (`user_id`,`email`);
+-- ALTER TABLE `contacts`
+--    ADD INDEX `user_contacts_index` (`user_id`,`email`);
 
 -- Updates from version 0.3.1
 -- WARNING: Make sure that all tables are using InnoDB engine!!!

diff --git a/debian/sql/pgsql/0.5-1 b/debian/sql/pgsql/0.5-1
index 73e50be4cbbe3f04ffbc149b2df941b0424a30ab..07a2882534d1a14b080a15d290cf07a9f12ac496 100644 (file)
--- a/debian/sql/pgsql/0.5-1
+++ b/debian/sql/pgsql/0.5-1
@@ -1,6 +1,7 @@
 -- Updates from version 0.3-stable
 
 TRUNCATE messages;
+DROP INDEX IF EXISTS messages_index_idx;
 CREATE INDEX messages_index_idx ON messages (user_id, cache_key, idx);
 DROP INDEX contacts_user_id_idx;
 CREATE INDEX contacts_user_id_idx ON contacts (user_id, email);