Postpone parameters change in ordered updates

Postpone as much as possible the change of update parameters to
OrderedDict from list or tuple of pairs.

This way we won't have problems with query's update method.

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/sqlalchemy/sql/crud.py b/lib/sqlalchemy/sql/crud.py
index 235889ad9..0ab52a13e 100644
--- a/lib/sqlalchemy/sql/crud.py
+++ b/lib/sqlalchemy/sql/crud.py
@@ -68,8 +68,13 @@ def _get_crud_params(compiler, stmt, **kw):
     # without isupdate check, but adding it shortcircuits the boolean operation
     # resulting in false for all inserts.
     keep_order = (compiler.isupdate
-                  and sql_util.is_value_pair_dict(stmt.parameters))
-    dict_type = util.OrderedDict if keep_order else dict
+                  and sql_util.is_value_pair_dict(stmt_parameters))
+    if keep_order:
+        stmt_parameters = util.OrderedDict(stmt_parameters)
+        dict_type = util.OrderedDict
+    else:
+        dict_type = dict
+
     # if we have statement parameters - set defaults in the
     # compiled params
     if compiler.column_keys is None: