Merge pull request #2235 from lfdversluis/issue-2234-fix-delete-sqlit…

…ecachedb

Issue 2234 fix delete sqlitecachedb

Tribler/Core/CacheDB/sqlitecachedb.py

@@ -369,7 +369,7 @@ def delete(self, table_name, **argv):
                 sql += u'%s=? AND ' % k
                 arg.append(v)
         sql = sql[:-5]
-        self.execute_write(sql, argv.values())
+        self.execute_write(sql, arg)
 
     # -------- Read Operations --------
     def size(self, table_name):

Tribler/Test/Core/test_sqlitecachedb.py

@@ -194,3 +194,29 @@ def test_update(self):
         self.sqlite_test.update('person', "lastname == '4'", firstname=654, lastname=44)
         one = self.sqlite_test.fetchone("select firstname from person where lastname == 44")
         self.assertEqual(one, 654)
+
+    @blocking_call_on_reactor_thread
+    def test_delete_single_element(self):
+        """
+        This test tests whether deleting using a single element as value works.
+        """
+        self.test_insert()
+        self.sqlite_test.insert('person', lastname='x', firstname='z')
+        one = self.sqlite_test.fetchone(u"SELECT * FROM person")
+        self.assertEqual(one, ('a', 'b'))
+        self.sqlite_test.delete("person", lastname="a")
+        one = self.sqlite_test.fetchone(u"SELECT * FROM person")
+        self.assertEqual(one, ('x', 'z'))
+
+    @blocking_call_on_reactor_thread
+    def test_delete_tuple(self):
+        """
+        This test tests whether deleting using a tuple as value works.
+        """
+        self.test_insert()
+        self.sqlite_test.insert('person', lastname='x', firstname='z')
+        one = self.sqlite_test.fetchone(u"SELECT * FROM person")
+        self.assertEqual(one, ('a', 'b'))
+        self.sqlite_test.delete("person", lastname=("LIKE", "a"))
+        one = self.sqlite_test.fetchone(u"SELECT * FROM person")
+        self.assertEqual(one, ('x', 'z'))