Infra
/
lemur
5
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2101 from castrapel/left_outer_join 

Left outer join on domains tables to avoid missing results
This commit is contained in:
Curtis 2018-11-13 15:08:59 -08:00 committed by GitHub
parent d5bf85b3b0 495b3fd844
commit 661bc9cc13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lemur/authorities/service.py
View File

@ -178,6 +178,8 @@ def render(args):
terms = filt.split(';') terms = filt.split(';')
if 'active' in filt: if 'active' in filt:
query = query.filter(Authority.active == truthiness(terms[1])) query = query.filter(Authority.active == truthiness(terms[1]))
elif 'cn' in filt:
query = query.join(Authority.active == truthiness(terms[1]))
else: else:
query = database.filter(query, Authority, terms) query = database.filter(query, Authority, terms)

2
lemur/certificates/service.py
View File

@ -333,7 +333,7 @@ def render(args):
elif 'id' in terms: elif 'id' in terms:
query = query.filter(Certificate.id == cast(terms[1], Integer)) query = query.filter(Certificate.id == cast(terms[1], Integer))
elif 'name' in terms: elif 'name' in terms:
query = query.join(certificate_associations).join(Domain).filter( query = query.outerjoin(certificate_associations).outerjoin(Domain).filter(
or_( or_(
Certificate.name.ilike(term), Certificate.name.ilike(term),
Domain.name.ilike(term), Domain.name.ilike(term),