diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-09-28 11:00:53 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-09-28 11:00:53 -0400 |
| commit | 4aba2eb6017de5d4b56d4aa34af87f2ebab903b0 (patch) | |
| tree | 8bc1ebfe192df559e4ec507818d88156eabb903e /lib/sqlalchemy/orm/properties.py | |
| parent | 21cac5b598a83ef0e24423dc523629b475aa3af0 (diff) | |
| download | sqlalchemy-4aba2eb6017de5d4b56d4aa34af87f2ebab903b0.tar.gz | |
- fix annotation transfer when producing m2m backref, [ticket:2578]
Diffstat (limited to 'lib/sqlalchemy/orm/properties.py')
| -rw-r--r-- | lib/sqlalchemy/orm/properties.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/sqlalchemy/orm/properties.py b/lib/sqlalchemy/orm/properties.py index ad48234c2..f8288f5fb 100644 --- a/lib/sqlalchemy/orm/properties.py +++ b/lib/sqlalchemy/orm/properties.py @@ -1167,8 +1167,10 @@ class RelationshipProperty(StrategizedProperty): # for many to many, just switch primaryjoin/ # secondaryjoin. use the annotated # pj/sj on the _join_condition. - pj = kwargs.pop('primaryjoin', self._join_condition.secondaryjoin) - sj = kwargs.pop('secondaryjoin', self._join_condition.primaryjoin) + pj = kwargs.pop('primaryjoin', + self._join_condition.secondaryjoin_minus_local) + sj = kwargs.pop('secondaryjoin', + self._join_condition.primaryjoin_minus_local) else: pj = kwargs.pop('primaryjoin', self._join_condition.primaryjoin_reverse_remote) |
