Improve database queries

[hubacji1/coffee-getter.git] / ut / test_db.py

diff --git a/ut/test_db.py b/ut/test_db.py
index 36aa5b82a4e4a27e6bc9b3953a0a758f0bb27b93..ba2a84fbb0a1e1aefc9105959b4bb204108730ba 100644 (file)
--- a/ut/test_db.py
+++ b/ut/test_db.py
@@ -12,9 +12,9 @@ class Queries(TestCase):
 
         SELECT count(*), flavor
         FROM coffees
-        WHERE time BETWEEN
+        WHERE (coffees.time BETWEEN
             datetime('now', 'localtime', '-7 days')
-            AND datetime('now', 'localtime')
+            AND datetime('now', 'localtime'))
         GROUP BY flavor
 
         """
@@ -26,9 +26,9 @@ class Queries(TestCase):
         LEFT JOIN identifiers on coffees.id = identifiers.userid
         LEFT JOIN users on identifiers.userid = users.id
         WHERE flavor = 'FOO'
-        AND coffees.time BETWEEN
+        AND (coffees.time BETWEEN
             datetime('now', 'localtime', '-7 days')
-            AND datetime('now', 'localtime')
+            AND datetime('now', 'localtime'))
         GROUP BY identifiers.userid
 
         """
@@ -38,9 +38,9 @@ class Queries(TestCase):
         LEFT JOIN identifiers on coffees.id = identifiers.userid
         LEFT JOIN users on identifiers.userid = users.id
         WHERE flavor = 'BAR'
-        AND coffees.time BETWEEN
+        AND (coffees.time BETWEEN
             datetime('FROM', 'localtime')
-            AND datetime('TO', 'localtime')
+            AND datetime('TO', 'localtime'))
         GROUP BY identifiers.userid
 
         """
@@ -49,10 +49,10 @@ class Queries(TestCase):
         SELECT count(*), users.name FROM coffees
         LEFT JOIN identifiers on coffees.id = identifiers.userid
         LEFT JOIN users on identifiers.userid = users.id
-        WHERE flavor = 'FOO' OR flavor = 'BAR' OR flavor = 'B'
-        AND coffees.time BETWEEN
+        WHERE (flavor = 'FOO' OR flavor = 'BAR' OR flavor = 'B')
+        AND (coffees.time BETWEEN
             datetime('FROM', 'localtime')
-            AND datetime('TO', 'localtime')
+            AND datetime('TO', 'localtime'))
         GROUP BY identifiers.userid
 
         """
@@ -200,52 +200,52 @@ class DrunkSummary(TestCase):
                 ("tea", 3))
 
     def test_top_mate_drinkers(self):
-        assert self.db.getTopMateDrinkers() == (
+        assert self.db.get_top_mate_drinkers() == (
                 ("tester", 4*0.5 + 4*0.33),
                 ("clone", 0.5 + 2*0.33),
                 ("newer", 2*0.33))
-        top_sorted = list(self.db.getTopMateDrinkers())
+        top_sorted = list(self.db.get_top_mate_drinkers())
         top_sorted.sort(key=lambda x: (x[1], x[0]), reverse=True)
-        assert self.db.getTopMateDrinkers() == tuple(top_sorted)
+        assert self.db.get_top_mate_drinkers() == tuple(top_sorted)
 
     def test_top_tea_drinkers(self):
         assert self.db.get_top_tea_drinkers() == (("clone", 2), ("tester", 1))
 
     def test_coffee_sums(self):
-        s = self.db.getDrunkSum("espresso", self.lwstr, self.tdystr)
+        s = self.db.get_drunk_sum("espresso", self.lwstr, self.tdystr)
         assert s == ()
-        s = self.db.getDrunkSum("espresso lungo", self.lwstr, self.tdystr)
+        s = self.db.get_drunk_sum("espresso lungo", self.lwstr, self.tdystr)
         assert s == (("tester", 4), ("newer", 2), ("clone", 2))
 
     def test_mate_sums(self):
-        s = self.db.getDrunkSum("Club-Mate 0,33 l", self.lwstr, self.tdystr)
+        s = self.db.get_drunk_sum("Club-Mate 0,33 l", self.lwstr, self.tdystr)
         assert s == (("tester", 4), ("newer", 2), ("clone", 2))
-        s = self.db.getDrunkSum("Club-Mate 0,5 l", self.lwstr, self.tdystr)
+        s = self.db.get_drunk_sum("Club-Mate 0,5 l", self.lwstr, self.tdystr)
         assert s == (("tester", 4), ("clone", 1))
-        s = self.db.getDrunkSum(
+        s = self.db.get_drunk_sum(
                 "Club-Mate 0,5 l;Club-Mate 0,33 l",
                 self.lwstr,
                 self.tdystr)
         assert s == (("tester", 8), ("newer", 2), ("clone", 3))
-        s = self.db.getDrunkList(
+        s = self.db.get_drunk_list(
                 "Club-Mate 0,5 l;Club-Mate 0,33 l",
                 self.lwstr,
                 self.tdystr)
         assert s == {"tester": [4, 4], "newer": [0, 2], "clone": [1, 2]}
 
     def test_assert_error_raised_for_bad_number_of_arguments(self):
-        self.assertRaises(AssertionError, self.db.getDrunkSum)
-        self.assertRaises(AssertionError, self.db.getDrunkSum, "")
-        self.assertRaises(AssertionError, self.db.getDrunkSum, [])
-        self.assertRaises(AssertionError, self.db.getDrunkSum, "espresso")
+        self.assertRaises(TypeError, self.db.get_drunk_sum)
+        self.assertRaises(TypeError, self.db.get_drunk_sum, "")
+        self.assertRaises(TypeError, self.db.get_drunk_sum, [])
+        self.assertRaises(TypeError, self.db.get_drunk_sum, "espresso")
         self.assertRaises(
-                AssertionError,
-                self.db.getDrunkSum,
+                TypeError,
+                self.db.get_drunk_sum,
                 "espresso",
                 "2010-10-20")
         self.assertRaises(
-                AssertionError,
-                self.db.getDrunkSum,
+                TypeError,
+                self.db.get_drunk_sum,
                 "espresso",
                 "lungo",
                 "2010-10-20",