summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2018-01-12 13:00:49 -0500
committerGerrit Code Review <gerrit@ci.zzzcomputing.com>2018-01-12 13:00:49 -0500
commit0d1276157f926cb194b3aa6cd78bea523888ed94 (patch)
tree6cc80ee6b6c7c54808d74530b2f58f0a3c72814d /lib/sqlalchemy
parent4aaac3a91c13349de82e2452bb4b2301a7805b89 (diff)
parent4332b970c9ec0b32170b1206b965fa7eb5d62a3f (diff)
downloadsqlalchemy-0d1276157f926cb194b3aa6cd78bea523888ed94.tar.gz
Merge "Set up of_type variable for legacy loader option deserialize"
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/orm/strategy_options.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/strategy_options.py b/lib/sqlalchemy/orm/strategy_options.py
index 13c510047..1963e5843 100644
--- a/lib/sqlalchemy/orm/strategy_options.py
+++ b/lib/sqlalchemy/orm/strategy_options.py
@@ -449,6 +449,7 @@ class _UnboundLoad(Load):
if len(key) == 2:
# support legacy
cls, propkey = key
+ of_type = None
else:
cls, propkey, of_type = key
prop = getattr(cls, propkey)