From 3aa7fd77ed57c2d114c453bb80799b68cc0bad75 Mon Sep 17 00:00:00 2001 From: Ankush Menat Date: Wed, 21 Feb 2024 15:27:50 +0530 Subject: [PATCH] fix: patch QB before setup_module_map (#24981) This function if cache isn't available CAN result in a DB query, this will cause cold starts to fail because QB is not yet patched. --- frappe/__init__.py | 3 ++- frappe/query_builder/utils.py | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frappe/__init__.py b/frappe/__init__.py index 66934778b4..56e3c782ad 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -300,12 +300,13 @@ def init(site: str, sites_path: str = ".", new_site: bool = False, force=False) local.qb = get_query_builder(local.conf.db_type) local.qb.get_query = get_query setup_redis_cache_connection() - setup_module_map(include_all_apps=not (frappe.request or frappe.job or frappe.flags.in_migrate)) if not _qb_patched.get(local.conf.db_type): patch_query_execute() patch_query_aggregation() + setup_module_map(include_all_apps=not (frappe.request or frappe.job or frappe.flags.in_migrate)) + local.initialised = True diff --git a/frappe/query_builder/utils.py b/frappe/query_builder/utils.py index fada6101ea..0a8169d886 100644 --- a/frappe/query_builder/utils.py +++ b/frappe/query_builder/utils.py @@ -138,7 +138,6 @@ def patch_query_execute(): # To support running union queries _SetOperation.run = execute_query _SetOperation.walk = prepare_query - frappe._qb_patched[frappe.conf.db_type] = True def patch_query_aggregation(): @@ -149,4 +148,3 @@ def patch_query_aggregation(): frappe.qb.min = _min frappe.qb.avg = _avg frappe.qb.sum = _sum - frappe._qb_patched[frappe.conf.db_type] = True