diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2022-11-27 16:36:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2022-11-27 16:36:32 +0000 |
| commit | db2344b0a2a9ef164651d645a8da2d7a9d1bc250 (patch) | |
| tree | 012d5d22e76dd67805e86e19137dafb233341796 /lib/sqlalchemy | |
| parent | 372ea0893bb58cd8a5136e9fde4e9130f590bbfd (diff) | |
| parent | e3710b405ff2680bf67c0eb0cf91182f9094237d (diff) | |
| download | sqlalchemy-db2344b0a2a9ef164651d645a8da2d7a9d1bc250.tar.gz | |
Merge "improve column targeting issues with query_expression" into main
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/_orm_constructors.py | 1 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/properties.py | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/_orm_constructors.py b/lib/sqlalchemy/orm/_orm_constructors.py index 30119d9d7..c4abb1c8e 100644 --- a/lib/sqlalchemy/orm/_orm_constructors.py +++ b/lib/sqlalchemy/orm/_orm_constructors.py @@ -1970,6 +1970,7 @@ def query_expression( info=info, doc=doc, ) + prop.strategy_key = (("query_expression", True),) return prop diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py index e89e3c356..1a5f0bd71 100644 --- a/lib/sqlalchemy/orm/properties.py +++ b/lib/sqlalchemy/orm/properties.py @@ -221,6 +221,9 @@ class ColumnProperty( ] def _memoized_attr__renders_in_subqueries(self) -> bool: + if ("query_expression", True) in self.strategy_key: + return self.strategy._have_default_expression # type: ignore + return ("deferred", True) not in self.strategy_key or ( self not in self.parent._readonly_props # type: ignore ) |