summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/relationships.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2021-06-02 15:56:15 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2021-06-02 15:56:15 -0400
commitf51c56b8dca0569269a69bd85c25fcfed39a3c9e (patch)
treea657e6273accbb31c753fb71c159e35d3dc830db /lib/sqlalchemy/orm/relationships.py
parent585aa7d7575dfb9a90a00bbd00c68da9e2cb31d7 (diff)
downloadsqlalchemy-f51c56b8dca0569269a69bd85c25fcfed39a3c9e.tar.gz
apply sorting to overlaps message
so that string comparison tests are deterministic Change-Id: Ia072f225fb906ea43c451eb4217856f144932fd2
Diffstat (limited to 'lib/sqlalchemy/orm/relationships.py')
-rw-r--r--lib/sqlalchemy/orm/relationships.py8
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/sqlalchemy/orm/relationships.py b/lib/sqlalchemy/orm/relationships.py
index 171df3e21..2d1ed6ced 100644
--- a/lib/sqlalchemy/orm/relationships.py
+++ b/lib/sqlalchemy/orm/relationships.py
@@ -3459,10 +3459,12 @@ class JoinCondition(object):
from_,
to_,
", ".join(
- "'%s' (copies %s to %s)" % (pr, fr_, to_)
- for (pr, fr_) in other_props
+ sorted(
+ "'%s' (copies %s to %s)" % (pr, fr_, to_)
+ for (pr, fr_) in other_props
+ )
),
- ",".join(pr.key for pr, fr in other_props),
+ ",".join(sorted(pr.key for pr, fr in other_props)),
self.prop,
),
code="qzyx",