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-Tag: rel_1_3_18~19 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fb60bed8a1bd83545eb3723411e4ec20136dd5a;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 880295d4e5..7e75db8e04 100644 --- 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 0aed3a5c18..1d6d04c95c 100644 --- 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):