From f2ada4630c36b18f8d25762551e2d5bb7a64330a Mon Sep 17 00:00:00 2001 From: Aradhya Date: Sat, 23 Jul 2022 17:18:43 +0530 Subject: [PATCH] fix: removed exessive quotes from query --- frappe/database/query.py | 8 +++++--- frappe/model/db_query.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/frappe/database/query.py b/frappe/database/query.py index 8421d417f3..29838d9486 100644 --- a/frappe/database/query.py +++ b/frappe/database/query.py @@ -3,7 +3,7 @@ import re from ast import literal_eval from functools import cached_property from types import BuiltinFunctionType -from typing import TYPE_CHECKING, Any, Callable +from typing import Any, Callable import frappe from frappe import _ @@ -465,7 +465,6 @@ class Engine: is_list = False if is_list: - fields = [field.replace("""`""", "") for field in fields] function_objects += self.function_objects_from_list(fields=fields) is_str = isinstance(fields, str) @@ -514,6 +513,7 @@ class Engine: table: str, fields: list | tuple, filters: dict[str, str | int] | str | int | list[list | str | int] = None, + run: bool = False, **kwargs, ): # Clean up state before each query @@ -539,7 +539,9 @@ class Engine: else: query = criterion.select(fields) - + query = str(query).replace("``", "`") + if run: + return frappe.db.sql(query, **kwargs) return query diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py index 83ecc6bcf3..2fff70cd6e 100644 --- a/frappe/model/db_query.py +++ b/frappe/model/db_query.py @@ -210,7 +210,7 @@ class DatabaseQuery: % args ) - if self.locals.get("ignore_permissions"): + if self.locals.get("ignore_permissions") and ("." not in self.qb_fields): return frappe.qb.engine.get_query( table=self.doctype, fields=self.qb_fields,