From: Mark Amery Date: Thu, 28 May 2020 12:37:24 +0000 (+0100) Subject: Fix 'email_address' being typoed as 'email_addres' in two places X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9d926287db06bf553b2b5d2c4f7eb8bfc0682be0;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git 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 3a0a34cf56..536ffef1b9 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 bdf2f8a3f6..ec76f6c7ad 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):