From 4bcbc03500a94816fbafea1f18c602616d2675ea Mon Sep 17 00:00:00 2001
From: Himanshu Warekar <himanshuwarekar@yahoo.com>
Date: Fri, 26 Jul 2019 09:11:28 +0530
Subject: [PATCH] chore: align sql query

---
 frappe/desk/doctype/event/event.py | 66 ++++++++++++++++++++++--------
 1 file changed, 49 insertions(+), 17 deletions(-)

diff --git a/frappe/desk/doctype/event/event.py b/frappe/desk/doctype/event/event.py
index b9bab0a204..3558761c65 100644
--- a/frappe/desk/doctype/event/event.py
+++ b/frappe/desk/doctype/event/event.py
@@ -144,26 +144,58 @@ def get_events(start, end, user=None, for_reminder=False, filters=None):
 	if isinstance(filters, string_types):
 		filters = json.loads(filters)
 
-	events = frappe.db.sql("""select `name`, subject, description, color,
-		starts_on, ends_on, owner, all_day, event_type, repeat_this_event, repeat_on,repeat_till,
-		monday, tuesday, wednesday, thursday, friday, saturday, sunday
-		from `tabEvent` where ((
-			(date(starts_on) between date(%(start)s) and date(%(end)s))
-			or (date(ends_on) between date(%(start)s) and date(%(end)s))
-			or (date(starts_on) <= date(%(start)s) and date(ends_on) >= date(%(end)s))
-		) or (
-			date(starts_on) <= date(%(start)s) and repeat_this_event=1 and
-			coalesce(repeat_till, '3000-01-01') > date(%(start)s)
-		))
+	events = frappe.db.sql("""
+		SELECT `tabEvent`.name,
+				`tabEvent`.subject,
+				`tabEvent`.description,
+				`tabEvent`.color,
+				`tabEvent`.starts_on,
+				`tabEvent`.ends_on,
+				`tabEvent`.owner,
+				`tabEvent`.all_day,
+				`tabEvent`.event_type,
+				`tabEvent`.repeat_this_event,
+				`tabEvent`.repeat_on,
+				`tabEvent`.repeat_till,
+				`tabEvent`.monday,
+				`tabEvent`.tuesday,
+				`tabEvent`.wednesday,
+				`tabEvent`.thursday,
+				`tabEvent`.friday,
+				`tabEvent`.saturday,
+				`tabEvent`.sunday
+		FROM `tabEvent`
+		WHERE (
+				(
+					(date(`tabEvent`.starts_on) BETWEEN date(%(start)s) AND date(%(end)s))
+					OR (date(`tabEvent`.ends_on) BETWEEN date(%(start)s) AND date(%(end)s))
+					OR (
+						date(`tabEvent`.starts_on) <= date(%(start)s)
+						AND date(`tabEvent`.ends_on) >= date(%(end)s)
+					)
+				)
+				OR (
+					date(`tabEvent`.starts_on) <= date(%(start)s)
+					AND `tabEvent`.repeat_this_event=1
+					AND coalesce(`tabEvent`.repeat_till, '3000-01-01') > date(%(start)s)
+				)
+			)
 		{reminder_condition}
 		{filter_condition}
-		and (event_type='Public' or owner=%(user)s
-		or exists(select name from `tabDocShare` where
-			`tabDocShare`.share_doctype='Event' and `tabDocShare`.share_name=`tabEvent`.`name`
-			and `tabDocShare`.`user`=%(user)s))
-		order by starts_on""".format(
+		AND (
+				`tabEvent`.event_type='Public'
+				OR `tabEvent`.owner=%(user)s
+				OR EXISTS(
+					SELECT `tabDocShare`.name
+					FROM `tabDocShare`
+					WHERE `tabDocShare`.share_doctype='Event'
+						AND `tabDocShare`.share_name=`tabEvent`.name
+						AND `tabDocShare`.user=%(user)s
+				)
+			)
+		ORDER BY `tabEvent`.starts_on""".format(
 			filter_condition=get_filters_cond('Event', filters, []),
-			reminder_condition="and coalesce(send_reminder, 0)=1" if for_reminder else ""
+			reminder_condition="AND coalesce(`tabEvent`.send_reminder, 0)=1" if for_reminder else ""
 		), {
 			"start": start,
 			"end": end,