Merge eee880b into 1156921

runtests.py

@@ -22,7 +22,8 @@
             'django.contrib.sessions',
             'django.contrib.admin',
             'simple_history',
-            'simple_history.tests'
+            'simple_history.tests',
+            'simple_history.tests.external'
         ),
         DATABASES={
             'default': {

simple_history/models.py

@@ -44,6 +44,14 @@ def create_history_model(self, model):
         """
         attrs = {'__module__': self.module}
 
+        app_module = models.get_app(model._meta.app_label)
+        if model.__module__ != self.module:
+            # registered under different app
+            attrs['__module__'] = self.module
+        elif app_module.__name__ != self.module:
+            # has meta options with app_label
+            attrs['__module__'] = app_module.__name__
+
         fields = self.copy_fields(model)
         attrs.update(fields)
         attrs.update(self.get_extra_fields(model, fields))
@@ -135,9 +143,10 @@ def get_meta_options(self, model):
         Returns a dictionary of fields that will be added to
         the Meta inner class of the historical record model.
         """
-        return {
+        options = {
             'ordering': ('-history_date', '-history_id'),
         }
+        return options
 
     def post_save(self, instance, created, **kwargs):
         if not created and hasattr(instance, 'skip_history_when_saving'):

simple_history/tests/external/models.py

@@ -0,0 +1,14 @@
+
+from django.db import models
+from simple_history.models import HistoricalRecords
+from simple_history import register
+
+class ExternalModel2(models.Model):
+    name = models.CharField(max_length=100)
+    history = HistoricalRecords()
+
+class ExternalModel4(models.Model):
+    name = models.CharField(max_length=100)
+
+register(ExternalModel4, app='simple_history.tests',
+    manager_name='histories')

simple_history/tests/models.py

@@ -58,3 +58,14 @@ def _history_user(self):
 register(User, app='simple_history.tests', manager_name='histories')
 
 
+class ExternalModel1(models.Model):
+    name = models.CharField(max_length=100)
+    history = HistoricalRecords()
+    class Meta:
+        app_label = 'external'
+
+class ExternalModel3(models.Model):
+    name = models.CharField(max_length=100)
+
+register(ExternalModel3, app='simple_history.tests.external',
+    manager_name='histories')

simple_history/tests/tests.py

@@ -7,6 +7,8 @@
 from django.contrib.auth.models import User
 
 from .models import Poll, Choice, Restaurant, Person, FileModel, Document
+from .models import ExternalModel1, ExternalModel3
+from simple_history.tests.external.models import ExternalModel2, ExternalModel4
 
 today = datetime(2021, 1, 1, 10, 0)
 tomorrow = today + timedelta(days=1)
@@ -193,6 +195,32 @@ def test_register_separate_app(self):
         self.assertEqual(len(User.histories.all()), 1)
         self.assertEqual(len(user.histories.all()), 1)
 
+class AppLabelTest(TestCase):
+    def get_table_name(self, manager):
+        return manager.model._meta.db_table
+
+    def test_explicit_app_label(self):
+        self.assertEqual(self.get_table_name(ExternalModel1.objects),
+            'external_externalmodel1')
+        self.assertEqual(self.get_table_name(ExternalModel1.history),
+            'external_historicalexternalmodel1')
+
+    def test_default_app_label(self):
+        self.assertEqual(self.get_table_name(ExternalModel2.objects),
+            'external_externalmodel2')
+        self.assertEqual(self.get_table_name(ExternalModel2.history),
+            'external_historicalexternalmodel2')
+
+    def test_register_app_label(self):
+        self.assertEqual(self.get_table_name(ExternalModel3.objects),
+            'tests_externalmodel3')
+        self.assertEqual(self.get_table_name(ExternalModel3.histories),
+            'external_historicalexternalmodel3')
+        self.assertEqual(self.get_table_name(ExternalModel4.objects),
+            'external_externalmodel4')
+        self.assertEqual(self.get_table_name(ExternalModel4.histories),
+            'tests_historicalexternalmodel4')
+
 
 class HistoryManagerTest(TestCase):
     def test_most_recent(self):