Fix 'email_address' being typoed as 'email_addres' in two places

(cherry picked from commit 8a6e64323abeb9d08de3f68c63c6401ba1a5f847)

diff --git a/lib/sqlalchemy/orm/strategy_options.py b/lib/sqlalchemy/orm/strategy_options.py
index 880295d4e5e96b97913e3abdbc789ebb74c98f35..7e75db8e049dc56ed918eb3e4cf61ec173c97130 100644 (file)
--- a/lib/sqlalchemy/orm/strategy_options.py
+++ b/lib/sqlalchemy/orm/strategy_options.py
@@ -1107,7 +1107,7 @@ def load_only(loadopt, *attrs):
 
         session.query(User, Address).join(User.addresses).options(
                     Load(User).load_only("name", "fullname"),
-                    Load(Address).load_only("email_addres")
+                    Load(Address).load_only("email_address")
                 )
 
 

diff --git a/test/orm/test_mapper.py b/test/orm/test_mapper.py
index 0aed3a5c183d06469a7dc270eb388b1895b48781..1d6d04c95cf5230095d47ca1bf8345dc4827b0ad 100644 (file)
--- a/test/orm/test_mapper.py
+++ b/test/orm/test_mapper.py
@@ -277,7 +277,7 @@ class MapperTest(_fixtures.FixtureTest, AssertsCompiledSQL):
         eq_(a.user_id, 7)
         eq_(a.id, 1)
         # email address auto-defers
-        assert "email_addres" not in a.__dict__
+        assert "email_address" not in a.__dict__
         eq_(a.email_address, "jack@bean.com")
 
     def test_column_not_present(self):