Merge remote-tracking branch 'sc/master' into django19_110_111-compat…

…ibility
swisscom · Sep 18, 2017 · cd8a416 · cd8a416
2 parents 6531c3a + c9c9bf0
commit cd8a416
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -31,7 +31,7 @@ before_script:
 
 # Run tests
 script:
-  tox -e $TOX_ENV
+  tox
 
 # Run coveralls
 after_success:

diff --git a/docs/doc/historization_with_cleanerversion.rst b/docs/doc/historization_with_cleanerversion.rst
@@ -518,6 +518,12 @@ Versioning an object in a ManyToMany relationship requires 3 steps to be done, i
   .. image:: ../images/clone_m2m_item_3.png
         :align: center
 
+The records in ManyToMany intermediary tables are versioned: they have ``version_birth_date``,
+``version_start_date`` and ``version_end_date`` columns.  The ForeignKey columns in ManyToMany
+Intermediary tables store the ``id`` of the referenced records.  Note that this is different than
+the VersionedForeignKeys in Versionable models, which store the ``identity`` of the referenced objects.
+This is transparent in normal usage, but can be important to keep in mind when you need to write a query
+that directly references the ForeignKey columns.
 
 Removing objects from a versioned M2M relationship
 --------------------------------------------------

diff --git a/versions_tests/tests/test_models.py b/versions_tests/tests/test_models.py
@@ -2321,8 +2321,7 @@ def test_reverse_fk_prefetch_queryset_with_historic_versions(self):
             team = [t for t in current_city.prefetched_teams if t.name == 'team1.v2'][0]
             self.assertSetEqual({'pl1.v2', 'pl2.v1'}, {p.name for p in team.prefetched_players})
 
-            # When a different time is specified for the prefetch queryset than for the base queryset:
-
+        # When a different time is specified for the prefetch queryset than for the base queryset:
         with self.assertRaises(ValueError):
             _ = City.objects.current.filter(name='city.v2').prefetch_related(
                 Prefetch(