Merge "fully implement future engine and remove legacy" into main

1 files changed, 24 insertions, 98 deletions

diff --git a/lib/sqlalchemy/engine/util.py b/lib/sqlalchemy/engine/util.py
index 8eb0f1820..36691504c 100644
--- a/lib/sqlalchemy/engine/util.py
+++ b/lib/sqlalchemy/engine/util.py
@@ -31,110 +31,36 @@ def connection_memoize(key):
 
 
 _no_tuple = ()
-_no_kw = util.immutabledict()
 
 
-def _distill_params(connection, multiparams, params):
-    r"""Given arguments from the calling form \*multiparams, \**params,
-    return a list of bind parameter structures, usually a list of
-    dictionaries.
-
-    In the case of 'raw' execution which accepts positional parameters,
-    it may be a list of tuples or lists.
-
-    """
-
-    if not multiparams:
-        if params:
-            connection._warn_for_legacy_exec_format()
-            return [params]
-        else:
-            return []
-    elif len(multiparams) == 1:
-        zero = multiparams[0]
-        if isinstance(zero, (list, tuple)):
-            if (
-                not zero
-                or hasattr(zero[0], "__iter__")
-                and not hasattr(zero[0], "strip")
-            ):
-                # execute(stmt, [{}, {}, {}, ...])
-                # execute(stmt, [(), (), (), ...])
-                return zero
-            else:
-                # this is used by exec_driver_sql only, so a deprecation
-                # warning would already be coming from passing a plain
-                # textual statement with positional parameters to
-                # execute().
-                # execute(stmt, ("value", "value"))
-                return [zero]
-        elif hasattr(zero, "keys"):
-            # execute(stmt, {"key":"value"})
-            return [zero]
-        else:
-            connection._warn_for_legacy_exec_format()
-            # execute(stmt, "value")
-            return [[zero]]
-    else:
-        connection._warn_for_legacy_exec_format()
-        if hasattr(multiparams[0], "__iter__") and not hasattr(
-            multiparams[0], "strip"
+def _distill_params_20(params):
+    if params is None:
+        return _no_tuple
+    elif isinstance(params, (list, tuple)):
+        # collections_abc.MutableSequence): # avoid abc.__instancecheck__
+        if params and not isinstance(
+            params[0], (collections_abc.Mapping, tuple)
         ):
-            return multiparams
-        else:
-            return [multiparams]
-
-
-def _distill_cursor_params(connection, multiparams, params):
-    """_distill_params without any warnings.  more appropriate for
-    "cursor" params that can include tuple arguments, lists of tuples,
-    etc.
-
-    """
+            raise exc.ArgumentError(
+                "List argument must consist only of tuples or dictionaries"
+            )
 
-    if not multiparams:
-        if params:
-            return [params]
-        else:
-            return []
-    elif len(multiparams) == 1:
-        zero = multiparams[0]
-        if isinstance(zero, (list, tuple)):
-            if (
-                not zero
-                or hasattr(zero[0], "__iter__")
-                and not hasattr(zero[0], "strip")
-            ):
-                # execute(stmt, [{}, {}, {}, ...])
-                # execute(stmt, [(), (), (), ...])
-                return zero
-            else:
-                # this is used by exec_driver_sql only, so a deprecation
-                # warning would already be coming from passing a plain
-                # textual statement with positional parameters to
-                # execute().
-                # execute(stmt, ("value", "value"))
-
-                return [zero]
-        elif hasattr(zero, "keys"):
-            # execute(stmt, {"key":"value"})
-            return [zero]
-        else:
-            # execute(stmt, "value")
-            return [[zero]]
+        return params
+    elif isinstance(
+        params,
+        (dict, immutabledict),
+        # only do abc.__instancecheck__ for Mapping after we've checked
+        # for plain dictionaries and would otherwise raise
+    ) or isinstance(params, collections_abc.Mapping):
+        return [params]
     else:
-        if hasattr(multiparams[0], "__iter__") and not hasattr(
-            multiparams[0], "strip"
-        ):
-            return multiparams
-        else:
-            return [multiparams]
+        raise exc.ArgumentError("mapping or sequence expected for parameters")
 
 
-def _distill_params_20(params):
+def _distill_raw_params(params):
     if params is None:
-        return _no_tuple, _no_kw
-    elif isinstance(params, list):
+        return _no_tuple
+    elif isinstance(params, (list,)):
         # collections_abc.MutableSequence): # avoid abc.__instancecheck__
         if params and not isinstance(
             params[0], (collections_abc.Mapping, tuple)
@@ -143,14 +69,14 @@ def _distill_params_20(params):
                 "List argument must consist only of tuples or dictionaries"
             )
 
-        return (params,), _no_kw
+        return params
     elif isinstance(
         params,
         (tuple, dict, immutabledict),
         # only do abc.__instancecheck__ for Mapping after we've checked
         # for plain dictionaries and would otherwise raise
     ) or isinstance(params, collections_abc.Mapping):
-        return (params,), _no_kw
+        return [params]
     else:
         raise exc.ArgumentError("mapping or sequence expected for parameters")