From ed6533f73705a483853d5b5ae8bf8cc0fca9156a Mon Sep 17 00:00:00 2001
From: Gavin D'souza <gavin18d@gmail.com>
Date: Fri, 20 Aug 2021 12:37:15 +0530
Subject: [PATCH] fix: Use cast in favour of cast_fieldtype

Use newly introduced casting util for Python-Frappe types mapping
---
 frappe/database/database.py   | 21 ++-------------------
 frappe/model/base_document.py |  4 ++--
 frappe/model/meta.py          | 12 ++++++------
 3 files changed, 10 insertions(+), 27 deletions(-)

diff --git a/frappe/database/database.py b/frappe/database/database.py
index d6ecf0795d..9fab8e116f 100644
--- a/frappe/database/database.py
+++ b/frappe/database/database.py
@@ -14,7 +14,7 @@ import frappe.model.meta
 
 from frappe import _
 from time import time
-from frappe.utils import now, getdate, cast_fieldtype, get_datetime, get_table_name
+from frappe.utils import now, getdate, cast, get_datetime, get_table_name
 from frappe.model.utils.link_count import flush_local_link_count
 
 
@@ -516,7 +516,6 @@ class Database(object):
 			FROM   `tabSingles`
 			WHERE  doctype = %s
 		""", doctype)
-		# result = _cast_result(doctype, result)
 
 		dict_  = frappe._dict(result)
 
@@ -557,7 +556,7 @@ class Database(object):
 		if not df:
 			frappe.throw(_('Invalid field name: {0}').format(frappe.bold(fieldname)), self.InvalidColumnName)
 
-		val = cast_fieldtype(df.fieldtype, val)
+		val = cast(df.fieldtype, val)
 
 		self.value_cache[doctype][fieldname] = val
 
@@ -1052,19 +1051,3 @@ def enqueue_jobs_after_commit():
 			q.enqueue_call(execute_job, timeout=job.get("timeout"),
 							kwargs=job.get("queue_args"))
 		frappe.flags.enqueue_after_commit = []
-
-# Helpers
-def _cast_result(doctype, result):
-	batch = [ ]
-
-	try:
-		for field, value in result:
-			df = frappe.get_meta(doctype).get_field(field)
-			if df:
-				value = cast_fieldtype(df.fieldtype, value)
-
-			batch.append(tuple([field, value]))
-	except frappe.exceptions.DoesNotExistError:
-		return result
-
-	return tuple(batch)
diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 752543f46a..815dd27002 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -9,7 +9,7 @@ from frappe.model.utils.link_count import notify_link_count
 from frappe.modules import load_doctype_module
 from frappe.model import display_fieldtypes
 from frappe.utils import (cint, flt, now, cstr, strip_html,
-	sanitize_html, sanitize_email, cast_fieldtype)
+	sanitize_html, sanitize_email, cast)
 from frappe.utils.html_utils import unescape_html
 
 max_positive_value = {
@@ -969,7 +969,7 @@ class BaseDocument(object):
 		return self.cast(val, df)
 
 	def cast(self, value, df):
-		return cast_fieldtype(df.fieldtype, value)
+		return cast(df.fieldtype, value)
 
 	def _extract_images_from_text_editor(self):
 		from frappe.core.doctype.file.file import extract_images_from_doc
diff --git a/frappe/model/meta.py b/frappe/model/meta.py
index de794ba77f..f89163e092 100644
--- a/frappe/model/meta.py
+++ b/frappe/model/meta.py
@@ -16,7 +16,7 @@ Example:
 '''
 from datetime import datetime
 import frappe, json, os
-from frappe.utils import cstr, cint, cast_fieldtype
+from frappe.utils import cstr, cint, cast
 from frappe.model import default_fields, no_value_fields, optional_fields, data_fieldtypes, table_fields
 from frappe.model.document import Document
 from frappe.model.base_document import BaseDocument
@@ -322,24 +322,24 @@ class Meta(Document):
 
 		for ps in property_setters:
 			if ps.doctype_or_field=='DocType':
-				self.set(ps.property, cast_fieldtype(ps.property_type, ps.value))
+				self.set(ps.property, cast(ps.property_type, ps.value))
 
 			elif ps.doctype_or_field=='DocField':
 				for d in self.fields:
 					if d.fieldname == ps.field_name:
-						d.set(ps.property, cast_fieldtype(ps.property_type, ps.value))
+						d.set(ps.property, cast(ps.property_type, ps.value))
 						break
 
 			elif ps.doctype_or_field=='DocType Link':
 				for d in self.links:
 					if d.name == ps.row_name:
-						d.set(ps.property, cast_fieldtype(ps.property_type, ps.value))
+						d.set(ps.property, cast(ps.property_type, ps.value))
 						break
 
 			elif ps.doctype_or_field=='DocType Action':
 				for d in self.actions:
 					if d.name == ps.row_name:
-						d.set(ps.property, cast_fieldtype(ps.property_type, ps.value))
+						d.set(ps.property, cast(ps.property_type, ps.value))
 						break
 
 	def add_custom_links_and_actions(self):
@@ -532,7 +532,7 @@ class Meta(Document):
 					label = link.group,
 					items = [link.parent_doctype or link.link_doctype]
 				))
-			
+
 			if not link.is_child_table:
 				if link.link_fieldname != data.fieldname:
 					if data.fieldname: