Older sqlite complains about 'true' in expressions - don't use it

diff --git a/coffee_db.py b/coffee_db.py
index 6cd70ff56765ec5b24183226a764edc536d32792..6207b29d3764c781e0cfdcfb63c448d2bbf1961a 100644 (file)
--- a/coffee_db.py
+++ b/coffee_db.py
@@ -118,28 +118,21 @@ def coffee_count(uid=None, start=None, stop=None):
     conn, c = open_db()
 
     args = []
+    clauses = []
 
     if uid is not None:
-        uid_q = "id = ?"
+        clauses.append("id = ?")
         args.append(uid)
-    else:
-        uid_q = "true"
 
     if start is not None:
-        start_q = "date(time) >= date('now', -? || ' days')"
-        args.append(start)
-    else:
-        start_q = "true"
+        clauses.append("date(time) >= date('now', '-%d days')" % int(start))
 
     if stop is not None:
-        stop_q = "date(time) <= date('now', -? || ' days')"
-        args.append(stop)
-    else:
-        stop_q = "true"
+        clauses.append("date(time) <= date('now', '-%d days')" % int(stop))
 
     for count, in c.execute(
             "select count(*) from coffees where " +
-            " and ".join([uid_q, start_q, stop_q])
+            " and ".join(clauses)
             , args):
         res = count