0x2620/openmedialibrary
1
0
Fork 0
Code Issues 131 Pull requests Releases Wiki Activity

revert ab1ac13909 (enable group_by again

Browse source
This commit is contained in:
j 2016-01-04 17:44:05 +05:30
parent 2fbe881935
commit 499c6ebc56
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
oml/queryparser.py
View file

@ -228,13 +228,11 @@ class Parser(object):
self._joins = [] self._joins = []
conditions = self.parse_conditions(data.get('query', {}).get('conditions', []), conditions = self.parse_conditions(data.get('query', {}).get('conditions', []),
data.get('query', {}).get('operator', '&')) data.get('query', {}).get('operator', '&'))
n = len(self._joins)
for c in conditions: for c in conditions:
if self._joins: if self._joins:
qs = qs.join(self._joins.pop(0)) qs = qs.join(self._joins.pop(0))
qs = qs.filter(c) qs = qs.filter(c)
# FIXME: group_by needed here to avoid # FIXME: group_by needed here to avoid
# duplicates due to joins # duplicates due to joins.
#if n: qs = qs.group_by(self._model.id)
# qs = qs.group_by(self._model.id)
return qs return qs