From 664fb799db539a8f65f48bbd3d019127b0f09b0e Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Fri, 27 Apr 2018 08:53:20 +0200 Subject: [PATCH] Fixed SQLite query. fix #1476 --- modoboa/admin/postfix_maps.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/modoboa/admin/postfix_maps.py b/modoboa/admin/postfix_maps.py index 62b84748c..a1c58d410 100644 --- a/modoboa/admin/postfix_maps.py +++ b/modoboa/admin/postfix_maps.py @@ -136,16 +136,16 @@ class SenderLoginMap(object): "WHERE al.enabled AND al.address='%s')" ) sqlite = ( - "(SELECT email FROM core_user WHERE email='%s' AND is_active=1) " + "SELECT email FROM core_user WHERE email='%s' AND is_active=1 " "UNION " - "(SELECT mb.address || '@' || dom.name FROM admin_mailbox mb " + "SELECT mb.address || '@' || dom.name FROM admin_mailbox mb " "INNER JOIN admin_senderaddress sad ON sad.mailbox_id=mb.id " "INNER JOIN admin_domain dom ON dom.id=mb.domain_id " - "WHERE sad.address='%s') " + "WHERE sad.address='%s' " "UNION " - "(SELECT mb.address || '@' || dom.name FROM admin_mailbox mb " - "INNER JOIN modoboa_admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id" - " INNER JOIN admin_domain dom ON dom.id=mb.domain_id" - " INNER JOIN admin_alias al ON alr.alias_id=al.id " - "WHERE al.enabled=1 AND al.address='%s')" + "SELECT mb.address || '@' || dom.name FROM admin_mailbox mb " + "INNER JOIN modoboa_admin_aliasrecipient alr ON alr.r_mailbox_id=mb.id " + "INNER JOIN admin_domain dom ON dom.id=mb.domain_id " + "INNER JOIN admin_alias al ON alr.alias_id=al.id " + "WHERE al.enabled=1 AND al.address='%s'" )