From ddd226c1a1f5eaf7e49a555e3ad28c42badd2d5c Mon Sep 17 00:00:00 2001 From: Achilles Rasquinha Date: Thu, 29 Mar 2018 14:23:11 +0530 Subject: [PATCH 1/3] fix in case doctype not found --- frappe/database.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/frappe/database.py b/frappe/database.py index 6a119cff4f..b30587a498 100644 --- a/frappe/database.py +++ b/frappe/database.py @@ -39,12 +39,16 @@ import pymysql def _cast_result(doctype, result): batch = [ ] - for field, value in result: - df = frappe.get_meta(doctype).get_field(field) - if df: - value = cast_fieldtype(df.fieldtype, value) + try: + for field, value in result: + try: + df = frappe.get_meta(doctype).get_field(field) + except: + df = frappe.get_meta(doctype, cached = True) - batch.append(tuple([field, value])) + batch.append(tuple([field, value])) + except Exception: + return result return tuple(batch) From bb58bd8d19b9e60b9f121aa2b3da22b236f9a1e4 Mon Sep 17 00:00:00 2001 From: Achilles Rasquinha Date: Thu, 29 Mar 2018 14:24:59 +0530 Subject: [PATCH 2/3] fix in case doctype not found --- frappe/database.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frappe/database.py b/frappe/database.py index b30587a498..79288be94d 100644 --- a/frappe/database.py +++ b/frappe/database.py @@ -41,10 +41,9 @@ def _cast_result(doctype, result): try: for field, value in result: - try: - df = frappe.get_meta(doctype).get_field(field) - except: - df = frappe.get_meta(doctype, cached = True) + df = frappe.get_meta(doctype).get_field(field) + if df: + value = cast_fieldtype(df.fieldtype, value) batch.append(tuple([field, value])) except Exception: From 569732e7c8ae34a86a92dd925484084f006f0de9 Mon Sep 17 00:00:00 2001 From: Achilles Rasquinha Date: Thu, 29 Mar 2018 14:26:20 +0530 Subject: [PATCH 3/3] fix in case doctype not found --- frappe/database.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frappe/database.py b/frappe/database.py index 79288be94d..b568842ffc 100644 --- a/frappe/database.py +++ b/frappe/database.py @@ -46,7 +46,7 @@ def _cast_result(doctype, result): value = cast_fieldtype(df.fieldtype, value) batch.append(tuple([field, value])) - except Exception: + except frappe.exceptions.DoesNotExistError: return result return tuple(batch)