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

refactor: moved get_condition to query class

Browse source
This commit is contained in:
Aradhya-Tripathi 2021-09-18 13:35:33 +05:30
parent 0a09f93889
commit 5ae95cd001
1 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
frappe/database/query.py
View file

@ -112,22 +112,6 @@ def change_orderby(order: str):
return orderby, order
def get_condition(table: str, **kwargs) -> frappe.qb:
"""Get initial table object
Args:
table (str): DocType
Returns:
frappe.qb: DocType with initial condition
"""
if kwargs.get("update"):
return frappe.qb.update(table)
if kwargs.get("into"):
return frappe.qb.into(table)
return frappe.qb.from_(table)
OPERATOR_MAP = {
"+": operator.add,
"=": operator.eq,
@ -146,8 +130,22 @@ OPERATOR_MAP = {
}
class Query:
def get_condition(self, table: str, **kwargs) -> frappe.qb:
"""Get initial table object
Args:
table (str): DocType
Returns:
frappe.qb: DocType with initial condition
"""
if kwargs.get("update"):
return frappe.qb.update(table)
if kwargs.get("into"):
return frappe.qb.into(table)
return frappe.qb.from_(table)
def criterion_query(self, table: str, criterion: Criterion, **kwargs) -> frappe.qb:
"""Generate filters from Criterion objects
@ -158,10 +156,9 @@ class Query:
Returns:
frappe.qb: condition object
"""
condition = get_condition(table, **kwargs)
condition = self.get_condition(table, **kwargs)
return condition.where(criterion)
def add_conditions(self, conditions: frappe.qb, **kwargs):
"""Adding additional conditions
@ -196,7 +193,7 @@ class Query:
table (str): DocType
filters (Union[List, Tuple], optional): Filters. Defaults to None.
"""
conditions = get_condition(table, **kwargs)
conditions = self.get_condition(table, **kwargs)
if not filters:
return conditions
if isinstance(filters, list):
@ -225,7 +222,7 @@ class Query:
Returns:
frappe.qb: conditions object
"""
conditions = get_condition(table, **kwargs)
conditions = self.get_condition(table, **kwargs)
if not filters:
return conditions