diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-05-18 16:08:33 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2020-05-18 16:21:54 -0400 |
| commit | 53af60b3536221f2503af29c1e90cf9db1295faf (patch) | |
| tree | 13d5e142ed0759e63fb4fee7aa244519703e42ed /lib/sqlalchemy/sql/selectable.py | |
| parent | de1fd55af4ef352ebbc95e03d868aab2995a8261 (diff) | |
| download | sqlalchemy-53af60b3536221f2503af29c1e90cf9db1295faf.tar.gz | |
Streamline visitors.iterate
This method might be used more significantly in the
ORM refactor, so further refine it.
* all get_children() methods now work entirely based on iterators.
Basically only select() was sensitive to this anymore and it now
chains the iterators together
* remove all kinds of flags like column_collections, schema_visitor
that apparently aren't used anymore.
* remove the "depthfirst" visitors as these don't seem to be
used either.
* make sure select() yields its columns first as these will be used
to determine the current mapper.
Change-Id: I05273a2d5306a57c2d1b0979050748cf3ac964bf
Diffstat (limited to 'lib/sqlalchemy/sql/selectable.py')
| -rw-r--r-- | lib/sqlalchemy/sql/selectable.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/sqlalchemy/sql/selectable.py b/lib/sqlalchemy/sql/selectable.py index 27b9425ec..0f3d24191 100644 --- a/lib/sqlalchemy/sql/selectable.py +++ b/lib/sqlalchemy/sql/selectable.py @@ -3454,8 +3454,8 @@ class Select( _traverse_internals = ( [ - ("_from_obj", InternalTraversal.dp_clauseelement_list), ("_raw_columns", InternalTraversal.dp_clauseelement_list), + ("_from_obj", InternalTraversal.dp_clauseelement_list), ("_where_criteria", InternalTraversal.dp_clauseelement_list), ("_having_criteria", InternalTraversal.dp_clauseelement_list), ("_order_by_clauses", InternalTraversal.dp_clauseelement_list,), @@ -3944,10 +3944,11 @@ class Select( self._assert_no_memoizations() def get_children(self, **kwargs): - return list(set(self._iterate_from_elements())) + super( - Select, self - ).get_children( - omit_attrs=["_from_obj", "_correlate", "_correlate_except"] + return itertools.chain( + super(Select, self).get_children( + omit_attrs=["_from_obj", "_correlate", "_correlate_except"] + ), + self._iterate_from_elements(), ) @_generative |