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

diff --git a/lib/sqlalchemy/orm/strategy_options.py b/lib/sqlalchemy/orm/strategy_options.py
index e0ba3050c7f3e35e7b3f8ab8011e3b05f0112f73..273841588c2fd2535dc3896ee6fbd23d04c46679 100644 (file)
--- a/lib/sqlalchemy/orm/strategy_options.py
+++ b/lib/sqlalchemy/orm/strategy_options.py
@@ -1155,7 +1155,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 ab52e5aac6b3cecea7a77e139cdd444628404b72..cdd113288eb578cafcc91ecc4dacbbb8e4d1300a 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):