fix: fixed spacing and ui tests

frappe/core/doctype/activity_log/feed.py

@@ -26,12 +26,12 @@ def update_feed(doc, method=None):
 
 			feed = frappe._dict(feed)
 			doctype = feed.doctype or doc.doctype
-			name = feed.name or doc.name
-			
-			
-			frappe.db.delete("Activity Log", {"reference_doctype": doctype,
-											  "reference_name": name,
-											  "link_doctype": feed.link_doctype})
+			name = feed.name or doc.name			
+			frappe.db.delete("Activity Log", {
+                "reference_doctype": doctype,
+                "reference_name": name,
+                "link_doctype": feed.link_doctype
+            })
 			# frappe.db.sql("""delete from `tabActivity Log`
 			# 	where
 			# 		reference_doctype=%s and reference_name=%s

frappe/defaults.py

@@ -124,11 +124,15 @@ def set_default(key, value, parent, parenttype="__default"):
 		where
 			defkey=%s and parent=%s
 		for update''', (key, parent)):
-		frappe.db.sql("""
-			delete from
-				`tabDefaultValue`
-			where
-				defkey=%s and parent=%s""", (key, parent))
+		frappe.db.delete("DefaultValue", {
+			"defkey": key,
+			"parent": parent
+		})
+		# frappe.db.sql("""
+		# 	delete from
+		# 		`tabDefaultValue`
+		# 	where
+		# 		defkey=%s and parent=%s""", (key, parent))
 	if value != None:
 		add_default(key, value, parent)
 	else:

frappe/desk/doctype/desktop_icon/desktop_icon.py

@@ -197,7 +197,10 @@ def set_desktop_icons(visible_list, ignore_duplicate=True):
 
 	# clear all custom only if setup is not complete
 	if not int(frappe.defaults.get_defaults().setup_complete or 0):
-		frappe.db.sql('delete from `tabDesktop Icon` where standard=0')
+		frappe.db.delete("Desktop Icon", {
+			"standard": 0
+		})
+		# frappe.db.sql('delete from `tabDesktop Icon` where standard=0')
 
 	# set standard as blocked and hidden if setting first active domain
 	if not frappe.flags.keep_desktop_icons:

frappe/model/delete_doc.py

@@ -64,27 +64,21 @@ def delete_doc(doctype=None, name=None, force=0, ignore_doctypes=None, for_reloa
 
 				update_flags(doc, flags, ignore_permissions)
 				check_permission_and_not_submitted(doc)
-
 				frappe.db.delete("Custom Field", {
 					"dt": name
 				})
-
 				frappe.db.delete("Client Script", {
 					"dt": name
 				})
-
 				frappe.db.delete("Property Setter", {
 					"doc_type": name
 				})
-
 				frappe.db.delete("Report", {
 					"ref_doctype": name
 				})
-
 				frappe.db.delete("Custom DocPerm", {
 					"parent": name
 				})
-
 				frappe.db.delete("__global_search", {
 					"doctype": name
 				})

frappe/permissions.py

@@ -518,7 +518,7 @@ def reset_perms(doctype):
 	"""Reset permissions for given doctype."""
 	from frappe.desk.notifications import delete_notification_count_for
 	delete_notification_count_for(doctype)
-	frappe.db.delete(doctype="Custom DocPerm", conditions={"parent": doctype})
+	frappe.db.delete("Custom DocPerm", {"parent": doctype})
 
 	# frappe.db.sql("""delete from `tabCustom DocPerm` where parent=%s""", doctype)
 

frappe/sessions.py

@@ -84,7 +84,7 @@ def delete_session(sid=None, user=None, reason="Session Expired"):
 		if user_details: user = user_details[0].get("user")
 
 	logout_feed(user, reason)
-	frappe.db.delete(doctype="Sessions", conditions={"sid": sid})
+	frappe.db.delete("Sessions", {"sid": sid})
 	# frappe.db.sql("""delete from tabSessions where sid=%s""", sid)
 	frappe.db.commit()
 

frappe/utils/password.py

@@ -65,7 +65,6 @@ def set_encrypted_password(doctype, name, pwd, fieldname='password'):
 
 
 def remove_encrypted_password(doctype, name, fieldname='password'):
-
 	frappe.db.delete("__Auth", {
 		"doctype": doctype,
 		"name": name,
@@ -77,7 +76,6 @@ def remove_encrypted_password(doctype, name, fieldname='password'):
 		# values=[doctype, name, fieldname]
 	# )
 
-
 def check_password(user, pwd, doctype='User', fieldname='password', delete_tracker_cache=True):
 	'''Checks if user and password are correct, else raises frappe.AuthenticationError'''
 

frappe/website/doctype/personal_data_deletion_request/personal_data_deletion_request.py

@@ -323,7 +323,6 @@ class PersonalDataDeletionRequest(Document):
 
 
 def remove_unverified_record():
-
 	frappe.db.delete("Personal Data Deletion Request", {
 		"status": "Pending Verification",
 		"creation": ("<", ["Now()", "-", "INTERVAL 7 DAY"])
@@ -336,7 +335,6 @@ def remove_unverified_record():
 	# 	AND `creation` < (NOW() - INTERVAL '7' DAY)"""
 	# )
 
-
 @frappe.whitelist(allow_guest=True)
 def confirm_deletion(email, name, host_name):
 	if not verify_request():