diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2018-10-20 16:55:01 -0400 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci.zzzcomputing.com> | 2018-10-20 16:55:01 -0400 |
| commit | ead6fee1a763d515e941025ade439a17fd6a9e77 (patch) | |
| tree | 4706cd73de02f951e9067eea2e2dd588584cd0c4 /lib | |
| parent | 3cd9c81c1c91e69993c21871b471cb6dda222b7a (diff) | |
| parent | 9335c24d6c98033f4aa1ceafd23a70b88c8ae811 (diff) | |
| download | sqlalchemy-ead6fee1a763d515e941025ade439a17fd6a9e77.tar.gz | |
Merge "Check more specifically for hybrid attr and not mapped property"
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/ext/declarative/base.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/declarative/base.py b/lib/sqlalchemy/ext/declarative/base.py index 9e15582d6..a6642364d 100644 --- a/lib/sqlalchemy/ext/declarative/base.py +++ b/lib/sqlalchemy/ext/declarative/base.py @@ -295,7 +295,8 @@ class _MapperConfig(object): # produces nested proxies, so we are only # looking one level deep right now. if isinstance(ret, InspectionAttr) and \ - ret._is_internal_proxy: + ret._is_internal_proxy and not isinstance( + ret.original_property, MapperProperty): ret = ret.descriptor dict_[name] = column_copies[obj] = ret |