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

chore: simplify function field validation

Browse source
This commit is contained in:
Sagar Vora 2025-12-02 01:06:12 +05:30
parent c40933dca7
commit e983da0136
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
frappe/database/query.py
View file

@ -1996,8 +1996,7 @@ class SQLFunctionParser:
frappe.ValidationError,
)
elif self._is_valid_field_name(arg):
# Validate field name and check permissions
self._validate_function_field_arg(arg)
self._check_function_field_permission(arg)
return self.engine.table[arg]
# Check if it's a numeric string like "1" (for COUNT(1), etc.)
@ -2034,20 +2033,6 @@ class SQLFunctionParser:
frappe.ValidationError,
)
def _validate_function_field_arg(self, field_name: str):
"""Validate a field name used as a function argument."""
if not isinstance(field_name, str):
return # Non-string arguments are allowed (literals)
# Basic validation - should be a simple field name
if not self._is_valid_field_name(field_name):
frappe.throw(
_("Invalid field name in function: {0}. Only simple field names are allowed.").format(
field_name
),
frappe.ValidationError,
)
# Check field permission if permissions are being applied
def _check_function_field_permission(self, field_name: str):
if self.engine.apply_permissions and self.engine.doctype:
self.engine._check_field_permission(self.engine.doctype, field_name)