diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-04-03 17:59:40 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2015-04-03 17:59:40 -0400 |
| commit | ad7cb2ebd38629599e7105ac016a96d81ed9ee07 (patch) | |
| tree | 1c1562c9b048bff8ba69a6d86dd6b2e1d71ef043 /lib/sqlalchemy/sql | |
| parent | 09a2915457777c1d16a5013e931c4b25b4db6f78 (diff) | |
| parent | e0d7f5243947049b2d38792ecda11da2bdadd548 (diff) | |
| download | sqlalchemy-ad7cb2ebd38629599e7105ac016a96d81ed9ee07.tar.gz | |
Merge branch 'bb_issue_3084' of https://bitbucket.org/xflr6/sqlalchemy into pr47
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/ddl.py | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/schema.py | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/sqlalchemy/sql/ddl.py b/lib/sqlalchemy/sql/ddl.py index 3834f25f4..bbac6456e 100644 --- a/lib/sqlalchemy/sql/ddl.py +++ b/lib/sqlalchemy/sql/ddl.py @@ -1041,7 +1041,8 @@ def sort_tables_and_constraints( try: candidate_sort = list( topological.sort( - fixed_dependencies.union(mutable_dependencies), tables + fixed_dependencies.union(mutable_dependencies), tables, + deterministic_order=True ) ) except exc.CircularDependencyError as err: @@ -1058,7 +1059,8 @@ def sort_tables_and_constraints( mutable_dependencies.discard((dependent_on, table)) candidate_sort = list( topological.sort( - fixed_dependencies.union(mutable_dependencies), tables + fixed_dependencies.union(mutable_dependencies), tables, + deterministic_order=True ) ) diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py index 3aeba9804..e40909850 100644 --- a/lib/sqlalchemy/sql/schema.py +++ b/lib/sqlalchemy/sql/schema.py @@ -3450,7 +3450,7 @@ class MetaData(SchemaItem): """ - return ddl.sort_tables(self.tables.values()) + return ddl.sort_tables(sorted(self.tables.values(), key=lambda t: t.key)) def reflect(self, bind=None, schema=None, views=False, only=None, extend_existing=False, |
