summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-08-22 18:35:09 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2017-08-22 18:35:09 -0400
commit3f9df2b86b4a8d7912d1190aead4aa084daf802c (patch)
tree65074268fb837c80769c67e0b584e689c82330f1 /lib
parentd8a80a35a0f117c7659c7a9c62e27994d3aadc01 (diff)
downloadsqlalchemy-3f9df2b86b4a8d7912d1190aead4aa084daf802c.tar.gz
Handle cache key for option that has no strategy
Fixed regression where the use of a :func:`.undefer_group` option in conjunction with a lazy loaded relationship option would cause an attribute error, due to a bug in the SQL cache key generation added in 1.2 as part of :ticket:`3954`. Change-Id: Icd9a34f0b5aa96d6433a2ab9c8d3eaee0006f609 Fixes: #4049
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/orm/strategy_options.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/strategy_options.py b/lib/sqlalchemy/orm/strategy_options.py
index c47536a02..e07a6b3d0 100644
--- a/lib/sqlalchemy/orm/strategy_options.py
+++ b/lib/sqlalchemy/orm/strategy_options.py
@@ -110,7 +110,7 @@ class Load(Generative, MapperOption):
serialized.append(
(
tuple(serialized_path) +
- obj.strategy +
+ (obj.strategy or ()) +
(tuple([
(key, obj.local_opts[key])
for key in sorted(obj.local_opts)