From 889ced30357b2f0cae2fb91b3cdaf9f8f92066e1 Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Thu, 16 Jun 2022 12:32:26 +0530
Subject: [PATCH] refactor: frappe.db.sql

* Move everything except _cursor.execute outside try-except block - This
  caused multiple traceback printing (by recursion of db.sql)
* Include values mogrifying & executing via client alone in execution
  time for query
* Reduce indentations lol
---
 frappe/database/database.py | 44 +++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 24 deletions(-)

diff --git a/frappe/database/database.py b/frappe/database/database.py
index 5a84a350a8..554612b083 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -166,32 +166,23 @@ class Database(object):
 
 		# in transaction validations
 		self.check_transaction_status(query)
-
 		self.clear_db_table_cache(query)
 
-		# autocommit
 		if auto_commit:
 			self.commit()
 
-		# execute
+		if debug:
+			time_start = time()
+
+		if values:
+			if not isinstance(values, (tuple, dict, list)):
+				values = (values,)
+			query, values = self._transform_query(query, values)
+		else:
+			values = None
+
 		try:
-			if debug:
-				time_start = time()
-
-			if values != ():
-				if not isinstance(values, (dict, tuple, list)):
-					values = (values,)
-
-				query, values = self._transform_query(query, values)
-
-			self.log_query(query, values, debug, explain)
-
 			self._cursor.execute(query, values)
-
-			if debug:
-				time_end = time()
-				frappe.errprint(("Execution time: {0} sec").format(round(time_end - time_start, 2)))
-
 		except Exception as e:
 			if self.is_syntax_error(e):
 				frappe.errprint(f"Syntax error in query:\n{query}")
@@ -202,19 +193,24 @@ class Database(object):
 			elif self.is_timedout(e):
 				raise frappe.QueryTimeoutError(e)
 
+			# TODO: added temporarily
 			elif frappe.conf.db_type == "postgres":
-				# TODO: added temporarily
 				traceback.print_stack()
 				frappe.errprint(f"Error in query:\n{e}")
 				raise
 
-			if ignore_ddl and (
-				self.is_missing_column(e) or self.is_table_missing(e) or self.cant_drop_field_or_key(e)
+			if not (
+				ignore_ddl
+				and (self.is_missing_column(e) or self.is_table_missing(e) or self.cant_drop_field_or_key(e))
 			):
-				pass
-			else:
 				raise
 
+		if debug:
+			time_end = time()
+			frappe.errprint(f"Execution time: {time_end - time_start:.2f} sec")
+
+		self.log_query(query, values, debug, explain)
+
 		if auto_commit:
 			self.commit()