diff options
Diffstat (limited to 'lib/sqlalchemy/sql/util.py')
| -rw-r--r-- | lib/sqlalchemy/sql/util.py | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/sqlalchemy/sql/util.py b/lib/sqlalchemy/sql/util.py index 9b9b9ec09..d0ca0b01f 100644 --- a/lib/sqlalchemy/sql/util.py +++ b/lib/sqlalchemy/sql/util.py @@ -7,6 +7,7 @@ from itertools import chain def sort_tables(tables): """sort a collection of Table objects in order of their foreign-key dependency.""" + tables = list(tables) tuples = [] def visit_foreign_key(fkey): if fkey.use_alter: @@ -60,7 +61,7 @@ def find_tables(clause, check_columns=False, include_aliases=False, include_join def find_columns(clause): """locate Column objects within the given expression.""" - cols = set() + cols = util.column_set() def visit_column(col): cols.add(col) visitors.traverse(clause, {}, {'column':visit_column}) @@ -182,7 +183,7 @@ class Annotated(object): # to this object's __dict__. clone.__dict__.update(self.__dict__) return Annotated(clone, self._annotations) - + def __hash__(self): return hash(self.__element) @@ -279,9 +280,9 @@ def reduce_columns(columns, *clauses, **kw): """ ignore_nonexistent_tables = kw.pop('ignore_nonexistent_tables', False) - columns = util.OrderedSet(columns) + columns = util.column_set(columns) - omit = set() + omit = util.column_set() for col in columns: for fk in col.foreign_keys: for c in columns: @@ -301,7 +302,7 @@ def reduce_columns(columns, *clauses, **kw): if clauses: def visit_binary(binary): if binary.operator == operators.eq: - cols = set(chain(*[c.proxy_set for c in columns.difference(omit)])) + cols = util.column_set(chain(*[c.proxy_set for c in columns.difference(omit)])) if binary.left in cols and binary.right in cols: for c in columns: if c.shares_lineage(binary.right): @@ -444,7 +445,7 @@ class ClauseAdapter(visitors.ReplacingCloningVisitor): self.selectable = selectable self.include = include self.exclude = exclude - self.equivalents = equivalents or {} + self.equivalents = util.column_dict(equivalents or {}) def _corresponding_column(self, col, require_embedded, _seen=util.EMPTY_SET): newcol = self.selectable.corresponding_column(col, require_embedded=require_embedded) @@ -484,7 +485,7 @@ class ColumnAdapter(ClauseAdapter): ClauseAdapter.__init__(self, selectable, equivalents, include, exclude) if chain_to: self.chain(chain_to) - self.columns = util.PopulateDict(self._locate_col) + self.columns = util.populate_column_dict(self._locate_col) def wrap(self, adapter): ac = self.__class__.__new__(self.__class__) @@ -492,7 +493,7 @@ class ColumnAdapter(ClauseAdapter): ac._locate_col = ac._wrap(ac._locate_col, adapter._locate_col) ac.adapt_clause = ac._wrap(ac.adapt_clause, adapter.adapt_clause) ac.adapt_list = ac._wrap(ac.adapt_list, adapter.adapt_list) - ac.columns = util.PopulateDict(ac._locate_col) + ac.columns = util.populate_column_dict(ac._locate_col) return ac adapt_clause = ClauseAdapter.traverse |