summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2018-03-12 12:50:52 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2018-03-12 12:50:52 -0400
commit0fd508ad32a6f94653757a5ae10c1eae14e099fc (patch)
tree457bcc42d36a999692df758fef6aed8e426d54be
parentf3e18baa00489b2a85293edcdb4c98cb409c8c93 (diff)
downloadsqlalchemy-0fd508ad32a6f94653757a5ae10c1eae14e099fc.tar.gz
Ignore non-primary mappers within mutable instrumentation
Fixed bug where using :meth:`.Mutable.associate_with` or :meth:`.Mutable.as_mutable` in conjunction with a class that has non- primary mappers set up with alternatively-named attributes would produce an attribute error. Since non-primary mappers are not used for persistence, the mutable extension now excludes non-primary mappers from its instrumentation steps. Change-Id: I2630d9f771a171aece03181ccf9159885f68f25e Fixes: #4215
-rw-r--r--doc/build/changelog/unreleased_12/4215.rst12
-rw-r--r--lib/sqlalchemy/ext/mutable.py4
-rw-r--r--test/ext/test_mutable.py22
3 files changed, 38 insertions, 0 deletions
diff --git a/doc/build/changelog/unreleased_12/4215.rst b/doc/build/changelog/unreleased_12/4215.rst
new file mode 100644
index 000000000..e658c5ba8
--- /dev/null
+++ b/doc/build/changelog/unreleased_12/4215.rst
@@ -0,0 +1,12 @@
+.. change::
+ :tags: bug, orm
+ :tickets: 4215
+ :versions: 1.3.0b1
+
+ Fixed bug where using :meth:`.Mutable.associate_with` or
+ :meth:`.Mutable.as_mutable` in conjunction with a class that has non-
+ primary mappers set up with alternatively-named attributes would produce an
+ attribute error. Since non-primary mappers are not used for persistence,
+ the mutable extension now excludes non-primary mappers from its
+ instrumentation steps.
+
diff --git a/lib/sqlalchemy/ext/mutable.py b/lib/sqlalchemy/ext/mutable.py
index 955aa3ae1..014cef3cc 100644
--- a/lib/sqlalchemy/ext/mutable.py
+++ b/lib/sqlalchemy/ext/mutable.py
@@ -566,6 +566,8 @@ class Mutable(MutableBase):
"""
def listen_for_type(mapper, class_):
+ if mapper.non_primary:
+ return
for prop in mapper.column_attrs:
if isinstance(prop.columns[0].type, sqltype):
cls.associate_with_attribute(getattr(class_, prop.key))
@@ -619,6 +621,8 @@ class Mutable(MutableBase):
schema_event_check = False
def listen_for_type(mapper, class_):
+ if mapper.non_primary:
+ return
for prop in mapper.column_attrs:
if (
schema_event_check and
diff --git a/test/ext/test_mutable.py b/test/ext/test_mutable.py
index 16fd52d97..654a85e74 100644
--- a/test/ext/test_mutable.py
+++ b/test/ext/test_mutable.py
@@ -801,6 +801,17 @@ class MutableWithScalarJSONTest(_MutableDictTestBase, fixtures.MappedTest):
self._test_non_mutable()
+class MutableIncludeNonPrimaryTest(MutableWithScalarJSONTest):
+ @classmethod
+ def setup_mappers(cls):
+ foo = cls.tables.foo
+
+ mapper(Foo, foo)
+ mapper(Foo, foo, non_primary=True, properties={
+ "foo_bar": foo.c.data
+ })
+
+
class MutableColumnCopyJSONTest(_MutableDictTestBase, fixtures.MappedTest):
@classmethod
@@ -967,6 +978,17 @@ class MutableAssociationScalarPickleTest(_MutableDictTestBase,
)
+class MutableAssocIncludeNonPrimaryTest(MutableAssociationScalarPickleTest):
+ @classmethod
+ def setup_mappers(cls):
+ foo = cls.tables.foo
+
+ mapper(Foo, foo)
+ mapper(Foo, foo, non_primary=True, properties={
+ "foo_bar": foo.c.data
+ })
+
+
class MutableAssociationScalarJSONTest(_MutableDictTestBase,
fixtures.MappedTest):