From b6a974347531b383e5c1896c7a9335910f2dfcbb Mon Sep 17 00:00:00 2001 From: emsit Date: Sun, 25 Oct 2015 16:45:55 +0100 Subject: [PATCH 1/2] Fix MySQL syntax error (amavis_mysql_2.10.1.sql) --- .../scripts/files/amavis/amavis_mysql_2.10.1.sql | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/modoboa_installer/scripts/files/amavis/amavis_mysql_2.10.1.sql b/modoboa_installer/scripts/files/amavis/amavis_mysql_2.10.1.sql index 0cb3d82..a7f2d3c 100644 --- a/modoboa_installer/scripts/files/amavis/amavis_mysql_2.10.1.sql +++ b/modoboa_installer/scripts/files/amavis/amavis_mysql_2.10.1.sql @@ -162,7 +162,8 @@ CREATE TABLE msgs ( subject varchar(255) CHARACTER SET utf8 COLLATE utf8_bin DEFAULT '', -- mail Subject header field, UTF8 host varchar(255) NOT NULL, -- hostname where amavisd is running - PRIMARY KEY (partition_tag,mail_id) + PRIMARY KEY (partition_tag,mail_id), + INDEX (mail_id), FOREIGN KEY (sid) REFERENCES maddr(id) ON DELETE RESTRICT ) ENGINE=InnoDB; CREATE INDEX msgs_idx_sid ON msgs (sid); @@ -191,7 +192,7 @@ CREATE TABLE msgrcpt ( wl char(1) DEFAULT ' ', -- sender whitelisted by this recip bspam_level float, -- per-recipient (total) spam level smtp_resp varchar(255) DEFAULT '', -- SMTP response given to MTA - PRIMARY KEY (partition_tag,mail_id,rseqnum) + PRIMARY KEY (partition_tag,mail_id,rseqnum), FOREIGN KEY (rid) REFERENCES maddr(id) ON DELETE RESTRICT, FOREIGN KEY (mail_id) REFERENCES msgs(mail_id) ON DELETE CASCADE ) ENGINE=InnoDB; @@ -208,7 +209,7 @@ CREATE TABLE quarantine ( mail_id varbinary(16) NOT NULL, -- long-term unique mail id chunk_ind integer unsigned NOT NULL, -- chunk number, starting with 1 mail_text blob NOT NULL, -- store mail as chunks of octets - PRIMARY KEY (partition_tag,mail_id,chunk_ind) + PRIMARY KEY (partition_tag,mail_id,chunk_ind), FOREIGN KEY (mail_id) REFERENCES msgs(mail_id) ON DELETE CASCADE ) ENGINE=InnoDB; From 1e91b3618e6618f8286fe4161f2787430d0b494b Mon Sep 17 00:00:00 2001 From: emsit Date: Sun, 25 Oct 2015 17:07:08 +0100 Subject: [PATCH 2/2] Fix MySQL create tables problem (amavis_mysql_2.7.1.sql) Tables msgrcpt and quarantine were not created during installation.. --- modoboa_installer/scripts/files/amavis/amavis_mysql_2.7.1.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/modoboa_installer/scripts/files/amavis/amavis_mysql_2.7.1.sql b/modoboa_installer/scripts/files/amavis/amavis_mysql_2.7.1.sql index 710d290..4b6bc23 100644 --- a/modoboa_installer/scripts/files/amavis/amavis_mysql_2.7.1.sql +++ b/modoboa_installer/scripts/files/amavis/amavis_mysql_2.7.1.sql @@ -165,6 +165,7 @@ CREATE TABLE msgs ( -- mail Subject header field, UTF8 host varchar(255) NOT NULL, -- hostname where amavisd is running PRIMARY KEY (partition_tag,mail_id), + INDEX (mail_id), FOREIGN KEY (sid) REFERENCES maddr(id) ON DELETE RESTRICT ) ENGINE=InnoDB; CREATE INDEX msgs_idx_sid ON msgs (sid);