summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/elements.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2020-05-18 16:08:33 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2020-05-18 16:21:54 -0400
commit53af60b3536221f2503af29c1e90cf9db1295faf (patch)
tree13d5e142ed0759e63fb4fee7aa244519703e42ed /lib/sqlalchemy/sql/elements.py
parentde1fd55af4ef352ebbc95e03d868aab2995a8261 (diff)
downloadsqlalchemy-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/elements.py')
-rw-r--r--lib/sqlalchemy/sql/elements.py23
1 files changed, 14 insertions, 9 deletions
diff --git a/lib/sqlalchemy/sql/elements.py b/lib/sqlalchemy/sql/elements.py
index e7c1f3f77..43115f117 100644
--- a/lib/sqlalchemy/sql/elements.py
+++ b/lib/sqlalchemy/sql/elements.py
@@ -388,19 +388,18 @@ class ClauseElement(
clause-level).
"""
- result = []
try:
traverse_internals = self._traverse_internals
except AttributeError:
- return result
+ return []
- for attrname, obj, meth in _get_children.run_generated_dispatch(
- self, traverse_internals, "_generated_get_children_traversal"
- ):
- if obj is None or attrname in omit_attrs:
- continue
- result.extend(meth(obj, **kw))
- return result
+ return itertools.chain.from_iterable(
+ meth(obj, **kw)
+ for attrname, obj, meth in _get_children.run_generated_dispatch(
+ self, traverse_internals, "_generated_get_children_traversal"
+ )
+ if attrname not in omit_attrs and obj is not None
+ )
def self_group(self, against=None):
# type: (Optional[Any]) -> ClauseElement
@@ -4302,8 +4301,14 @@ class ColumnClause(
def get_children(self, column_tables=False, **kw):
if column_tables and self.table is not None:
+ # TODO: this is only used by ORM query deep_entity_zero.
+ # this is being removed in a later release so remove
+ # column_tables also at that time.
return [self.table]
else:
+ # override base get_children() to not return the Table
+ # or selectable that is parent to this column. Traversals
+ # expect the columns of tables and subqueries to be leaf nodes.
return []
@HasMemoized.memoized_attribute