fix: owner/module not identified as column

frappe · Oct 26, 2023 · e9e81ca · e9e81ca
1 parent 143d89b
commit e9e81ca
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/frappe/desk/reportview.py b/frappe/desk/reportview.py
@@ -176,13 +176,15 @@ def is_standard(fieldname):
 
 
 def extract_fieldname(field):
-	parser = Parser(f"select {field} from dummy")
-	if not parser.columns:
+	parser = Parser(f"select {field}, frappe_dummy from dummy")
+	columns = [col for col in parser.columns if col != "frappe_dummy"]
+
+	if not columns:
 		f = field.lower()
 		if "count(" in f or "sum(" in f or "avg(" in f:
 			return ["*"]
 		raise_invalid_field(field)
-	return parser.columns
+	return columns
 
 
 def get_meta_and_docfield(fieldname, data):

diff --git a/frappe/tests/test_reportview.py b/frappe/tests/test_reportview.py
@@ -38,6 +38,10 @@ def test_extract_fieldname(self):
 			extract_fieldname("count(distinct `tabPhoto`.name) as total_count")[0], "tabPhoto.name"
 		)
 
+		self.assertEqual(extract_fieldname("owner")[0], "owner")
+
+		self.assertEqual(extract_fieldname("module")[0], "module")
+
 		self.assertEqual(extract_fieldname("count(`tabPhoto`.name) as total_count")[0], "tabPhoto.name")
 
 		self.assertEqual(extract_fieldname("count(distinct `tabPhoto`.name)")[0], "tabPhoto.name")
@@ -83,4 +87,6 @@ def test_extract_fieldname(self):
 
 		self.assertEqual(extract_fieldname("tablefield.fiedname")[0], "tablefield.fiedname")
 
-		self.assertEqual(extract_fieldname("`tabChild DocType`.`fiedname`")[0], "tabChild DocType.fiedname")
+		self.assertEqual(
+			extract_fieldname("`tabChild DocType`.`fiedname`")[0], "tabChild DocType.fiedname"
+		)