Back to consistent behavior

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 is not None:
 
-        if cls._map_param_converter is None:
-            cls._map_param_converter = sqlparams.SQLParams(
-                map_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,
+                )
 
-        if cls._positional_param_converter is None:
-            cls._positional_param_converter = sqlparams.SQLParams(
-                positional_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,
+                )
 
-        is_sequence = isinstance(params, Sequence) \
-            and not isinstance(params, str) \
-            and not isinstance(params, bytes)
-        is_mapping = isinstance(params, Mapping)
+            is_sequence = isinstance(params, Sequence) \
+                and not isinstance(params, str) \
+                and not isinstance(params, bytes)
+            is_mapping = isinstance(params, Mapping)
 
-        param_converter = cls._map_param_converter \
-            if is_mapping else cls._positional_param_converter
+            param_converter = cls._map_param_converter \
+                if is_mapping else cls._positional_param_converter
 
-        params_to_use = params
-        if not params:
-            params_to_use = ()
-        elif not is_sequence and not is_mapping:
-            params_to_use = [params]
+            if not is_sequence and not is_mapping:
+                params = [params]
+
+            return param_converter.format(oper, params)
 
-        return param_converter.format(oper, params_to_use)
+        return (oper, None)
 
     def autocommit(self, value: bool = True) -> None:
         """Set autocommit mode."""

singlestoredb/mysql/cursors.py

@@ -181,10 +181,8 @@ def mogrify(self, query, args=None):
         """
         conn = self._get_db()
 
-        if args:
+        if args is not None:
             query = query % self._escape_args(args, conn)
-        else:
-            query = query % ()
 
         return query
 

singlestoredb/tests/test_connection.py

@@ -3149,6 +3149,7 @@ def test_mogrify_val_with_percent(self):
         self.cur.execute(
             '''SELECT REPLACE(i, "%%", "\\%%")
             FROM test_val_with_percent''',
+            (),
         )
         res1 = self.cur.fetchall()
         assert res1[0][0] == 'a\\%a'

singlestoredb/tests/test_fusion.py

@@ -79,7 +79,7 @@ def test_show_commands(self):
         assert cmds
         assert [x for x in cmds if x.strip().startswith('SHOW FUSION GRAMMAR')], cmds
 
-        self.cur.execute('show fusion commands like "create%%"')
+        self.cur.execute('show fusion commands like "create%"')
         cmds = [x[0] for x in self.cur.fetchall()]
         assert cmds
         assert [x for x in cmds if x.strip().startswith('CREATE')] == cmds, cmds

singlestoredb/tests/utils.py

@@ -220,8 +220,7 @@ 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') and \
-                        'IS_HELIOS' not in os.environ:
+                if http_port and not conn.driver.startswith('http'):
                     cur.execute(f'SET GLOBAL HTTP_PROXY_PORT={http_port};')
                     cur.execute('SET GLOBAL HTTP_API=ON;')
                     cur.execute('RESTART PROXY;')