summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/orm/descriptor_props.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-08-24 18:48:42 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-08-24 18:48:42 -0400
commit393b29477648e9b2db9597916a0e53602610ac44 (patch)
tree533dc7cb74b21cbd6f9ebeab89a6837c9bf30f35 /lib/sqlalchemy/orm/descriptor_props.py
parenta113c7b3a74f3c1b3128995a20c1760c87695cf3 (diff)
downloadsqlalchemy-393b29477648e9b2db9597916a0e53602610ac44.tar.gz
- [feature] Added support for .info dictionary argument to
column_property(), relationship(), composite(). All MapperProperty classes have an auto-creating .info dict available overall.
Diffstat (limited to 'lib/sqlalchemy/orm/descriptor_props.py')
-rw-r--r--lib/sqlalchemy/orm/descriptor_props.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/descriptor_props.py b/lib/sqlalchemy/orm/descriptor_props.py
index f4c2e1a90..fdbe44c6c 100644
--- a/lib/sqlalchemy/orm/descriptor_props.py
+++ b/lib/sqlalchemy/orm/descriptor_props.py
@@ -92,6 +92,9 @@ class CompositeProperty(DescriptorProperty):
self.group = kwargs.get('group', None)
self.comparator_factory = kwargs.pop('comparator_factory',
self.__class__.Comparator)
+ if 'info' in kwargs:
+ self.info = kwargs.pop('info')
+
util.set_creation_order(self)
self._create_descriptor()