From 64ba41b72a00abecaf6873b99640f16dd3e03925 Mon Sep 17 00:00:00 2001 From: Antoine Nguyen Date: Mon, 19 Sep 2016 11:11:01 +0200 Subject: [PATCH] Fix SQL queries. fix #922 --- doc/getting_started/upgrade.rst | 4 ++-- modoboa/admin/postfix_maps.py | 9 ++++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/doc/getting_started/upgrade.rst b/doc/getting_started/upgrade.rst index 6b25b6ce9..9c41de0f0 100644 --- a/doc/getting_started/upgrade.rst +++ b/doc/getting_started/upgrade.rst @@ -68,8 +68,8 @@ following line to your crontab:: 0 * * * * /manage.py communicate_with_public_api -Please also note that public API now uses TLS so you must update -your configuration as follows:: +Please also note that public API now uses TLS so you must update your +configuration as follows:: MODOBOA_API_URL = 'https://api.modoboa.org/1/' diff --git a/modoboa/admin/postfix_maps.py b/modoboa/admin/postfix_maps.py index b256bd966..2d13440f4 100644 --- a/modoboa/admin/postfix_maps.py +++ b/modoboa/admin/postfix_maps.py @@ -52,17 +52,20 @@ class AliasesMap(object): mysql = ( "SELECT alr.address FROM modoboa_admin_aliasrecipient AS alr " "INNER JOIN admin_alias AS al ON alr.alias_id=al.id " - "WHERE al.enabled=1 AND al.address='%s' AND al.expire_at>now()" + "WHERE al.enabled=1 AND al.address='%s' AND " + "(al.expire_at IS NULL OR al.expire_at>now())" ) postgres = ( "SELECT alr.address FROM modoboa_admin_aliasrecipient AS alr " "INNER JOIN admin_alias AS al ON alr.alias_id=al.id " - "WHERE al.enabled AND al.address='%s' AND al.expire_at>now()" + "WHERE al.enabled AND al.address='%s' AND " + "(al.expire_at IS NULL OR al.expire_at>now())" ) sqlite = ( "SELECT alr.address FROM modoboa_admin_aliasrecipient AS alr " "INNER JOIN admin_alias AS al ON alr.alias_id=al.id " - "WHERE al.enabled=1 AND al.address='%s' AND al.expire_at>now()" + "WHERE al.enabled=1 AND al.address='%s' AND " + "(al.expire_at IS NULL OR al.expire_at>now())" )