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

refactor: using refactored TABLE_PATTERN for finding fields

Browse source
This commit is contained in:
Aradhya 2022-08-31 15:44:43 +05:30
parent 9be4daa295
commit e576d16855
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
frappe/database/query.py
View file

@ -23,7 +23,7 @@ WORDS_PATTERN = re.compile(r"\w+")
BRACKETS_PATTERN = re.compile(r"\(.*?\)|$")
SQL_FUNCTIONS = [sql_function.value for sql_function in SqlFunctions]
COMMA_PATTERN = re.compile(r",\s*(?![^()]*\))")
TABLE_PATTERN = re.compile(r"\btab\w+")
TABLE_PATTERN = re.compile(r"`\btab\w+")
def like(key: Field, value: str) -> frappe.qb:
@ -602,7 +602,7 @@ class Engine:
for idx, field in enumerate(fields):
if not is_pypika_function_object(field):
field = field if isinstance(field, str) else field.get_sql()
if "tab" not in str(field):
if not TABLE_PATTERN.search(str(field)):
fields[idx] = getattr(frappe.qb.DocType(table), field)
else:
field.args = [getattr(frappe.qb.DocType(table), arg.get_sql()) for arg in field.args]
@ -619,7 +619,6 @@ class Engine:
return criterion, fields
# try meta to validate fields and doctypes
def get_query(
self,
table: str,