# HG changeset patch
# User souliane <souliane@mailoo.org>
# Date 1412333039 -7200
# Node ID 5e5661ab5c817112c343b25167d8a0983b9d064f
# Parent  f91e7028e2c3105c13d1737f1b4c412f038763ec
memory: getHistory with limit=0 now returns an empty list, use limit=None to return all messages

diff -r f91e7028e2c3 -r 5e5661ab5c81 src/memory/memory.py
--- a/src/memory/memory.py	Fri Oct 03 12:27:43 2014 +0200
+++ b/src/memory/memory.py	Fri Oct 03 12:43:59 2014 +0200
@@ -350,7 +350,7 @@
             extra = {}
         return self.storage.addToHistory(from_jid, to_jid, message, type_, extra, timestamp, profile)
 
-    def getHistory(self, from_jid, to_jid, limit=0, between=True, profile=C.PROF_KEY_NONE):
+    def getHistory(self, from_jid, to_jid, limit=None, between=True, profile=C.PROF_KEY_NONE):
         assert profile != C.PROF_KEY_NONE
         return self.storage.getHistory(jid.JID(from_jid), jid.JID(to_jid), limit, between, profile)
 
diff -r f91e7028e2c3 -r 5e5661ab5c81 src/memory/sqlite.py
--- a/src/memory/sqlite.py	Fri Oct 03 12:27:43 2014 +0200
+++ b/src/memory/sqlite.py	Fri Oct 03 12:43:59 2014 +0200
@@ -264,13 +264,15 @@
                                           {"from_jid": from_jid.full(), "to_jid": to_jid.full(), "message": message})))
         return d
 
-    def getHistory(self, from_jid, to_jid, limit=0, between=True, profile=None):
+    def getHistory(self, from_jid, to_jid, limit=None, between=True, profile=None):
         """Store a new message in history
         @param from_jid: source JID (full, or bare for catchall
         @param to_jid: dest JID (full, or bare for catchall
-        @param size: maximum number of messages to get, or 0 for unlimited
+        @param size: maximum number of messages to get, or None for unlimited
         """
         assert(profile)
+        if limit == 0:
+            return defer.succeed([])
 
         def sqliteToList(query_result):
             query_result.reverse()
@@ -307,7 +309,7 @@
 
         query_parts.append("ORDER BY timestamp DESC")
 
-        if limit:
+        if limit is not None:
             query_parts.append("LIMIT ?")
             values.append(limit)