From 76d756bfb9fe3b043e12ee84670d8a6f744b64f3 Mon Sep 17 00:00:00 2001 From: Keiran Price Date: Fri, 28 Jun 2019 13:58:09 +0100 Subject: [PATCH 1/3] #17: throw exception if filter is empty --- common/database_helpers.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/database_helpers.py b/common/database_helpers.py index b3284dd0..d1466a52 100644 --- a/common/database_helpers.py +++ b/common/database_helpers.py @@ -116,7 +116,11 @@ def update_row_from_id(table, id, new_values): def get_rows_by_filter(table, filters): session = get_icat_db_session() base_query = session.query(table) + + for filter in filters: + if len(filter) == 0: + raise BadFilterError() if list(filter)[0].lower() == "where": for key in filter: where_part = filter[key] From c97b70aaf71ecdd97cf9f8f9f59a9ecaa4648e10 Mon Sep 17 00:00:00 2001 From: Keiran Price Date: Fri, 28 Jun 2019 13:59:53 +0100 Subject: [PATCH 2/3] #17: Whitspace --- common/database_helpers.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/common/database_helpers.py b/common/database_helpers.py index d1466a52..0290200e 100644 --- a/common/database_helpers.py +++ b/common/database_helpers.py @@ -116,8 +116,6 @@ def update_row_from_id(table, id, new_values): def get_rows_by_filter(table, filters): session = get_icat_db_session() base_query = session.query(table) - - for filter in filters: if len(filter) == 0: raise BadFilterError() From 2862b7c9ac9583091a19e74aa8c17bcff99907c1 Mon Sep 17 00:00:00 2001 From: Keiran Price Date: Mon, 1 Jul 2019 07:18:40 +0100 Subject: [PATCH 3/3] #17: Allow empty filters --- common/database_helpers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/database_helpers.py b/common/database_helpers.py index 0290200e..1588b236 100644 --- a/common/database_helpers.py +++ b/common/database_helpers.py @@ -118,8 +118,8 @@ def get_rows_by_filter(table, filters): base_query = session.query(table) for filter in filters: if len(filter) == 0: - raise BadFilterError() - if list(filter)[0].lower() == "where": + pass + elif list(filter)[0].lower() == "where": for key in filter: where_part = filter[key] for k in where_part: