summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
authorSebastian Bank <sebastian.bank@uni-leipzig.de>2015-03-07 14:04:14 +0100
committerSebastian Bank <sebastian.bank@uni-leipzig.de>2015-03-07 14:04:14 +0100
commitb3f9698c63e1b863bb780fbe7cd6460454f9ec6a (patch)
tree17ad9575d810773387e9e4ae65ce1b87a6882022 /lib/sqlalchemy/sql
parent81d2b2f44f0af9cbe6652d162360c650b62632c0 (diff)
downloadsqlalchemy-b3f9698c63e1b863bb780fbe7cd6460454f9ec6a.tar.gz
make sort_tables order deterministic
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r--lib/sqlalchemy/sql/ddl.py6
-rw-r--r--lib/sqlalchemy/sql/schema.py2
2 files changed, 5 insertions, 3 deletions
diff --git a/lib/sqlalchemy/sql/ddl.py b/lib/sqlalchemy/sql/ddl.py
index 7a1c7fef6..b4d2f17aa 100644
--- a/lib/sqlalchemy/sql/ddl.py
+++ b/lib/sqlalchemy/sql/ddl.py
@@ -1031,7 +1031,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:
@@ -1048,7 +1049,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 fa48a16cc..c027f2f96 100644
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -3422,7 +3422,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,