summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Amery <markrobertamery@gmail.com>2020-05-28 13:37:24 +0100
committerMike Bayer <mike_mp@zzzcomputing.com>2020-05-28 12:38:22 -0400
commit9d926287db06bf553b2b5d2c4f7eb8bfc0682be0 (patch)
treec0ef086fa345f5c5412223744a4a0cf290558325
parent0961297e70c066772aecb514eb8aa53531716de8 (diff)
downloadsqlalchemy-9d926287db06bf553b2b5d2c4f7eb8bfc0682be0.tar.gz
Fix 'email_address' being typoed as 'email_addres' in two places
(cherry picked from commit 8a6e64323abeb9d08de3f68c63c6401ba1a5f847)
-rw-r--r--lib/sqlalchemy/orm/strategy_options.py2
-rw-r--r--test/orm/test_mapper.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/strategy_options.py b/lib/sqlalchemy/orm/strategy_options.py
index 3a0a34cf5..536ffef1b 100644
--- a/lib/sqlalchemy/orm/strategy_options.py
+++ b/lib/sqlalchemy/orm/strategy_options.py
@@ -938,7 +938,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 bdf2f8a3f..ec76f6c7a 100644
--- a/test/orm/test_mapper.py
+++ b/test/orm/test_mapper.py
@@ -280,7 +280,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):