From 63ba8ab235e3f48de9dcbccb55b94099533b78f2 Mon Sep 17 00:00:00 2001 From: souliane Date: Wed, 23 Oct 2013 00:28:00 +0200 Subject: [PATCH] memory: fixed getHistory behavior when parameter between=True: - the previous behavior returns the messages between X and Y + between X and X --- src/memory/sqlite.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/memory/sqlite.py b/src/memory/sqlite.py index 26f8ee47..f2c6128f 100644 --- a/src/memory/sqlite.py +++ b/src/memory/sqlite.py @@ -229,10 +229,10 @@ class SqliteStorage(object): return '%s=?' % (type_, ) if between: - query_parts.append("(%s OR %s) AND (%s or %s)" % (test_jid('source', from_jid), - test_jid('source', to_jid), - test_jid('dest', to_jid), - test_jid('dest', from_jid))) + query_parts.append("((%s AND %s) OR (%s AND %s))" % (test_jid('source', from_jid), + test_jid('dest', to_jid), + test_jid('source', to_jid), + test_jid('dest', from_jid))) else: query_parts.append("%s AND %s" % (test_jid('source', from_jid), test_jid('dest', to_jid)))