Przeglądaj źródła

feat: added no_order to execute

version-14
Aradhya 3 lat temu
rodzic
commit
ae59fd7c58
2 zmienionych plików z 12 dodań i 4 usunięć
  1. +7
    -3
      frappe/database/database.py
  2. +5
    -1
      frappe/model/db_query.py

+ 7
- 3
frappe/database/database.py Wyświetl plik

@@ -395,7 +395,6 @@ class Database(object):
return self.value_cache[(doctype, filters, fieldname)]

if isinstance(filters, list):
order_by = order_by or "modified_desc"
out = self._get_value_for_many_names(doctype, filters, fieldname, debug=debug, run=run, **kwargs)

else:
@@ -571,10 +570,15 @@ class Database(object):
def _get_value_for_many_names(self, doctype, names, field, debug=False, run=True, **kwargs):
names = list(filter(None, names))
if names:
return self.get_all(doctype,
return self.get_all(
doctype,
fields=field,
filters=names,
debug=debug, as_list=1, run=run)
debug=debug,
as_list=1,
run=run,
**kwargs,
)
else:
return {}



+ 5
- 1
frappe/model/db_query.py Wyświetl plik

@@ -35,7 +35,7 @@ class DatabaseQuery(object):
join='left join', distinct=False, start=None, page_length=None, limit=None,
ignore_ifnull=False, save_user_settings=False, save_user_settings_fields=False,
update=None, add_total_row=None, user_settings=None, reference_doctype=None,
run=True, strict=True, pluck=None, ignore_ddl=False, parent_doctype=None) -> List:
run=True, strict=True, pluck=None, ignore_ddl=False, parent_doctype=None, no_order=False) -> List:
if not ignore_permissions and \
not frappe.has_permission(self.doctype, "select", user=user, parent_doctype=parent_doctype) and \
not frappe.has_permission(self.doctype, "read", user=user, parent_doctype=parent_doctype):
@@ -90,6 +90,7 @@ class DatabaseQuery(object):
self.run = run
self.strict = strict
self.ignore_ddl = ignore_ddl
self.no_order = no_order

# for contextual user permission check
# to determine which user permission is applicable on link field of specific doctype
@@ -128,6 +129,9 @@ class DatabaseQuery(object):
args.fields = 'distinct ' + args.fields
args.order_by = '' # TODO: recheck for alternative

if self.no_order:
args.order_by = ""

query = """select %(fields)s
from %(tables)s
%(conditions)s


Ładowanie…
Anuluj
Zapisz