Merge branch 'dev' into table-error

unittests/test_cfood.py

@@ -140,9 +140,9 @@ class InsertionTest(unittest.TestCase):
         int_name = "Test int"
         types_and_values = {
             int_name: ("INT", 5),
-            "Test float": ("FLOAT", 3.14),
-            "Test bool": ("BOOLEAN", True),
-            "Test string": ("STRING", "bla")
+            "Test float": (db.DOUBLE, 3.14),
+            "Test bool": (db.BOOLEAN, True),
+            "Test string": (db.TEXT, "bla")
         }
 
         for name, ty_val in types_and_values.items():