diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-04-23 12:48:26 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2012-04-23 12:48:26 -0400 |
| commit | ee5dd855a72146327ee109f048a1ccba9cdc374a (patch) | |
| tree | 517d7da44d9d41f1803696f030eca75152c5fae8 /lib/sqlalchemy | |
| parent | 54017d9de202ed67072a352ce2f6dbfd74bf48f3 (diff) | |
| download | sqlalchemy-ee5dd855a72146327ee109f048a1ccba9cdc374a.tar.gz | |
- some adjustments to keep hybrid properties working
- callcount here seems to have gone up by five, reason not certain
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/orm/attributes.py | 7 | ||||
| -rw-r--r-- | lib/sqlalchemy/orm/descriptor_props.py | 4 |
2 files changed, 6 insertions, 5 deletions
diff --git a/lib/sqlalchemy/orm/attributes.py b/lib/sqlalchemy/orm/attributes.py index d75682443..fd51e200f 100644 --- a/lib/sqlalchemy/orm/attributes.py +++ b/lib/sqlalchemy/orm/attributes.py @@ -204,13 +204,14 @@ def create_proxied_attribute(descriptor): """ - def __init__(self, class_, key, descriptor, property_, + def __init__(self, class_, key, descriptor, comparator, - adapter=None, doc=None): + adapter=None, doc=None, + original_property=None): self.class_ = class_ self.key = key self.descriptor = descriptor - self.original_property = property_ + self.original_property = original_property self._comparator = comparator self.adapter = adapter self.__doc__ = doc diff --git a/lib/sqlalchemy/orm/descriptor_props.py b/lib/sqlalchemy/orm/descriptor_props.py index 57c245028..ba1109dfb 100644 --- a/lib/sqlalchemy/orm/descriptor_props.py +++ b/lib/sqlalchemy/orm/descriptor_props.py @@ -64,9 +64,9 @@ class DescriptorProperty(MapperProperty): self.parent.class_, self.key, self.descriptor, - self, lambda: self._comparator_factory(mapper), - doc=self.doc + doc=self.doc, + original_property=self ) proxy_attr.impl = _ProxyImpl(self.key) mapper.class_manager.instrument_attribute(self.key, proxy_attr) |