diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2021-12-10 16:21:09 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2021-12-10 16:21:09 +0000 |
| commit | 2d777e16074c365db64f62cbca150e7fbd46df71 (patch) | |
| tree | e7ba6449c9119b8b5b6e57ac28ff6ee24320fed5 /lib/sqlalchemy/sql | |
| parent | 9d837b02b5eb42385281b88d09fe2aeea0376ca9 (diff) | |
| parent | 9e20d410212296517f8dffd2531d55fee196635b (diff) | |
| download | sqlalchemy-2d777e16074c365db64f62cbca150e7fbd46df71.tar.gz | |
Merge "Removals: strings for join(), loader_options()." into main
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/coercions.py | 27 |
1 files changed, 2 insertions, 25 deletions
diff --git a/lib/sqlalchemy/sql/coercions.py b/lib/sqlalchemy/sql/coercions.py index 07da49c4e..38eed4d2a 100644 --- a/lib/sqlalchemy/sql/coercions.py +++ b/lib/sqlalchemy/sql/coercions.py @@ -610,20 +610,6 @@ class OnClauseImpl(_CoerceLiterals, _ColumnCoercions, RoleImpl): _coerce_consts = True - def _implicit_coercions( - self, original_element, resolved, argname=None, legacy=False, **kw - ): - if legacy and isinstance(resolved, str): - return resolved - else: - return super(OnClauseImpl, self)._implicit_coercions( - original_element, - resolved, - argname=argname, - legacy=legacy, - **kw - ) - def _text_coercion(self, element, argname=None, legacy=False): if legacy and isinstance(element, str): util.warn_deprecated_20( @@ -925,9 +911,8 @@ class JoinTargetImpl(RoleImpl): _skip_clauseelement_for_target_match = True - def _literal_coercion(self, element, legacy=False, **kw): - if isinstance(element, str): - return element + def _literal_coercion(self, element, argname=None, **kw): + self._raise_for_expected(element, argname) def _implicit_coercions( self, original_element, resolved, argname=None, legacy=False, **kw @@ -937,14 +922,6 @@ class JoinTargetImpl(RoleImpl): # #6550, unless JoinTargetImpl._skip_clauseelement_for_target_match # were set to False. return original_element - elif legacy and isinstance(resolved, str): - util.warn_deprecated_20( - "Using strings to indicate relationship names in " - "Query.join() is deprecated and will be removed in " - "SQLAlchemy 2.0. Please use the class-bound attribute " - "directly." - ) - return resolved elif legacy and isinstance(resolved, roles.WhereHavingRole): return resolved elif legacy and resolved._is_select_statement: |