# HG changeset patch
# User souliane <souliane@mailoo.org>
# Date 1382480880 -7200
# Node ID 66633443bcd7ab109c5e861178f795b0148a8c88
# Parent  8281587eb5287c0530f34e8c06b8795192d1a8cb
memory: fixed getHistory behavior when parameter between=True:
- the previous behavior returns the messages between X and Y + between X and X

diff -r 8281587eb528 -r 66633443bcd7 src/memory/sqlite.py
--- a/src/memory/sqlite.py	Tue Oct 22 16:24:11 2013 +0200
+++ b/src/memory/sqlite.py	Wed Oct 23 00:28:00 2013 +0200
@@ -229,10 +229,10 @@
             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)))