From e826866503287ed67696113b5b789ced053744ae Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 13 Jul 2021 14:24:12 +0530
Subject: [PATCH 1/3] fix: Tag count query

---
 frappe/desk/reportview.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index 55515856f1..b9382bc830 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -445,17 +445,24 @@ def get_stats(stats, doctype, filters=[]):
 	for tag in tags:
 		if not tag in columns: continue
 		try:
-			tagcount = frappe.get_list(doctype, fields=[tag, "count(*)"],
-				#filters=["ifnull(`%s`,'')!=''" % tag], group_by=tag, as_list=True)
-				filters = filters + ["ifnull(`%s`,'')!=''" % tag], group_by = tag, as_list = True)
+			tag_count = frappe.get_list(doctype,
+				fields=[tag, "count(*)"],
+				filters=filters + [[tag, '!=', '']],
+				group_by=tag,
+				as_list=True,
+			)
 
-			if tag=='_user_tags':
-				stats[tag] = scrub_user_tags(tagcount)
-				stats[tag].append([_("No Tags"), frappe.get_list(doctype,
+			if tag == '_user_tags':
+				stats[tag] = scrub_user_tags(tag_count)
+				no_tag_count = frappe.get_list(doctype,
 					fields=[tag, "count(*)"],
-					filters=filters +["({0} = ',' or {0} = '' or {0} is null)".format(tag)], as_list=True)[0][1]])
+					filters=filters + [[tag, "in", ('', ',')]],
+					as_list=True,
+				)[0][1]
+
+				stats[tag].append([_("No Tags"), no_tag_count])
 			else:
-				stats[tag] = tagcount
+				stats[tag] = tag_count
 
 		except frappe.db.SQLError:
 			# does not work for child tables

From ae70502f910c85f6a4528b487eea3b535cec6c39 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Tue, 13 Jul 2021 15:34:36 +0530
Subject: [PATCH 2/3] test: Add test case to validate tag count query

---
 frappe/desk/doctype/tag/test_tag.py | 28 +++++++++++++++++++++++-----
 1 file changed, 23 insertions(+), 5 deletions(-)

diff --git a/frappe/desk/doctype/tag/test_tag.py b/frappe/desk/doctype/tag/test_tag.py
index 442a891fd8..6eb7219c26 100644
--- a/frappe/desk/doctype/tag/test_tag.py
+++ b/frappe/desk/doctype/tag/test_tag.py
@@ -1,8 +1,26 @@
-# -*- coding: utf-8 -*-
-# Copyright (c) 2019, Frappe Technologies and Contributors
-# See license.txt
-# import frappe
 import unittest
+import frappe
+
+from frappe.desk.reportview import get_stats
+from frappe.desk.doctype.tag.tag import add_tag
 
 class TestTag(unittest.TestCase):
-	pass
+	def setUp(self) -> None:
+		frappe.db.sql("DELETE from `tabTag`")
+		frappe.db.sql("UPDATE `tabDocType` set _user_tags=''")
+
+	def test_tag_count_query(self):
+		self.assertDictEqual(get_stats('["_user_tags"]', 'DocType'),
+			{'_user_tags': [['No Tags', frappe.db.count('DocType')]]})
+		add_tag('Standard', 'DocType', 'User')
+		add_tag('Standard', 'DocType', 'ToDo')
+
+		# count with no filter
+		self.assertDictEqual(get_stats('["_user_tags"]', 'DocType'),
+			{'_user_tags': [['Standard', 2], ['No Tags', frappe.db.count('DocType') - 2]]})
+
+		# count with child table field filter
+		self.assertDictEqual(get_stats('["_user_tags"]',
+			'DocType',
+			filters='[["DocField", "fieldname", "like", "%last_name%"], ["DocType", "name", "like", "%use%"]]'),
+			{'_user_tags': [['Standard', 1], ['No Tags', 0]]})
\ No newline at end of file

From ffb020ce0ea9a0fb2c2ec7c0f8d03d986bc1cd1e Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 15 Jul 2021 08:37:47 +0530
Subject: [PATCH 3/3] fix: Make query postgres compatible

---
 frappe/desk/reportview.py | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
index b9382bc830..1dbc52eb5b 100644
--- a/frappe/desk/reportview.py
+++ b/frappe/desk/reportview.py
@@ -450,6 +450,7 @@ def get_stats(stats, doctype, filters=[]):
 				filters=filters + [[tag, '!=', '']],
 				group_by=tag,
 				as_list=True,
+				distinct=1,
 			)
 
 			if tag == '_user_tags':
@@ -458,18 +459,22 @@ def get_stats(stats, doctype, filters=[]):
 					fields=[tag, "count(*)"],
 					filters=filters + [[tag, "in", ('', ',')]],
 					as_list=True,
-				)[0][1]
+					group_by=tag,
+					order_by=tag,
+				)
+
+				no_tag_count = no_tag_count[0][1] if no_tag_count else 0
 
 				stats[tag].append([_("No Tags"), no_tag_count])
 			else:
 				stats[tag] = tag_count
 
 		except frappe.db.SQLError:
-			# does not work for child tables
 			pass
-		except frappe.db.InternalError:
+		except frappe.db.InternalError as e:
 			# raised when _user_tags column is added on the fly
 			pass
+
 	return stats
 
 @frappe.whitelist()