- Fixed the multiple-table "UPDATE..FROM" construct, only usable on

MySQL, to correctly render the SET clause among multiple columns
with the same name across tables.  This also changes the name used for
the bound parameter in the SET clause to "<tablename>_<colname>" for
the non-primary table only; as this parameter is typically specified
using the :class:`.Column` object directly this should not have an
impact on applications.   The fix takes effect for both
:meth:`.Table.update` as well as :meth:`.Query.update` in the ORM.
[ticket:2912]

1 files changed, 5 insertions, 3 deletions

diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py
index e507885fa..ed975b8cf 100644
--- a/lib/sqlalchemy/engine/default.py
+++ b/lib/sqlalchemy/engine/default.py
@@ -895,6 +895,8 @@ class DefaultExecutionContext(interfaces.ExecutionContext):
         and generate inserted_primary_key collection.
         """
 
+        key_getter = self.compiled._key_getters_for_crud_column[2]
+
         if self.executemany:
             if len(self.compiled.prefetch):
                 scalar_defaults = {}
@@ -918,7 +920,7 @@ class DefaultExecutionContext(interfaces.ExecutionContext):
                         else:
                             val = self.get_update_default(c)
                         if val is not None:
-                            param[c.key] = val
+                            param[key_getter(c)] = val
                 del self.current_parameters
         else:
             self.current_parameters = compiled_parameters = \
@@ -931,12 +933,12 @@ class DefaultExecutionContext(interfaces.ExecutionContext):
                     val = self.get_update_default(c)
 
                 if val is not None:
-                    compiled_parameters[c.key] = val
+                    compiled_parameters[key_getter(c)] = val
             del self.current_parameters
 
             if self.isinsert:
                 self.inserted_primary_key = [
-                                self.compiled_parameters[0].get(c.key, None)
+                                self.compiled_parameters[0].get(key_getter(c), None)
                                         for c in self.compiled.\
                                                 statement.table.primary_key
                                 ]