fix unavailable id column

This commit is contained in:
Yu Ming Zhu 2019-01-08 14:13:50 +00:00 committed by Tomas Kopecek
parent 24afeca663
commit 2e8611254c
2 changed files with 2 additions and 2 deletions

View file

@ -1751,7 +1751,7 @@ def _grplist_remove(taginfo, grpinfo, force=False):
grp_id = group['id']
clauses = ['group_id=%(grp_id)s', 'tag_id=%(tag_id)s']
if not force:
query = QueryProcessor(columns=['id'],
query = QueryProcessor(columns=['group_id', 'tag_id', 'active'],
tables=['group_config'],
values=locals(),
clauses=clauses + [eventCondition(None)])

View file

@ -188,7 +188,7 @@ class TestGrouplist(unittest.TestCase):
self.assertEqual(len(self.updates), 1)
query = self.queries[0]
self.assertEqual(' '.join(str(query).split()),
'SELECT id FROM group_config'
'SELECT group_id, tag_id, active FROM group_config'
' WHERE (group_id=%(grp_id)s)'
' AND (tag_id=%(tag_id)s)'
' AND ((active = TRUE))')