Rename option

Author: pmishchenko-ua

singlestoredb/config.py

@@ -252,9 +252,9 @@
 )
 
 register_option(
-    'mogrify_empty_args', 'bool', check_bool, False,
+    'interpolate_query_with_empty_args', 'bool', check_bool, False,
     'Should mogrify apply string interpolation when args is an empty tuple/list? ',
-    environ='SINGLESTOREDB_MOGRIFY_EMPTY_ARGS',
+    environ='SINGLESTOREDB_interpolate_query_with_empty_args',
 )
 
 register_option(

singlestoredb/connection.py

@@ -1118,10 +1118,10 @@ def __init__(self, **kwargs: Any):
     def _convert_params(
         cls, oper: str,
         params: Optional[Union[Sequence[Any], Dict[str, Any], Any]],
-        mogrify_empty_args: bool = False,
+        interpolate_query_with_empty_args: bool = False,
     ) -> Tuple[Any, ...]:
         """Convert query to correct parameter format."""
-        if mogrify_empty_args:
+        if interpolate_query_with_empty_args:
             should_convert = params is not None
         else:
             should_convert = bool(params)
@@ -1339,7 +1339,7 @@ def connect(
     enable_extended_data_types: Optional[bool] = None,
     vector_data_format: Optional[str] = None,
     parse_json: Optional[bool] = None,
-    mogrify_empty_args: Optional[bool] = None,
+    interpolate_query_with_empty_args: Optional[bool] = None,
 ) -> Connection:
     """
     Return a SingleStoreDB connection.
@@ -1425,7 +1425,7 @@ def connect(
         Should extended data types (BSON, vector) be enabled?
     vector_data_format : str, optional
         Format for vector types: json or binary
-    mogrify_empty_args : bool, optional
+    interpolate_query_with_empty_args : bool, optional
         Should the connector apply parameter interpolation even when the
         parameters are empty? This corresponds to pymysql/mysqlclient's handling
 

singlestoredb/http/connection.py

@@ -548,10 +548,12 @@ def _execute(
         if handler is not None:
             return self._execute_fusion_query(oper, params, handler=handler)
 
-        mogrify_empty_args = self._connection.connection_params.get(
-            'mogrify_empty_args', False,
+        interpolate_query_with_empty_args = self._connection.connection_params.get(
+            'interpolate_query_with_empty_args', False,
+        )
+        oper, params = self._connection._convert_params(
+            oper, params, interpolate_query_with_empty_args,
         )
-        oper, params = self._connection._convert_params(oper, params, mogrify_empty_args)
 
         log_query(oper, params)
 

singlestoredb/mysql/connection.py

@@ -360,7 +360,7 @@ def __init__(  # noqa: C901
         track_env=False,
         enable_extended_data_types=True,
         vector_data_format='binary',
-        mogrify_empty_args=None,
+        interpolate_query_with_empty_args=None,
     ):
         BaseConnection.__init__(**dict(locals()))
 
@@ -615,7 +615,7 @@ def _config(key, arg):
         self._auth_plugin_map = auth_plugin_map or {}
         self._binary_prefix = binary_prefix
         self.server_public_key = server_public_key
-        self.mogrify_empty_args = mogrify_empty_args
+        self.interpolate_query_with_empty_args = interpolate_query_with_empty_args
 
         if self.connection_params['nan_as_null'] or \
                 self.connection_params['inf_as_null']:

singlestoredb/mysql/cursors.py

@@ -181,7 +181,7 @@ def mogrify(self, query, args=None):
         """
         conn = self._get_db()
 
-        if conn.mogrify_empty_args:
+        if conn.interpolate_query_with_empty_args:
             should_interpolate = args is not None
         else:
             should_interpolate = bool(args)

singlestoredb/tests/test_connection.py

@@ -3145,7 +3145,10 @@ def test_f16_vectors(self):
         )
 
     def test_mogrify_val_with_percent(self):
-        conn = s2.connect(database=type(self).dbname, mogrify_empty_args=True)
+        conn = s2.connect(
+            database=type(self).dbname,
+            interpolate_query_with_empty_args=True,
+        )
         cur = conn.cursor()
         val_with_percent = 'a%a'
         cur.execute(

singlestoredb/utils/mogrify.py

@@ -123,7 +123,7 @@ def mogrify(
     encoders: Optional[Encoders] = None,
     server_status: int = 0,
     binary_prefix: bool = False,
-    mogrify_empty_args: bool = False,
+    interpolate_query_with_empty_args: bool = False,
 ) -> Union[str, bytes]:
     """
     Returns the exact string sent to the database by calling the execute() method.
@@ -136,7 +136,7 @@ def mogrify(
         Query to mogrify.
     args : Sequence[Any] or Dict[str, Any] or Any, optional
         Parameters used with query. (optional)
-    mogrify_empty_args : bool, optional
+    interpolate_query_with_empty_args : bool, optional
         If True, apply string interpolation even when args is an empty tuple/list.
         If False, only apply when args is truthy. Defaults to False.
 
@@ -145,7 +145,7 @@ def mogrify(
     str : The query with argument binding applied.
 
     """
-    if mogrify_empty_args:
+    if interpolate_query_with_empty_args:
         should_interpolate = args is not None
     else:
         should_interpolate = bool(args)