Allow Table._reset_exported to silently pass

Fixed bug in :class:`.Table` where the internal method
``_reset_exported()`` would corrupt the state of the object.  This
method is intended for selectable objects and is called by the ORM
in some cases; an erroneous mapper configuration would could lead the
ORM to call this on on a :class:`.Table` object.

Change-Id: I63fa34ee0cdf16358bb125c556390df79758bcbc
Fixes: #3755
(cherry picked from commit 149fb5f55a5df3f31f6575919a5a5a2e5ba9cb0c)

diff --git a/doc/build/changelog/changelog_10.rst b/doc/build/changelog/changelog_10.rst
index c977c7366d0e67d9d28375cc5d8f179406717d60..16a38e662632fb4ce95b1271a614d7bddad47366 100644 (file)
--- a/doc/build/changelog/changelog_10.rst
+++ b/doc/build/changelog/changelog_10.rst
@@ -18,6 +18,16 @@
 .. changelog::
     :version: 1.0.15
 
+    .. change::
+        :tags: bug, sql
+        :tickets: 3755
+
+        Fixed bug in :class:`.Table` where the internal method
+        ``_reset_exported()`` would corrupt the state of the object.  This
+        method is intended for selectable objects and is called by the ORM
+        in some cases; an erroneous mapper configuration would could lead the
+        ORM to call this on on a :class:`.Table` object.
+
     .. change::
         :tags: bug, ext
         :tickets: 3743

diff --git a/lib/sqlalchemy/orm/mapper.py b/lib/sqlalchemy/orm/mapper.py
index 2a1b9e6190aa836c4c3bc97de9ed81df36e50ebc..534e5e451abdbb4de7aa1f6fb9c47b2557239e8d 100644 (file)
--- a/lib/sqlalchemy/orm/mapper.py
+++ b/lib/sqlalchemy/orm/mapper.py
@@ -1180,7 +1180,6 @@ class Mapper(InspectionAttr):
             instrumentation.unregister_class(self.class_)
 
     def _configure_pks(self):
-
         self.tables = sql_util.find_tables(self.mapped_table)
 
         self._pks_by_table = {}
@@ -1266,7 +1265,6 @@ class Mapper(InspectionAttr):
                 col.table not in self._cols_by_table))
 
     def _configure_properties(self):
-
         # Column and other ClauseElement objects which are mapped
         self.columns = self.c = util.OrderedProperties()
 

diff --git a/lib/sqlalchemy/sql/schema.py b/lib/sqlalchemy/sql/schema.py
index f9c6d05a91e934d6faa382f6c2ffc26ba1186614..25f13113c8a70625cec284e1aebb3ba09473ed6e 100644 (file)
--- a/lib/sqlalchemy/sql/schema.py
+++ b/lib/sqlalchemy/sql/schema.py
@@ -598,6 +598,9 @@ class Table(DialectKWArgs, SchemaItem, TableClause):
     def _init_collections(self):
         pass
 
+    def _reset_exported(self):
+        pass
+
     @util.memoized_property
     def _autoincrement_column(self):
         for col in self.primary_key:

diff --git a/test/sql/test_metadata.py b/test/sql/test_metadata.py
index d3c2325d773ff78ff18759545370d8fa94b6823d..1849fbef787b7ce6cf6e5c3eebe680b0413dbc75 100644 (file)
--- a/test/sql/test_metadata.py
+++ b/test/sql/test_metadata.py
@@ -1229,6 +1229,21 @@ class TableTest(fixtures.TestBase, AssertsCompiledSQL):
             t.info['bar'] = 'zip'
             assert t.info['bar'] == 'zip'
 
+    def test_reset_exported_passes(self):
+
+        m = MetaData()
+
+        t = Table('t', m, Column('foo', Integer))
+        eq_(
+            list(t.c), [t.c.foo]
+        )
+
+        t._reset_exported()
+
+        eq_(
+            list(t.c), [t.c.foo]
+        )
+
     def test_foreign_key_constraints_collection(self):
         metadata = MetaData()
         t1 = Table('foo', metadata, Column('a', Integer))