瀏覽代碼

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

fix: Patch qb for different schemas in same process
version-14
gavin 3 年之前
committed by GitHub
父節點
當前提交
dc7100757c
沒有發現已知的金鑰在資料庫的簽署中 GPG 金鑰 ID: 4AEE18F83AFDEB23
共有 2 個檔案被更改,包括 4 行新增4 行删除
  1. +2
    -2
      frappe/__init__.py
  2. +2
    -2
      frappe/query_builder/utils.py

+ 2
- 2
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()



+ 2
- 2
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

Loading…
取消
儲存