From c007f592b3867d318ccfdd8656b982cb2a317693 Mon Sep 17 00:00:00 2001
From: Ryan Roden-Corrent <ryan@rcorre.net>
Date: Thu, 29 Jun 2017 20:43:42 -0400
Subject: [PATCH] Use more intuitive argument order in sql.delete.

---
 qutebrowser/browser/history.py               | 4 ++--
 qutebrowser/completion/models/sqlcategory.py | 1 -
 qutebrowser/misc/sql.py                      | 4 ++--
 tests/unit/misc/test_sql.py                  | 6 +++---
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/qutebrowser/browser/history.py b/qutebrowser/browser/history.py
index e9a6ce980..86c6a6cd9 100644
--- a/qutebrowser/browser/history.py
+++ b/qutebrowser/browser/history.py
@@ -122,8 +122,8 @@ class WebHistory(sql.SqlTable):
         Args:
             url: URL string to delete.
         """
-        self.delete(url, 'url')
-        self.completion.delete(url, 'url')
+        self.delete('url', url)
+        self.completion.delete('url', url)
 
     @pyqtSlot(QUrl, QUrl, str)
     def add_from_tab(self, url, requested_url, title):
diff --git a/qutebrowser/completion/models/sqlcategory.py b/qutebrowser/completion/models/sqlcategory.py
index b074980b3..001a844b0 100644
--- a/qutebrowser/completion/models/sqlcategory.py
+++ b/qutebrowser/completion/models/sqlcategory.py
@@ -78,7 +78,6 @@ class SqlCategory(QSqlQueryModel):
 
         Args:
             pattern: string pattern to filter by.
-            columns_to_filter: indices of columns to apply pattern to.
         """
         # escape to treat a user input % or _ as a literal, not a wildcard
         pattern = pattern.replace('%', '\\%')
diff --git a/qutebrowser/misc/sql.py b/qutebrowser/misc/sql.py
index 52ae13e11..4db3fb899 100644
--- a/qutebrowser/misc/sql.py
+++ b/qutebrowser/misc/sql.py
@@ -170,12 +170,12 @@ class SqlTable(QObject):
         q.run()
         return q.value()
 
-    def delete(self, value, field):
+    def delete(self, field, value):
         """Remove all rows for which `field` equals `value`.
 
         Args:
-            value: Key value to delete.
             field: Field to use as the key.
+            value: Key value to delete.
 
         Return:
             The number of rows deleted.
diff --git a/tests/unit/misc/test_sql.py b/tests/unit/misc/test_sql.py
index 1f67f0bee..8997afc3b 100644
--- a/tests/unit/misc/test_sql.py
+++ b/tests/unit/misc/test_sql.py
@@ -124,12 +124,12 @@ def test_delete(qtbot):
     table.insert({'name': 'nine', 'val': 9, 'lucky': False})
     table.insert({'name': 'thirteen', 'val': 13, 'lucky': True})
     with pytest.raises(KeyError):
-        table.delete('nope', 'name')
+        table.delete('name', 'nope')
     with qtbot.waitSignal(table.changed):
-        table.delete('thirteen', 'name')
+        table.delete('name', 'thirteen')
     assert list(table) == [('one', 1, False), ('nine', 9, False)]
     with qtbot.waitSignal(table.changed):
-        table.delete(False, field='lucky')
+        table.delete('lucky', False)
     assert not list(table)