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

feat(query): parse child tables via query file too

Browse source
This commit is contained in:
AarDG10 2026-01-27 13:58:32 +05:30
parent 3774a68093
commit edd15715b6
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
frappe/database/query.py
View file

@ -1450,6 +1450,16 @@ class Engine:
self.query = self.query.where(where_condition)
def get_queried_tables(self) -> list[str]:
"""Extract all table names involved in the current query."""
tables = []
for table in self.query._from:
tables.append(table.get_sql())
for join in self.query._joins:
tables.append(join.item.get_sql())
return list(set(tables))
def get_permission_query_conditions(self) -> list["RawCriterion"]:
"""Add permission query conditions from hooks and server scripts"""
from frappe.core.doctype.server_script.server_script_utils import get_server_script_map
@ -1462,6 +1472,14 @@ class Engine:
if c := frappe.call(frappe.get_attr(method), self.user, doctype=self.permission_doctype):
conditions.append(RawCriterion(f"({c})"))
active_child_tables = []
current_tables = self.get_queried_tables()
if len(current_tables) > 1:
main_table_name = f"tab{self.doctype}"
for table_name in current_tables:
if table_name != main_table_name:
active_child_tables.append(table_name)
# Get conditions from server scripts
if (
permission_script_name := get_server_script_map()
@ -1469,7 +1487,9 @@ class Engine:
.get(self.permission_doctype)
):
script = frappe.get_doc("Server Script", permission_script_name)
if condition := script.get_permission_query_conditions(self.user):
if condition := script.get_permission_query_conditions(
self.user, active_child_tables=active_child_tables
):
conditions.append(RawCriterion(f"({condition})"))
return conditions

4
frappe/model/db_query.py
View file

@ -1152,8 +1152,10 @@ from {tables}
active_child_tables = []
if len(self.tables) > 1: # only if query has multiple tables involved
main_table_name = f"tab{self.doctype}"
for table_name in self.tables:
if table_name != f"`tab{self.doctype}`":
clean_name = table_name.replace("`", "").replace('"', "")
if clean_name != main_table_name:
active_child_tables.append(table_name)
if permission_script_name := get_server_script_map().get("permission_query", {}).get(self.doctype):