diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-08-14 20:55:47 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-08-14 20:55:47 -0400 |
| commit | fb15c61cc0a6ce128e6ef96d0977eaeb7d8437af (patch) | |
| tree | 66f3973cc929907d008f9558bbb27895682ddbf9 /lib/sqlalchemy/ext/declarative.py | |
| parent | 56e628ea203219a7492c17e60eb58cd55c7d5caf (diff) | |
| parent | ff1d504fc4b7df2284b9f261cd03a7568b7038e8 (diff) | |
| download | sqlalchemy-fb15c61cc0a6ce128e6ef96d0977eaeb7d8437af.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 dc7e5feb4..6ecff34bb 100755 --- a/lib/sqlalchemy/ext/declarative.py +++ b/lib/sqlalchemy/ext/declarative.py @@ -1198,7 +1198,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)) |