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

[optimize] ignore ifnull for notification counts

Browse source
This commit is contained in:
Rushabh Mehta 2016-05-25 21:38:06 +05:30
parent 9796285371
commit d9cabbcf2b
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/desk/moduleview.py
View file

@ -214,7 +214,7 @@ def get_last_modified(doctype):
def get_report_list(module, is_standard="No"):
"""Returns list on new style reports for modules."""
reports = frappe.get_list("Report", fields=["name", "ref_doctype", "report_type"], filters=
{"is_standard": is_standard, "disabled": ("in", ("0", "NULL", "")), "module": module},
{"is_standard": is_standard, "disabled": 0, "module": module},
order_by="name")
out = []

14
frappe/model/db_query.py
View file

@ -67,6 +67,7 @@ class DatabaseQuery(object):
self.ignore_ifnull = ignore_ifnull
self.flags.ignore_permissions = ignore_permissions
self.user = user or frappe.session.user
self.debug = True
if query:
result = self.run_custom_query(query)
@ -260,19 +261,24 @@ class DatabaseQuery(object):
column_name = '{tname}.{fname}'.format(tname=tname,
fname=f.fieldname)
can_be_null = True
# prepare in condition
if f.operator in ('in', 'not in'):
values = f.value
if not isinstance(values, (list, tuple)):
values = values.split(",")
fallback = ''
fallback = "''"
value = (frappe.db.escape(v.strip(), percent=False) for v in values)
value = '("{0}")'.format('", "'.join(value))
else:
df = frappe.get_meta(f.doctype).get("fields", {"fieldname": f.fieldname})
df = df[0] if df else None
if df and df.fieldtype=="Check":
can_be_null = False
if df and df.fieldtype=="Date":
value = getdate(f.value).strftime("%Y-%m-%d")
fallback = "'0000-00-00'"
@ -303,12 +309,12 @@ class DatabaseQuery(object):
value = '"{0}"'.format(frappe.db.escape(value, percent=False))
if f.fieldname in ("creation", "modified"):
column_name = "date_format({tname}.{fname},'%Y-%m-%d')".format(tname=tname,
column_name = "date_format({tname}.{fname}, '%Y-%m-%d')".format(tname=tname,
fname=f.fieldname)
if self.ignore_ifnull:
if self.ignore_ifnull or not can_be_null:
condition = '{column_name} {operator} {value}'.format(
column_name=column_name, fallback=fallback, operator=f.operator,
column_name=column_name, operator=f.operator,
value=value)
else:
condition = 'ifnull({column_name}, {fallback}) {operator} {value}'.format(