vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix(db_query): Set & use existing constants

Browse source
This commit is contained in:
Gavin D'souza 2023-01-24 13:01:05 +05:30
parent acb0dc38ae
commit 550261b3dc
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/model/base_document.py
View file

@ -353,7 +353,7 @@ class BaseDocument:
if ignore_nulls and d[fieldname] is None:
del d[fieldname]
if not is_virtual_field and field_value is _DOC_DELETED_ATTR:
elif not is_virtual_field and field_value is _DOC_DELETED_ATTR:
del d[fieldname]
return d

7
frappe/model/db_query.py
View file

@ -14,7 +14,7 @@ import frappe.share
from frappe import _
from frappe.core.doctype.server_script.server_script_utils import get_server_script_map
from frappe.database.utils import FallBackDateTimeStr, NestedSetHierarchy
from frappe.model import core_doctypes_list, optional_fields
from frappe.model import child_table_fields, core_doctypes_list, optional_fields
from frappe.model.meta import get_table_columns
from frappe.model.utils.user_settings import get_user_settings, update_user_settings
from frappe.query_builder.utils import Column
@ -51,6 +51,7 @@ STRICT_FIELD_PATTERN = re.compile(r".*/\*.*")
STRICT_UNION_PATTERN = re.compile(r".*\s(union).*\s")
ORDER_GROUP_PATTERN = re.compile(r".*[^a-z0-9-_ ,`'\"\.\(\)].*")
FN_PARAMS_PATTERN = re.compile(r".*?\((.*)\).*")
SPECIAL_FIELD_CHARS = frozenset(("(", "`", ".", "'", '"', "*"))
class DatabaseQuery:
@ -1238,7 +1239,7 @@ def get_permitted_fields(doctype, parenttype=None):
meta_fields.remove("docstatus")
if meta.istable:
meta_fields.extend(["parent", "parenttype", "parentfield"])
meta_fields.extend(child_table_fields)
else:
meta_fields.remove("idx")
@ -1253,7 +1254,7 @@ def wrap_grave_quotes(table: str) -> str:
def is_plain_field(field: str) -> bool:
for char in field:
if char in ("(", "`", ".", "'", '"', "*"):
if char in SPECIAL_FIELD_CHARS:
return False
return True