From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Mon, 24 Nov 2014 17:33:56 +0000 (-0500)
Subject: - Fixed a bug in the examples/generic_assocaitions/discriminator_on_association.py
X-Git-Tag: rel_0_9_9~73
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f992ca1944d548945ddbefd81c1290a24c8b5d33;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- Fixed a bug in the examples/generic_assocaitions/discriminator_on_association.py
example, where the subclasses of AddressAssociation were not being
mapped as "single table inheritance", leading to problems when trying
to use the mappings further.

(cherry picked from commit 2098001ad3e0a40aa909a347ec91c12fab04a657)
---

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index abf564875d..ef0277935f 100644
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -13,6 +13,15 @@
 .. changelog::
     :version: 0.9.9
 
+    .. change::
+        :tags: bug, examples
+        :versions: 1.0.0
+
+        Fixed a bug in the examples/generic_assocaitions/discriminator_on_association.py
+        example, where the subclasses of AddressAssociation were not being
+        mapped as "single table inheritance", leading to problems when trying
+        to use the mappings further.
+
     .. change::
         :tags: bug, orm
         :versions: 1.0.0
diff --git a/examples/generic_associations/discriminator_on_association.py b/examples/generic_associations/discriminator_on_association.py
index e03cfec009..7bb04cf851 100644
--- a/examples/generic_associations/discriminator_on_association.py
+++ b/examples/generic_associations/discriminator_on_association.py
@@ -84,6 +84,7 @@ class HasAddresses(object):
                         "%sAddressAssociation" % name,
                         (AddressAssociation, ),
                         dict(
+                            __tablename__=None,
                             __mapper_args__={
                                 "polymorphic_identity": discriminator
                             }