Skip to content

Commit

Permalink
#41: Whitespace changes
Browse files Browse the repository at this point in the history
  • Loading branch information
keiranjprice101 committed Sep 11, 2019
1 parent d8a8499 commit 12adcab
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions common/database_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,6 @@ def get_filtered_read_query_results(filter_handler, filters, query):
query.session.close()



def _get_results_with_include(filters, results):
"""
Given a list of entities and a list of filters, use the include filter to nest the included entities requested in
Expand All @@ -390,6 +389,7 @@ def _get_distinct_fields_as_dicts(results):
dictionaries.append(dictionary)
return dictionaries


def get_rows_by_filter(table, filters):
"""
Given a list of filters supplied in json format, returns entities that match the filters from the given table
Expand All @@ -402,7 +402,6 @@ def get_rows_by_filter(table, filters):
return get_filtered_read_query_results(filter_handler, filters, query)



def get_first_filtered_row(table, filters):
"""
returns the first row that matches a given filter, in a given table
Expand Down Expand Up @@ -516,7 +515,7 @@ class InstrumentFacilityCyclesQuery(ReadQuery):
def __init__(self, instrument_id):
super().__init__(FACILITYCYCLE)
investigationInstrument = aliased(INSTRUMENT)
self.base_query = self.base_query\
self.base_query = self.base_query \
.join(FACILITYCYCLE.FACILITY) \
.join(FACILITY.INSTRUMENT) \
.join(FACILITY.INVESTIGATION) \
Expand Down Expand Up @@ -555,7 +554,7 @@ class InstrumentFacilityCycleInvestigationsQuery(ReadQuery):
def __init__(self, instrument_id, facility_cycle_id):
super().__init__(INVESTIGATION)
investigationInstrument = aliased(INSTRUMENT)
self.base_query = self.base_query\
self.base_query = self.base_query \
.join(INVESTIGATION.FACILITY) \
.join(FACILITY.FACILITYCYCLE) \
.join(FACILITY.INSTRUMENT) \
Expand Down

0 comments on commit 12adcab

Please sign in to comment.