Skip to content

Commit d004ee8

Browse files
author
Richard Jones
committed
fix MySQL backend too
1 parent 6b85b83 commit d004ee8

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

roundup/backends/back_mysql.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -559,8 +559,9 @@ def filter(self, search_matches, filterspec, sort=(None,None),
559559
v = ['%%'+self.db.sql_stringquote(s)+'%%' for s in v]
560560

561561
# now add to the where clause
562-
where.append(' or '.join(["_%s._%s LIKE '%s'"%(cn, k, s)
563-
for s in v]))
562+
where.append('('
563+
+' or '.join(["_%s._%s LIKE '%s'"%(cn, k, s) for s in v])
564+
+')')
564565
# note: args are embedded in the query string now
565566
elif isinstance(propclass, Link):
566567
if isinstance(v, type([])):
@@ -576,9 +577,10 @@ def filter(self, search_matches, filterspec, sort=(None,None),
576577
if d:
577578
v = d.keys()
578579
s = ','.join([a for x in v])
579-
where.append('(_%s._%s in (%s))'%(cn, k, s))
580+
l.append('(_%s._%s in (%s))'%(cn, k, s))
580581
args = args + v
581-
where.append(' or '.join(l))
582+
if l:
583+
where.append('(' + ' or '.join(l) +')')
582584
else:
583585
if v in ('-1', None):
584586
v = None

0 commit comments

Comments
 (0)