From 0adf5e127a91eade38c88da6119365ce554c667f Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 16 Jun 2022 12:31:14 +0530 Subject: [PATCH] fix(db): Track query engine under db._filter_engine --- frappe/database/database.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/frappe/database/database.py b/frappe/database/database.py index 181eda98ab..5a84a350a8 100644 --- a/frappe/database/database.py +++ b/frappe/database/database.py @@ -1,14 +1,12 @@ # Copyright (c) 2022, Frappe Technologies Pvt. Ltd. and Contributors # License: MIT. See LICENSE -# Database Module -# -------------------- - import datetime import json import random import re import string +import traceback from contextlib import contextmanager from time import time from typing import Dict, List, Optional, Tuple, Union @@ -75,15 +73,16 @@ class Database(object): self.password = password or frappe.conf.db_password self.value_cache = {} + # self.last_query last sql query executed @property def query(self): - if not hasattr(self, "_query"): + if not hasattr(self, "_filter_engine"): from .query import Query - self._query = Query() + self._filter_engine = Query() del Query - return self._query + return self._filter_engine def setup_type_map(self): pass @@ -205,8 +204,6 @@ class Database(object): elif frappe.conf.db_type == "postgres": # TODO: added temporarily - import traceback - traceback.print_stack() frappe.errprint(f"Error in query:\n{e}") raise