summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/annotation.py
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2022-11-11 21:30:43 +0000
committerGerrit Code Review <gerrit@ci3.zzzcomputing.com>2022-11-11 21:30:43 +0000
commit6b140afe7db3456c995f50bacaca69112db72d70 (patch)
tree6163a6e3f4a5dd78073a82151c96e351a541c6a5 /lib/sqlalchemy/sql/annotation.py
parent1dd0f23e8d74aa7edc8dd309093a95171e2e8f09 (diff)
parent1d8833a9c1ada64cfc716109a8836b32cb8a9bd6 (diff)
downloadsqlalchemy-6b140afe7db3456c995f50bacaca69112db72d70.tar.gz
Merge "ensure anon_map is passed for most annotated traversals" into main
Diffstat (limited to 'lib/sqlalchemy/sql/annotation.py')
-rw-r--r--lib/sqlalchemy/sql/annotation.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/lib/sqlalchemy/sql/annotation.py b/lib/sqlalchemy/sql/annotation.py
index 262048bd1..43ca84abb 100644
--- a/lib/sqlalchemy/sql/annotation.py
+++ b/lib/sqlalchemy/sql/annotation.py
@@ -94,12 +94,18 @@ class SupportsAnnotations(ExternallyTraversible):
@util.memoized_property
def _annotations_cache_key(self) -> Tuple[Any, ...]:
anon_map_ = anon_map()
+
+ return self._gen_annotations_cache_key(anon_map_)
+
+ def _gen_annotations_cache_key(
+ self, anon_map: anon_map
+ ) -> Tuple[Any, ...]:
return (
"_annotations",
tuple(
(
key,
- value._gen_cache_key(anon_map_, [])
+ value._gen_cache_key(anon_map, [])
if isinstance(value, HasCacheKey)
else value,
)