From 08e7a72ba268fa7be271eb47e9e812c1f40f7a7b Mon Sep 17 00:00:00 2001 From: Akhil Narang Date: Thu, 13 Nov 2025 14:20:28 +0530 Subject: [PATCH] refactor: uppercase function assertions Signed-off-by: Akhil Narang --- frappe/tests/test_db.py | 4 ++-- frappe/tests/test_db_query.py | 30 +++++++++++++++--------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/frappe/tests/test_db.py b/frappe/tests/test_db.py index 9481ca3fa3..10e3442cbd 100644 --- a/frappe/tests/test_db.py +++ b/frappe/tests/test_db.py @@ -403,8 +403,8 @@ class TestDB(IntegrationTestCase): random_field, ) self.assertEqual( - next(iter(frappe.get_all("ToDo", fields=[{"COUNT": f"`{random_field}`"}], limit=1)[0])), - "count" if frappe.conf.db_type == "postgres" else f"count(`{random_field}`)", + next(iter(frappe.get_all("ToDo", fields=[{"COUNT": random_field}], limit=1)[0])), + "COUNT" if frappe.conf.db_type == "postgres" else f"COUNT(`{random_field}`)", ) # Testing update diff --git a/frappe/tests/test_db_query.py b/frappe/tests/test_db_query.py index 54123ee00d..f7752223d3 100644 --- a/frappe/tests/test_db_query.py +++ b/frappe/tests/test_db_query.py @@ -1051,28 +1051,28 @@ class TestDBQuery(IntegrationTestCase): self.assertIn("count", result[0]) def test_coalesce_with_in_ops(self): - self.assertNotIn("ifnull", frappe.get_all("User", {"first_name": ("in", ["a", "b"])}, run=0)) - self.assertIn("ifnull", frappe.get_all("User", {"first_name": ("in", ["a", None])}, run=0)) - self.assertIn("ifnull", frappe.get_all("User", {"first_name": ("in", ["a", ""])}, run=0)) - self.assertIn("ifnull", frappe.get_all("User", {"first_name": ("in", [])}, run=0)) - self.assertIn("ifnull", frappe.get_all("User", {"first_name": ("not in", ["a"])}, run=0)) - self.assertIn("ifnull", frappe.get_all("User", {"first_name": ("not in", [])}, run=0)) - self.assertIn("ifnull", frappe.get_all("User", {"first_name": ("not in", [""])}, run=0)) + self.assertNotIn("IF", frappe.get_all("User", {"first_name": ("in", ["a", "b"])}, run=0)) + self.assertIn("IFNULL", frappe.get_all("User", {"first_name": ("in", ["a", None])}, run=0)) + self.assertIn("IFNULL", frappe.get_all("User", {"first_name": ("in", ["a", ""])}, run=0)) + self.assertIn("IFNULL", frappe.get_all("User", {"first_name": ("in", [])}, run=0)) + self.assertIn("IFNULL", frappe.get_all("User", {"first_name": ("not in", ["a"])}, run=0)) + self.assertIn("IFNULL", frappe.get_all("User", {"first_name": ("not in", [])}, run=0)) + self.assertIn("IFNULL", frappe.get_all("User", {"first_name": ("not in", [""])}, run=0)) # primary key is never nullable - self.assertNotIn("ifnull", frappe.get_all("User", {"name": ("in", ["a", None])}, run=0)) - self.assertNotIn("ifnull", frappe.get_all("User", {"name": ("in", ["a", ""])}, run=0)) - self.assertNotIn("ifnull", frappe.get_all("User", {"name": ("in", (""))}, run=0)) - self.assertNotIn("ifnull", frappe.get_all("User", {"name": ("in", ())}, run=0)) + self.assertNotIn("IFNULL", frappe.get_all("User", {"name": ("in", ["a", None])}, run=0)) + self.assertNotIn("IFNULL", frappe.get_all("User", {"name": ("in", ["a", ""])}, run=0)) + self.assertNotIn("IFNULL", frappe.get_all("User", {"name": ("in", (""))}, run=0)) + self.assertNotIn("IFNULL", frappe.get_all("User", {"name": ("in", ())}, run=0)) def test_coalesce_with_datetime_ops(self): - self.assertNotIn("ifnull", frappe.get_all("User", {"last_active": (">", "2022-01-01")}, run=0)) - self.assertNotIn("ifnull", frappe.get_all("User", {"creation": ("<", "2022-01-01")}, run=0)) + self.assertNotIn("IFNULL", frappe.get_all("User", {"last_active": (">", "2022-01-01")}, run=0)) + self.assertNotIn("IFNULL", frappe.get_all("User", {"creation": ("<", "2022-01-01")}, run=0)) self.assertNotIn( - "ifnull", + "IFNULL", frappe.get_all("User", {"last_active": ("between", ("2022-01-01", "2023-01-01"))}, run=0), ) - self.assertIn("ifnull", frappe.get_all("User", {"last_active": ("<", "2022-01-01")}, run=0)) + self.assertIn("IFNULL", frappe.get_all("User", {"last_active": ("<", "2022-01-01")}, run=0)) def test_ambiguous_linked_tables(self): from frappe.desk.reportview import get