From 5d3453eeb9eaacaa761ccfa26af68adea0a99d88 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 2 Feb 2023 13:43:31 +0530
Subject: [PATCH] refactor: Re-use DefaultOrderBy value as global constant

---
 frappe/database/database.py | 7 ++++---
 frappe/database/query.py    | 4 ++--
 frappe/database/utils.py    | 2 +-
 frappe/model/db_query.py    | 6 +++---
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/frappe/database/database.py b/frappe/database/database.py
index fe258be8d7..5fd379b9c5 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -20,6 +20,7 @@ import frappe.defaults
 import frappe.model.meta
 from frappe import _
 from frappe.database.utils import (
+	DefaultOrderBy,
 	EmptyQueryValues,
 	FallBackDateTimeStr,
 	LazyMogrify,
@@ -422,7 +423,7 @@ class Database:
 		ignore=None,
 		as_dict=False,
 		debug=False,
-		order_by="KEEP_DEFAULT_ORDERING",
+		order_by=DefaultOrderBy,
 		cache=False,
 		for_update=False,
 		*,
@@ -492,7 +493,7 @@ class Database:
 		ignore=None,
 		as_dict=False,
 		debug=False,
-		order_by="KEEP_DEFAULT_ORDERING",
+		order_by=DefaultOrderBy,
 		update=None,
 		cache=False,
 		for_update=False,
@@ -551,7 +552,7 @@ class Database:
 			if (filters is not None) and (filters != doctype or doctype == "DocType"):
 				try:
 					if order_by:
-						order_by = "modified" if order_by == "KEEP_DEFAULT_ORDERING" else order_by
+						order_by = "modified" if order_by == DefaultOrderBy else order_by
 					out = self._get_values_from_table(
 						fields=fields,
 						filters=filters,
diff --git a/frappe/database/query.py b/frappe/database/query.py
index 10423f9ca4..3bf6824ab4 100644
--- a/frappe/database/query.py
+++ b/frappe/database/query.py
@@ -10,7 +10,7 @@ from pypika.queries import QueryBuilder, Table
 import frappe
 from frappe import _
 from frappe.database.operator_map import OPERATOR_MAP
-from frappe.database.utils import get_doctype_name
+from frappe.database.utils import DefaultOrderBy, get_doctype_name
 from frappe.query_builder import Criterion, Field, Order, functions
 from frappe.query_builder.functions import Function, SqlFunctions
 from frappe.query_builder.utils import PseudoColumnMapper
@@ -314,7 +314,7 @@ class Engine:
 		return _fields
 
 	def apply_order_by(self, order_by: str | None):
-		if not order_by or order_by == "KEEP_DEFAULT_ORDERING":
+		if not order_by or order_by == DefaultOrderBy:
 			return
 		for declaration in order_by.split(","):
 			if _order_by := declaration.strip():
diff --git a/frappe/database/utils.py b/frappe/database/utils.py
index 304fd72be6..d1030ca6d7 100644
--- a/frappe/database/utils.py
+++ b/frappe/database/utils.py
@@ -17,7 +17,7 @@ QueryValues = tuple | list | dict | NoneType
 
 EmptyQueryValues = object()
 FallBackDateTimeStr = "0001-01-01 00:00:00.000000"
-
+DefaultOrderBy = "KEEP_DEFAULT_ORDERING"
 NestedSetHierarchy = (
 	"ancestors of",
 	"descendants of",
diff --git a/frappe/model/db_query.py b/frappe/model/db_query.py
index 23d1aac967..c9789ae9bc 100644
--- a/frappe/model/db_query.py
+++ b/frappe/model/db_query.py
@@ -13,7 +13,7 @@ import frappe.permissions
 import frappe.share
 from frappe import _
 from frappe.core.doctype.server_script.server_script_utils import get_server_script_map
-from frappe.database.utils import FallBackDateTimeStr, NestedSetHierarchy
+from frappe.database.utils import DefaultOrderBy, FallBackDateTimeStr, NestedSetHierarchy
 from frappe.model import optional_fields
 from frappe.model.meta import get_table_columns
 from frappe.model.utils import is_virtual_doctype
@@ -73,7 +73,7 @@ class DatabaseQuery:
 		or_filters=None,
 		docstatus=None,
 		group_by=None,
-		order_by="KEEP_DEFAULT_ORDERING",
+		order_by=DefaultOrderBy,
 		limit_start=False,
 		limit_page_length=None,
 		as_list=False,
@@ -888,7 +888,7 @@ class DatabaseQuery:
 	def set_order_by(self, args):
 		meta = frappe.get_meta(self.doctype)
 
-		if self.order_by and self.order_by != "KEEP_DEFAULT_ORDERING":
+		if self.order_by and self.order_by != DefaultOrderBy:
 			args.order_by = self.order_by
 		else:
 			args.order_by = ""