Refactor should_interpolate block

Author: pmishchenko-ua

singlestoredb/mysql/cursors.py

@@ -6,6 +6,7 @@
 from ..connection import Cursor as BaseCursor
 from ..utils import results
 from ..utils.debug import log_query
+from ..utils.mogrify import should_interpolate_query
 from ..utils.results import get_schema
 
 try:
@@ -181,12 +182,7 @@ def mogrify(self, query, args=None):
         """
         conn = self._get_db()
 
-        if conn.interpolate_query_with_empty_args:
-            should_interpolate = args is not None
-        else:
-            should_interpolate = bool(args)
-
-        if should_interpolate:
+        if should_interpolate_query(conn.interpolate_query_with_empty_args, args):
             query = query % self._escape_args(args, conn)
 
         return query

singlestoredb/utils/mogrify.py

@@ -145,16 +145,20 @@ def mogrify(
     str : The query with argument binding applied.
 
     """
-    if interpolate_query_with_empty_args:
-        should_interpolate = args is not None
-    else:
-        should_interpolate = bool(args)
-
-    if should_interpolate:
+    if should_interpolate_query(interpolate_query_with_empty_args, args):
         query = query % _escape_args(
             args, charset=charset,
             encoders=encoders,
             server_status=server_status,
             binary_prefix=binary_prefix,
         )
     return query
+
+
+def should_interpolate_query(
+    interpolate_query_with_empty_args: bool,
+    args: Union[Sequence[Any], Dict[str, Any], None],
+) -> bool:
+    if interpolate_query_with_empty_args:
+        return args is not None
+    return bool(args)