diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-01-21 20:10:23 -0500 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2014-01-21 20:10:23 -0500 |
| commit | 07fb90c6cc14de6d02cf4be592c57d56831f59f7 (patch) | |
| tree | 050ef65db988559c60f7aa40f2d0bfe24947e548 /examples/association/proxied_association.py | |
| parent | 560fd1d5ed643a1b0f95296f3b840c1963bbe67f (diff) | |
| parent | ee1f4d21037690ad996c5eacf7e1200e92f2fbaa (diff) | |
| download | sqlalchemy-ticket_2501.tar.gz | |
Merge branch 'master' into ticket_2501ticket_2501
Conflicts:
lib/sqlalchemy/orm/mapper.py
Diffstat (limited to 'examples/association/proxied_association.py')
| -rw-r--r-- | examples/association/proxied_association.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/examples/association/proxied_association.py b/examples/association/proxied_association.py index 4cf1c51be..7cb4c9338 100644 --- a/examples/association/proxied_association.py +++ b/examples/association/proxied_association.py @@ -1,5 +1,9 @@ -"""An extension to the basic_association.py example, which illustrates -the usage of sqlalchemy.ext.associationproxy. +"""proxied_association.py + +same example as basic_association, adding in +usage of :mod:`sqlalchemy.ext.associationproxy` to make explicit references +to ``OrderItem`` optional. + """ |