From 8fb6f45bec9c82d26a653a1e96c6701fad12b020 Mon Sep 17 00:00:00 2001 From: Ryan Roden-Corrent Date: Thu, 25 May 2017 12:59:05 -0400 Subject: [PATCH] Don't set pattern in SqlCategory constructor. This will be called by the Completer after construction anyways, this was a duplicate call that could be expensive. --- qutebrowser/completion/models/sqlcategory.py | 3 +-- tests/unit/completion/test_sqlcategory.py | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/qutebrowser/completion/models/sqlcategory.py b/qutebrowser/completion/models/sqlcategory.py index 5b8cf4482..56d7ec399 100644 --- a/qutebrowser/completion/models/sqlcategory.py +++ b/qutebrowser/completion/models/sqlcategory.py @@ -61,9 +61,8 @@ class SqlCategory(QSqlQueryModel): self._query = sql.Query(querystr) self._param_count = len(filter_fields) - self.set_pattern('', [0]) - def set_pattern(self, pattern, _columns_to_filter): + def set_pattern(self, pattern, _columns_to_filter=None): """Set the pattern used to filter results. Args: diff --git a/tests/unit/completion/test_sqlcategory.py b/tests/unit/completion/test_sqlcategory.py index 3d0b07d07..2f3b8474d 100644 --- a/tests/unit/completion/test_sqlcategory.py +++ b/tests/unit/completion/test_sqlcategory.py @@ -76,6 +76,7 @@ def test_sorting(sort_by, sort_order, data, expected): table.insert(row) cat = sqlcategory.SqlCategory('Foo', filter_fields=['a'], sort_by=sort_by, sort_order=sort_order) + cat.set_pattern('') _validate(cat, expected) @@ -139,6 +140,7 @@ def test_select(): table = sql.SqlTable('Foo', ['a', 'b', 'c']) table.insert(['foo', 'bar', 'baz']) cat = sqlcategory.SqlCategory('Foo', filter_fields=['a'], select='b, c, a') + cat.set_pattern('') _validate(cat, [('bar', 'baz', 'foo')]) @@ -147,6 +149,7 @@ def test_where(): table.insert(['foo', 'bar', False]) table.insert(['baz', 'biz', True]) cat = sqlcategory.SqlCategory('Foo', filter_fields=['a'], where='not c') + cat.set_pattern('') _validate(cat, [('foo', 'bar', False)]) @@ -158,6 +161,7 @@ def test_group(): table.insert(['bar', 0]) cat = sqlcategory.SqlCategory('Foo', filter_fields=['a'], select='a, max(b)', group_by='a') + cat.set_pattern('') _validate(cat, [('bar', 3), ('foo', 2)])