ttygroup/boartty
Code Issues Proposed changes

Merge "Fix searching for labels with self"

Browse Source
This commit is contained in:
Jenkins 2015-01-16 00:19:03 +00:00 committed by Gerrit Code Review
commit dadda189f6
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gertty/search/parser.py
View File

@ -179,7 +179,7 @@ def SearchParser():
label_re = re.compile(r'(?P<label>[a-zA-Z0-9_-]+([a-zA-Z]|((?<![-+])[0-9])))' label_re = re.compile(r'(?P<label>[a-zA-Z0-9_-]+([a-zA-Z]|((?<![-+])[0-9])))'
r'(?P<operator>[<>]?=?)(?P<value>[-+]?[0-9]+)' r'(?P<operator>[<>]?=?)(?P<value>[-+]?[0-9]+)'
r'($|,user=(?P<user>\S+))') r'($|,(user=)?(?P<user>\S+))')
def p_label_term(p): def p_label_term(p):
'''label_term : OP_LABEL string''' '''label_term : OP_LABEL string'''
@ -200,10 +200,13 @@ def SearchParser():
filters.append(gertty.db.approval_table.c.value <= value) filters.append(gertty.db.approval_table.c.value <= value)
if user is not None: if user is not None:
filters.append(gertty.db.approval_table.c.account_key == gertty.db.account_table.c.key) filters.append(gertty.db.approval_table.c.account_key == gertty.db.account_table.c.key)
filters.append( if user == 'self':
or_(gertty.db.account_table.c.username == user, filters.append(gertty.db.account_table.c.username == p.parser.username)
gertty.db.account_table.c.email == user, else:
gertty.db.account_table.c.name == user)) filters.append(
or_(gertty.db.account_table.c.username == user,
gertty.db.account_table.c.email == user,
gertty.db.account_table.c.name == user))
s = select([gertty.db.change_table.c.key], correlate=False).where(and_(*filters)) s = select([gertty.db.change_table.c.key], correlate=False).where(and_(*filters))
p[0] = gertty.db.change_table.c.key.in_(s) p[0] = gertty.db.change_table.c.key.in_(s)