From b9318c98637bbd5c19267728fcfe941668345325 Mon Sep 17 00:00:00 2001
From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 20 Jan 2014 21:01:35 -0500
Subject: - 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]

---
 test/orm/test_update_delete.py | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'test/orm/test_update_delete.py')

diff --git a/test/orm/test_update_delete.py b/test/orm/test_update_delete.py
index 6915ac8a2..ac94fde2f 100644
--- a/test/orm/test_update_delete.py
+++ b/test/orm/test_update_delete.py
@@ -545,12 +545,14 @@ class UpdateDeleteFromTest(fixtures.MappedTest):
     def define_tables(cls, metadata):
         Table('users', metadata,
               Column('id', Integer, primary_key=True),
+              Column('samename', String(10)),
             )
         Table('documents', metadata,
               Column('id', Integer, primary_key=True),
               Column('user_id', None, ForeignKey('users.id')),
               Column('title', String(32)),
-              Column('flag', Boolean)
+              Column('flag', Boolean),
+              Column('samename', String(10)),
         )
 
     @classmethod
@@ -659,6 +661,34 @@ class UpdateDeleteFromTest(fixtures.MappedTest):
                 ])
         )
 
+    @testing.only_on('mysql', 'Multi table update')
+    def test_update_from_multitable_same_names(self):
+        Document = self.classes.Document
+        User = self.classes.User
+
+        s = Session()
+
+        s.query(Document).\
+            filter(User.id == Document.user_id).\
+            filter(User.id == 2).update({
+                    Document.samename: 'd_samename',
+                    User.samename: 'u_samename'
+                }
+            )
+        eq_(
+            s.query(User.id, Document.samename, User.samename).
+                filter(User.id == Document.user_id).
+                order_by(User.id).all(),
+            [
+                (1, None, None),
+                (1, None, None),
+                (2, 'd_samename', 'u_samename'),
+                (2, 'd_samename', 'u_samename'),
+                (3, None, None),
+                (3, None, None),
+            ]
+        )
+
 class ExpressionUpdateTest(fixtures.MappedTest):
     @classmethod
     def define_tables(cls, metadata):
@@ -786,3 +816,5 @@ class InheritTest(fixtures.DeclarativeMappedTest):
             set(s.query(Person.name, Engineer.engineer_name)),
             set([('e1', 'e1', ), ('e22', 'e55')])
         )
+
+
-- 
cgit v1.2.1