Merge branch 'set_value-refactor' into set_value-refactor

frappe/query_builder/terms.py

@@ -1,3 +1,4 @@
+from datetime import timedelta
 from typing import Any, Dict, Optional
 
 from pypika.terms import Function, ValueWrapper
@@ -51,6 +52,9 @@ class ParameterizedValueWrapper(ValueWrapper):
 			value_sql = self.get_value_sql(quote_char=quote_char, **kwargs)
 			sql = param_wrapper.get_sql(param_value=value_sql, **kwargs)
 		else:
+			# * BUG: pypika doesen't parse timedeltas
+			if isinstance(self.value, timedelta):
+				self.value = str(self.value)
 			sql = self.get_value_sql(
 				quote_char=quote_char,
 				secondary_quote_char=secondary_quote_char,

frappe/tests/test_query_builder.py

@@ -5,7 +5,7 @@ import frappe
 from frappe.query_builder.custom import ConstantColumn
 from frappe.query_builder.functions import Coalesce, GroupConcat, Match
 from frappe.query_builder.utils import db_type_is
-
+from frappe.query_builder import Case
 
 def run_only_if(dbtype: db_type_is) -> Callable:
 	return unittest.skipIf(
@@ -108,6 +108,27 @@ class TestParameterization(unittest.TestCase):
 		self.assertIn("param1", params)
 		self.assertEqual(params["param1"], "subject")
 
+	def test_case(self):
+		DocType = frappe.qb.DocType("DocType")
+		query = (
+			frappe.qb.from_(DocType)
+			.select(
+				Case()
+				.when(DocType.search_fields == "value", "other_value")
+				.when(Coalesce(DocType.search_fields == "subject_in_function"), "true_value")
+			)
+		)
+
+		self.assertTrue("walk" in dir(query))
+		query, params = query.walk()
+
+		self.assertIn("%(param1)s", query)
+		self.assertIn("param1", params)
+		self.assertEqual(params["param1"], "value")
+		self.assertEqual(params["param2"], "other_value")
+		self.assertEqual(params["param3"], "subject_in_function")
+		self.assertEqual(params["param4"], "true_value")
+
 
 @run_only_if(db_type_is.MARIADB)
 class TestBuilderMaria(unittest.TestCase, TestBuilderBase):

frappe/utils/data.py

@@ -756,7 +756,7 @@ def sbool(x: str) -> Union[bool, Any]:
 			return True
 		elif val in ('false', '0'):
 			return False
-		return bool(x)
+		return x
 	except Exception:
 		return x