Merge pull request #169 from fuhrysteve/dont_include_excluded_relatio…

…nships

don't include excluded properties

.gitignore

@@ -34,3 +34,9 @@ nosetests.xml
 .mr.developer.cfg
 .project
 .pydevproject
+
+# mypy
+.mypy_cache/
+
+# Unit test / coverage reports
+.cache

.travis.yml

@@ -15,9 +15,9 @@ before_script:
 language: python
 python:
   - 2.7
-  - 3.3
   - 3.4
   - 3.5
+  - 3.6
 install:
   - pip install -e  ".[test]"
 script:

setup.py

@@ -77,9 +77,9 @@ def get_version():
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
         'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
         'Topic :: Internet :: WWW/HTTP :: Dynamic Content',
         'Topic :: Software Development :: Libraries :: Python Modules'
     ]

sqlalchemy_continuum/relationship_builder.py

@@ -346,7 +346,10 @@ def __call__(self):
         except ClassNotVersioned:
             self.remote_cls = self.property.mapper.class_
 
-        if self.property.secondary is not None and not self.property.viewonly:
+        if (self.property.secondary is not None and
+                not self.property.viewonly and
+                not self.manager.is_excluded_property(
+                    self.model, self.property.key)):
             self.build_association_version_tables()
 
             # store remote cls to association table column pairs

tests/test_column_inclusion_and_exclusion.py

@@ -53,3 +53,52 @@ class TextItem(self.Model):
             content = sa.Column('_content', sa.UnicodeText)
 
         self.TextItem = TextItem
+
+
+class TestColumnExclusionWithRelationship(TestCase):
+    def create_models(self):
+
+        class Word(self.Model):
+            __tablename__ = 'word'
+            id = sa.Column(sa.Integer, autoincrement=True, primary_key=True)
+            word = sa.Column(sa.Unicode(255))
+
+        class TextItemWord(self.Model):
+            __tablename__ = 'text_item_word'
+            id = sa.Column(sa.Integer, autoincrement=True, primary_key=True)
+            text_item_id = sa.Column(sa.Integer, sa.ForeignKey('text_item.id'), nullable=False)
+            word_id = sa.Column(sa.Integer, sa.ForeignKey('word.id'), nullable=False)
+
+        class TextItem(self.Model):
+            __tablename__ = 'text_item'
+            __versioned__ = {
+                'exclude': ['content']
+            }
+
+            id = sa.Column(sa.Integer, autoincrement=True, primary_key=True)
+            name = sa.Column(sa.Unicode(255))
+            content = sa.orm.relationship(Word, secondary='text_item_word')
+
+        self.TextItem = TextItem
+        self.Word = Word
+
+    def test_excluded_columns_not_included_in_version_class(self):
+        cls = version_class(self.TextItem)
+        manager = cls._sa_class_manager
+        assert 'content' not in manager.keys()
+
+    def test_versioning_with_column_exclusion(self):
+        item = self.TextItem(name=u'Some textitem',
+                             content=[self.Word(word=u'bird')])
+        self.session.add(item)
+        self.session.commit()
+
+        assert item.versions[0].name == u'Some textitem'
+
+    def test_does_not_create_record_if_only_excluded_column_updated(self):
+        item = self.TextItem(name=u'Some textitem')
+        self.session.add(item)
+        self.session.commit()
+        item.content.append(self.Word(word=u'Some content'))
+        self.session.commit()
+        assert item.versions.count() == 1