summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/properties.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2021-12-08 20:27:16 -0500
committerMike Bayer <mike_mp@zzzcomputing.com>2021-12-27 12:30:38 -0500
commit91501e06a17d873902114275d7149ba24973db6a (patch)
tree464d2c7167c30d92be13c851b52c0f4471645456 /lib/sqlalchemy/orm/properties.py
parent2bb6cfc7c9b8f09eaa4efeffc337a1162993979c (diff)
downloadsqlalchemy-91501e06a17d873902114275d7149ba24973db6a.tar.gz
factor out UnboundLoad and rearchitect strategy_options.py
The architecture of Load is mostly rewritten here. The change includes removal of the "pluggable" aspect of the loader options, which would patch new methods onto Load. This has been replaced by normal methods that respond normally to typing annotations. As part of this change, the bake_loaders() and unbake_loaders() options, which have no effect since 1.4 and were unlikely to be in any common use, have been removed. Additionally, to support annotations for methods that make use of @decorator, @generative etc., modified format_argspec_plus to no longer return "args", instead returns "grouped_args" which is always grouped and allows return annotations to format correctly. Fixes: #6986 Change-Id: I6117c642345cdde65a64389bba6057ddd5374427
Diffstat (limited to 'lib/sqlalchemy/orm/properties.py')
-rw-r--r--lib/sqlalchemy/orm/properties.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py
index de46f84a7..04b7f89c2 100644
--- a/lib/sqlalchemy/orm/properties.py
+++ b/lib/sqlalchemy/orm/properties.py
@@ -13,6 +13,7 @@ mapped attributes.
"""
from . import attributes
+from . import strategy_options
from .descriptor_props import CompositeProperty
from .descriptor_props import ConcreteInheritedProperty
from .descriptor_props import SynonymProperty
@@ -43,7 +44,7 @@ class ColumnProperty(StrategizedProperty):
"""
- strategy_wildcard_key = "column"
+ strategy_wildcard_key = strategy_options._COLUMN_TOKEN
inherit_cache = True
_links_to_entity = False