summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql/traversals.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/traversals.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/traversals.py')
-rw-r--r--lib/sqlalchemy/sql/traversals.py19
1 files changed, 7 insertions, 12 deletions
diff --git a/lib/sqlalchemy/sql/traversals.py b/lib/sqlalchemy/sql/traversals.py
index 4a135538e..8c63fcba1 100644
--- a/lib/sqlalchemy/sql/traversals.py
+++ b/lib/sqlalchemy/sql/traversals.py
@@ -1,5 +1,6 @@
from collections import deque
from collections import namedtuple
+import itertools
import operator
from . import operators
@@ -589,28 +590,22 @@ class _GetChildren(InternalTraversal):
return (element,)
def visit_clauseelement_list(self, element, **kw):
- return tuple(element)
+ return element
def visit_clauseelement_tuples(self, element, **kw):
- tup = ()
- for elem in element:
- tup += elem
- return tup
+ return itertools.chain.from_iterable(element)
def visit_fromclause_canonical_column_collection(self, element, **kw):
- if kw.get("column_collections", False):
- return tuple(element)
- else:
- return ()
+ return ()
def visit_string_clauseelement_dict(self, element, **kw):
- return tuple(element.values())
+ return element.values()
def visit_fromclause_ordered_set(self, element, **kw):
- return tuple(element)
+ return element
def visit_clauseelement_unordered_set(self, element, **kw):
- return tuple(element)
+ return element
def visit_dml_ordered_values(self, element, **kw):
for k, v in element: