From f6c1eb10dd3e0c7cd8a5c11292d4564e4cb46e92 Mon Sep 17 00:00:00 2001 From: phot0n Date: Sat, 18 Jun 2022 10:11:58 +0530 Subject: [PATCH] refactor(minor): modify_values * don't truncate float(s) --- frappe/database/postgres/database.py | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/frappe/database/postgres/database.py b/frappe/database/postgres/database.py index b977184e18..f9a4723d72 100644 --- a/frappe/database/postgres/database.py +++ b/frappe/database/postgres/database.py @@ -403,13 +403,12 @@ def modify_query(query): def modify_values(values): - def stringify_value(value): - if isinstance(value, int): + def modify_value(value): + if isinstance(value, (list, tuple)): + value = tuple(modify_values(value)) + + elif isinstance(value, int): value = str(value) - elif isinstance(value, float): - truncated_float = int(value) - if value == truncated_float: - value = str(truncated_float) return value @@ -418,20 +417,15 @@ def modify_values(values): if isinstance(values, dict): for k, v in values.items(): - if isinstance(v, list): - v = tuple(v) - - values[k] = stringify_value(v) + values[k] = modify_value(v) elif isinstance(values, (tuple, list)): new_values = [] for val in values: - if isinstance(val, list): - val = tuple(val) + new_values.append(modify_value(val)) - new_values.append(stringify_value(val)) values = new_values else: - values = stringify_value(values) + values = modify_value(values) return values