From 9faec329c638d865c761ef5a68a918de6fce3204 Mon Sep 17 00:00:00 2001 From: Kipchirchir Sigei Date: Sat, 18 Mar 2023 21:30:41 +0300 Subject: [PATCH] cleanup Signed-off-by: Kipchirchir Sigei --- onadata/apps/viewer/parsed_instance_tools.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/onadata/apps/viewer/parsed_instance_tools.py b/onadata/apps/viewer/parsed_instance_tools.py index 959a382912..607dff8450 100644 --- a/onadata/apps/viewer/parsed_instance_tools.py +++ b/onadata/apps/viewer/parsed_instance_tools.py @@ -68,21 +68,19 @@ def _parse_where(query, known_integers, known_decimals, or_where, or_params): except ValueError: pass if field_key in NONE_JSON_FIELDS: - where_params.append(text(_v)) + where_params.extend([text(_v)]) else: - where_params.append(text(_v)) - where.append(f"{field_key} = %s") + where_params.extend((field_key, text(_v))) else: if field_key in NONE_JSON_FIELDS: where.append(f"{NONE_JSON_FIELDS[field_key]} = %s") where_params.append(text(field_value)) elif field_value is None: - where.append(f"json->>%s IS NULL") + where.append("json->>%s IS NULL") where_params.append(field_key) else: - where.append(f"json->>%s = %s") - where_params.append(field_key) - where_params.append(text(field_value)) + where.append("json->>%s = %s") + where_params.extend((field_key, text(field_value))) return where + or_where, where_params + or_params