Merge pull request #17200 from gavindsouza/fix-qb-patched

fix: Patch qb for different schemas in same process

frappe/__init__.py

@@ -45,7 +45,7 @@ local = Local()
 STANDARD_USERS = ("Guest", "Administrator")
 
 _dev_server = int(sbool(os.environ.get("DEV_SERVER", False)))
-_qb_patched = False
+_qb_patched = {}
 re._MAXCACHE = (
 	50  # reduced from default 512 given we are already maintaining this on parent worker
 )
@@ -243,7 +243,7 @@ def init(site, sites_path=None, new_site=False):
 
 	setup_module_map()
 
-	if not _qb_patched:
+	if not _qb_patched.get(local.conf.db_type):
 		patch_query_execute()
 		patch_query_aggregation()
 

frappe/query_builder/utils.py

@@ -104,7 +104,7 @@ def patch_query_execute():
 
 	builder_class.run = execute_query
 	builder_class.walk = prepare_query
-	frappe._qb_patched = True
+	frappe._qb_patched[frappe.conf.db_type] = True
 
 
 def patch_query_aggregation():
@@ -115,4 +115,4 @@ def patch_query_aggregation():
 	frappe.qb.min = _min
 	frappe.qb.avg = _avg
 	frappe.qb.sum = _sum
-	frappe._qb_patched = True
+	frappe._qb_patched[frappe.conf.db_type] = True