Wrap long line and unify upper-casing of SQL keywords

diff --git a/coffee_db.py b/coffee_db.py
index 328d603fff5bd5136240a96d06cdefb796f2068c..acfd398fefa0794ce0de91a24082e65fb9ecbfa4 100644 (file)
--- a/coffee_db.py
+++ b/coffee_db.py
@@ -138,4 +138,5 @@ def drink_count(uid=None, start=None, stop=None):
     if stop is not None:
         clauses.append("date(time, 'localtime') <= date('now', 'localtime', '-%d days')" % int(stop))
 
-    return dict(c.execute("SELECT CASE WHEN flavor LIKE 'Club%' THEN 'Club-Mate' ELSE 'Coffee' END AS drink,COUNT() FROM coffees where " + " and ".join(clauses) + " GROUP BY drink", args))
+    return dict(c.execute("SELECT CASE WHEN flavor LIKE 'Club%' THEN 'Club-Mate' ELSE 'Coffee' END AS drink, COUNT() "
+                          "FROM coffees WHERE " + " AND ".join(clauses) + " GROUP BY drink", args))