diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-08-14 20:52:57 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-08-14 20:52:57 -0400 |
| commit | dc31eb352aed6b578b7cf0bbc0d4290b6d11f2b2 (patch) | |
| tree | f57fb2bf5a70d46aa0515ad488195d5d1f3e93c0 /lib/sqlalchemy/ext/declarative.py | |
| parent | 504fd37d6848005730c8c68769ba9e06f83551dc (diff) | |
| parent | ff1d504fc4b7df2284b9f261cd03a7568b7038e8 (diff) | |
| download | sqlalchemy-dc31eb352aed6b578b7cf0bbc0d4290b6d11f2b2.tar.gz | |
merge tip
Diffstat (limited to 'lib/sqlalchemy/ext/declarative.py')
| -rwxr-xr-x | lib/sqlalchemy/ext/declarative.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/declarative.py b/lib/sqlalchemy/ext/declarative.py index 2310f01ce..e40ba3ec4 100755 --- a/lib/sqlalchemy/ext/declarative.py +++ b/lib/sqlalchemy/ext/declarative.py @@ -1197,7 +1197,7 @@ def _deferred_relationship(cls, prop): if isinstance(prop, RelationshipProperty): for attr in ('argument', 'order_by', 'primaryjoin', 'secondaryjoin', - 'secondary', '_foreign_keys', 'remote_side'): + 'secondary', '_user_defined_foreign_keys', 'remote_side'): v = getattr(prop, attr) if isinstance(v, basestring): setattr(prop, attr, resolve_arg(v)) |