From 1c56b6049a3fdd1122a4c82ae5757332d3753146 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Thu, 17 Jan 2019 23:38:40 -0500 Subject: Cleanup with query aliasing Try to simplify some of the "adapter" stuff in query: 1. identify that join(.., aliased=True) doesn't work if the right side has no mapper. The adaption of the right side is done via the mapper with aliased(), so that doesn't effect a selectable only. raise an error, so we can simplify the code. 2. build fewer adapter objects. these are confusing to follow and we should try to figure out exactly what purpose which one serves where and make that clear. Change-Id: I18dfcd01e6ad533aa0b8d557fc637ee2766ed050 --- lib/sqlalchemy/sql/util.py | 3 --- 1 file changed, 3 deletions(-) (limited to 'lib/sqlalchemy/sql/util.py') diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py index 3ebb91e96..9780caa1c 100644 --- a/lib/sqlalchemy/sql/util.py +++ b/lib/sqlalchemy/sql/util.py @@ -830,7 +830,6 @@ class ColumnAdapter(ClauseAdapter): self, selectable, equivalents=None, - chain_to=None, adapt_required=False, include_fn=None, exclude_fn=None, @@ -848,8 +847,6 @@ class ColumnAdapter(ClauseAdapter): anonymize_labels=anonymize_labels, ) - if chain_to: - self.chain(chain_to) self.columns = util.populate_column_dict(self._locate_col) if self.include_fn or self.exclude_fn: self.columns = self._IncludeExcludeMapping(self, self.columns) -- cgit v1.2.1