Same fix for http

Author: pmishchenko-ua

singlestoredb/connection.py

@@ -1120,32 +1120,32 @@ def _convert_params(
         params: Optional[Union[Sequence[Any], Dict[str, Any], Any]],
     ) -> Tuple[Any, ...]:
         """Convert query to correct parameter format."""
-        if params:
 
-            if cls._map_param_converter is None:
-                cls._map_param_converter = sqlparams.SQLParams(
-                    map_paramstyle, cls.paramstyle, escape_char=True,
-                )
-
-            if cls._positional_param_converter is None:
-                cls._positional_param_converter = sqlparams.SQLParams(
-                    positional_paramstyle, cls.paramstyle, escape_char=True,
-                )
+        if cls._map_param_converter is None:
+            cls._map_param_converter = sqlparams.SQLParams(
+                map_paramstyle, cls.paramstyle, escape_char=True,
+            )
 
-            is_sequence = isinstance(params, Sequence) \
-                and not isinstance(params, str) \
-                and not isinstance(params, bytes)
-            is_mapping = isinstance(params, Mapping)
+        if cls._positional_param_converter is None:
+            cls._positional_param_converter = sqlparams.SQLParams(
+                positional_paramstyle, cls.paramstyle, escape_char=True,
+            )
 
-            param_converter = cls._map_param_converter \
-                if is_mapping else cls._positional_param_converter
+        is_sequence = isinstance(params, Sequence) \
+            and not isinstance(params, str) \
+            and not isinstance(params, bytes)
+        is_mapping = isinstance(params, Mapping)
 
-            if not is_sequence and not is_mapping:
-                params = [params]
+        param_converter = cls._map_param_converter \
+            if is_mapping else cls._positional_param_converter
 
-            return param_converter.format(oper, params)
+        params_to_use = params
+        if not params:
+            params_to_use = ()
+        elif not is_sequence and not is_mapping:
+            params_to_use = [params]
 
-        return (oper, None)
+        return param_converter.format(oper, params_to_use)
 
     def autocommit(self, value: bool = True) -> None:
         """Set autocommit mode."""

singlestoredb/tests/utils.py

@@ -220,7 +220,8 @@ def load_sql(sql_file: str) -> str:
                     cur.execute(f'USE {dbname};')
 
                 # Start HTTP server as needed.
-                if http_port and not conn.driver.startswith('http'):
+                if http_port and not conn.driver.startswith('http') and \
+                        'IS_HELIOS' not in os.environ:
                     cur.execute(f'SET GLOBAL HTTP_PROXY_PORT={http_port};')
                     cur.execute('SET GLOBAL HTTP_API=ON;')
                     cur.execute('RESTART PROXY;')