From a5b7f1f94754c254200d7dbc1b00f5a3d5cfdcc0 Mon Sep 17 00:00:00 2001 From: SJ Date: Sat, 3 May 2014 19:13:30 +0200 Subject: [PATCH] fixed upgrade script --- util/db-upgrade-0.1.24-vs-0.1.25.sql | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/util/db-upgrade-0.1.24-vs-0.1.25.sql b/util/db-upgrade-0.1.24-vs-0.1.25.sql index 1d8aff68..c25190ac 100644 --- a/util/db-upgrade-0.1.24-vs-0.1.25.sql +++ b/util/db-upgrade-0.1.24-vs-0.1.25.sql @@ -14,12 +14,6 @@ alter table retention_rule change column `subject` `subject` varchar(128) defaul alter table archiving_rule add column `attachment_name` varchar(128) default null; alter table retention_rule add column `attachment_name` varchar(128) default null; -alter table archiving_rule drop index `from`; -create unique index `entry` on archiving_rule (`domain`,`from`,`to`,`subject`,`_size`,`size`,`attachment_name`,`attachment_type`,`_attachment_size`,`attachment_size`,`spam`); - -create unique index `entry` on retention_rule (`domain`,`from`,`to`,`subject`,`_size`,`size`,`attachment_name`,`attachment_type`,`_attachment_size`,`attachment_size`,`spam`); - - alter table ldap add column ldap_mail_attr varchar(128) default null; alter table ldap add column ldap_account_objectclass varchar(128) default null; alter table ldap add column ldap_distributionlist_attr varchar(128) default null; @@ -35,3 +29,7 @@ create table if not exists `autosearch` ( ) Engine=InnoDB; +create unique index `entry` on archiving_rule (`domain`,`from`,`to`,`subject`,`_size`,`size`,`attachment_name`,`attachment_type`,`_attachment_size`,`attachment_size`,`spam`); + +create unique index `entry` on retention_rule (`domain`,`from`,`to`,`subject`,`_size`,`size`,`attachment_name`,`attachment_type`,`_attachment_size`,`attachment_size`,`spam`); +