- Fix problems with subfolders of INBOX folder on some IMAP servers (#1487725)

- Fix handling of folders that doesn't belong to any namespace (#1487637)

4 files changed, 16 insertions, 5 deletions

diff --git a/SQL/mssql.upgrade.sql b/SQL/mssql.upgrade.sql
index eacfcf11d..f76de95d0 100644
--- a/SQL/mssql.upgrade.sql
+++ b/SQL/mssql.upgrade.sql
@@ -97,9 +97,13 @@ GO
 ALTER TABLE [dbo].[contacts] ALTER COLUMN [email] [varchar] (255) COLLATE Latin1_General_CI_AI NOT NULL

 GO

 

--- Updates from version 0.5.1

+-- Updates from version 0.5.2

 

 ALTER TABLE [dbo].[contacts] ADD [words] [text] COLLATE Latin1_General_CI_AI NULL 

 GO

-CREATE  INDEX [IX_contactgroupmembers_contact_id] ON [dbo].[contactgroupmembers]([contact_id]) ON [PRIMARY]

+CREATE INDEX [IX_contactgroupmembers_contact_id] ON [dbo].[contactgroupmembers]([contact_id]) ON [PRIMARY]

+GO

+DELETE FROM [dbo].[messages]

+GO

+DELETE FROM [dbo].[cache]

 GO

diff --git a/SQL/mysql.update.sql b/SQL/mysql.update.sql
index 47c8bb379..e8fafae67 100644
--- a/SQL/mysql.update.sql
+++ b/SQL/mysql.update.sql
@@ -133,8 +133,11 @@ ALTER TABLE `contacts` MODIFY `email` varchar(255) NOT NULL;
 
 TRUNCATE TABLE `messages`;
 
--- Updates from version 0.5.1
+-- Updates from version 0.5.2
 
 ALTER TABLE `contacts` ADD `words` TEXT NULL AFTER `vcard`;
 ALTER TABLE `contacts` CHANGE `vcard` `vcard` LONGTEXT /*!40101 CHARACTER SET utf8 */ NULL DEFAULT NULL;
 ALTER TABLE `contactgroupmembers` ADD INDEX `contactgroupmembers_contact_index` (`contact_id`);
+
+TRUNCATE TABLE `messages`;
+TRUNCATE TABLE `cache`;
diff --git a/SQL/postgres.update.sql b/SQL/postgres.update.sql
index d20b1ae2c..d86e56c38 100644
--- a/SQL/postgres.update.sql
+++ b/SQL/postgres.update.sql
@@ -90,7 +90,10 @@ ALTER TABLE contacts ALTER email TYPE varchar(255);
 
 TRUNCATE messages;
 
--- Updates from version 0.5.1
+-- Updates from version 0.5.2
 
 ALTER TABLE contacts ADD words TEXT NULL;
 CREATE INDEX contactgroupmembers_contact_id_idx ON contactgroupmembers (contact_id);
+
+TRUNCATE messages;
+TRUNCATE cache;
diff --git a/SQL/sqlite.update.sql b/SQL/sqlite.update.sql
index d8a657a98..4bbedcc7a 100644
--- a/SQL/sqlite.update.sql
+++ b/SQL/sqlite.update.sql
@@ -183,7 +183,7 @@ DROP TABLE contacts_tmp;
 DELETE FROM messages;
 
 
--- Updates from version 0.5.1
+-- Updates from version 0.5.2
 
 CREATE TABLE contacts_tmp (
     contact_id integer NOT NULL PRIMARY KEY,
@@ -221,4 +221,5 @@ CREATE INDEX ix_contacts_user_id ON contacts(user_id, email);
 DROP TABLE contacts_tmp;
 
 DELETE FROM messages;
+DELETE FROM cache;
 CREATE INDEX ix_contactgroupmembers_contact_id ON contactgroupmembers (contact_id);