summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/ext
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2009-12-08 23:09:48 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2009-12-08 23:09:48 +0000
commitdc1fc3a8972ce79d3c63289018335fcb92dd45d8 (patch)
tree900685b7485ab61d75d0e535b3ec78538035fbbf /lib/sqlalchemy/ext
parentd39a15748948904d5d45a3a6ee798b8b799b9311 (diff)
downloadsqlalchemy-dc1fc3a8972ce79d3c63289018335fcb92dd45d8.tar.gz
- The signature of the proxy_factory callable passed to
association_proxy is now (lazy_collection, creator, value_attr, association_proxy), adding a fourth argument that is the parent AssociationProxy argument. Allows serializability and subclassing of the built in collections. [ticket:1259]
Diffstat (limited to 'lib/sqlalchemy/ext')
-rw-r--r--lib/sqlalchemy/ext/associationproxy.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sqlalchemy/ext/associationproxy.py b/lib/sqlalchemy/ext/associationproxy.py
index e126fe638..4353558f8 100644
--- a/lib/sqlalchemy/ext/associationproxy.py
+++ b/lib/sqlalchemy/ext/associationproxy.py
@@ -220,7 +220,7 @@ class AssociationProxy(object):
self.collection_class = util.duck_type_collection(lazy_collection())
if self.proxy_factory:
- return self.proxy_factory(lazy_collection, creator, self.value_attr)
+ return self.proxy_factory(lazy_collection, creator, self.value_attr, self)
if self.getset_factory:
getter, setter = self.getset_factory(self.collection_class, self)