From d7b7afeb1409d5d7045d054e938e7ea7f30e20b8 Mon Sep 17 00:00:00 2001 From: Mohammad Hasnain Date: Tue, 19 Oct 2021 16:18:21 +0530 Subject: [PATCH] fix: format between for creation/ modified --- frappe/model/db_query.py | 2 +- frappe/tests/test_db_query.py | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index 978f3062c5..f61f94f660 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -492,7 +492,7 @@ class DatabaseQuery(object): f.value = date_range fallback = "'0001-01-01 00:00:00'" - if (f.fieldname in ('creation', 'modified')): + if f.operator in ('>', '<') and (f.fieldname in ('creation', 'modified')): value = cstr(f.value) fallback = "NULL" diff --git a/frappe/tests/test_db_query.py b/frappe/tests/test_db_query.py index eb2c7b5283..48e97d5bb0 100644 --- a/frappe/tests/test_db_query.py +++ b/frappe/tests/test_db_query.py @@ -142,6 +142,12 @@ class TestReportview(unittest.TestCase): self.assertTrue({ "name": event1.name } not in data) self.assertTrue({ "name": event2.name } not in data) + # test between is formatted for creation column + data = DatabaseQuery("Event").execute( + filters={"creation": ["between", ["2016-07-06", "2016-07-07"]]}, + fields=["name"]) + + def test_ignore_permissions_for_get_filters_cond(self): frappe.set_user('test2@example.com') self.assertRaises(frappe.PermissionError, get_filters_cond, 'DocType', dict(istable=1), [])