From 4c61bf8fadeea9325ae22f696cdff0bb4ef8dd94 Mon Sep 17 00:00:00 2001 From: souliane Date: Fri, 3 Oct 2014 12:43:59 +0200 Subject: [PATCH] memory: getHistory with limit=0 now returns an empty list, use limit=None to return all messages --- src/memory/memory.py | 2 +- src/memory/sqlite.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/memory/memory.py b/src/memory/memory.py index f9d0a324..cc5fbf75 100644 --- a/src/memory/memory.py +++ b/src/memory/memory.py @@ -350,7 +350,7 @@ class Memory(object): 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 --git a/src/memory/sqlite.py b/src/memory/sqlite.py index f78a55c3..fa860faf 100644 --- a/src/memory/sqlite.py +++ b/src/memory/sqlite.py @@ -264,13 +264,15 @@ class SqliteStorage(object): {"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 @@ class SqliteStorage(object): query_parts.append("ORDER BY timestamp DESC") - if limit: + if limit is not None: query_parts.append("LIMIT ?") values.append(limit)