Fix ambiguous column names

This commit is contained in:
Jonathan Wong 2015-09-16 13:11:38 -07:00
parent fc75232519
commit adc808ac9f
2 changed files with 5 additions and 5 deletions

View file

@ -583,19 +583,19 @@ class WebInterface(object):
custom_where = [['user', user]]
if 'rating_key' in kwargs:
rating_key = kwargs.get('rating_key', "")
custom_where = [['rating_key', rating_key]]
custom_where = [['session_history.rating_key', rating_key]]
if 'parent_rating_key' in kwargs:
rating_key = kwargs.get('parent_rating_key', "")
custom_where = [['parent_rating_key', rating_key]]
custom_where = [['session_history.parent_rating_key', rating_key]]
if 'grandparent_rating_key' in kwargs:
rating_key = kwargs.get('grandparent_rating_key', "")
custom_where = [['grandparent_rating_key', rating_key]]
custom_where = [['session_history.grandparent_rating_key', rating_key]]
if 'start_date' in kwargs:
start_date = kwargs.get('start_date', "")
custom_where = [['strftime("%Y-%m-%d", datetime(date, "unixepoch", "localtime"))', start_date]]
if 'reference_id' in kwargs:
reference_id = kwargs.get('reference_id', "")
custom_where = [['reference_id', reference_id]]
custom_where = [['session_history.reference_id', reference_id]]
data_factory = datafactory.DataFactory()
history = data_factory.get_history(kwargs=kwargs, custom_where=custom_where, grouping=grouping)