From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sat, 20 Nov 2010 20:28:18 +0000 (-0500)
Subject: - add distinct tests for mapping to join with "exclude" prop versus "explicit",
X-Git-Tag: rel_0_7b1~246
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ccd4eeeb39b968641cdaee699ad2732ab903e793;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- add distinct tests for mapping to join with "exclude" prop versus "explicit",
should be the last thing needed for [ticket:1896], related to [ticket:1892]
---

diff --git a/test/orm/test_mapper.py b/test/orm/test_mapper.py
index 4b36fbc342..8360d54bfa 100644
--- a/test/orm/test_mapper.py
+++ b/test/orm/test_mapper.py
@@ -525,18 +525,29 @@ class MapperTest(_fixtures.FixtureTest):
         )
 
     @testing.resolve_artifact_names
-    def test_mapping_to_join(self):
+    def test_mapping_to_join_explicit_prop(self):
         """Mapping to a join"""
 
         usersaddresses = sa.join(users, addresses, users.c.id
                                  == addresses.c.user_id)
         mapper(User, usersaddresses, primary_key=[users.c.id],
-               #exclude_properties=[addresses.c.id]
                properties={'add_id':addresses.c.id}
                )
         l = create_session().query(User).order_by(users.c.id).all()
         eq_(l, self.static.user_result[:3])
 
+    @testing.resolve_artifact_names
+    def test_mapping_to_join_exclude_prop(self):
+        """Mapping to a join"""
+
+        usersaddresses = sa.join(users, addresses, users.c.id
+                                 == addresses.c.user_id)
+        mapper(User, usersaddresses, primary_key=[users.c.id],
+               exclude_properties=[addresses.c.id]
+               )
+        l = create_session().query(User).order_by(users.c.id).all()
+        eq_(l, self.static.user_result[:3])
+
     @testing.resolve_artifact_names
     def test_mapping_to_join_no_pk(self):
         m = mapper(Address,