Adding table_name parameter to both HistoricalRecords() and

`register()` functions instead of using `History` inner class.

Author: jleroy

simple_history/__init__.py

@@ -5,7 +5,7 @@
 
 def register(
         model, app=None, manager_name='history', records_class=None,
-        **records_config):
+        table_name=None, **records_config):
     """
     Create historical model for `model` and attach history manager to `model`.
 
@@ -14,6 +14,8 @@ def register(
     manager_name -- class attribute name to use for historical manager
     records_class -- class to use for history relation (defaults to
         HistoricalRecords)
+    table_name -- Custom name for history table (defaults to
+        'APPNAME_historicalMODELNAME')
 
     This method should be used as an alternative to attaching an
     `HistoricalManager` instance directly to `model`.
@@ -24,6 +26,7 @@ def register(
             records_class = models.HistoricalRecords
         records = records_class(**records_config)
         records.manager_name = manager_name
+        records.table_name = table_name
         records.module = app and ("%s.models" % app) or model.__module__
         records.add_extra_methods(model)
         records.finalize(model)

simple_history/models.py

@@ -44,9 +44,10 @@ class HistoricalRecords(object):
     thread = threading.local()
 
     def __init__(self, verbose_name=None, bases=(models.Model,),
-                 user_related_name='+'):
+                 user_related_name='+', table_name=None):
         self.user_set_verbose_name = verbose_name
         self.user_related_name = user_related_name
+        self.table_name = table_name
         try:
             if isinstance(bases, six.string_types):
                 raise TypeError
@@ -117,9 +118,8 @@ def create_history_model(self, model):
         attrs.update(self.get_extra_fields(model, fields))
         # type in python2 wants str as a first argument
         attrs.update(Meta=type(str('Meta'), (), self.get_meta_options(model)))
-        history_options = self.get_history_options(model)
-        if 'db_history_table' in history_options:
-            attrs['Meta'].db_table = history_options['db_history_table']
+        if self.table_name is not None:
+            attrs['Meta'].db_table = self.table_name
         name = 'Historical%s' % model._meta.object_name
         registered_models[model._meta.db_table] = model
         return python_2_unicode_compatible(
@@ -228,27 +228,6 @@ def get_meta_options(self, model):
         meta_fields['verbose_name'] = name
         return meta_fields
 
-    def get_history_options(self, model):
-        """
-        Returns a dictionary of options set to the History inner
-        class of the historical record model.
-        """
-        VALID_OPTIONS = ['db_history_table']
-        if hasattr(model, 'History'):
-            history_options = model.History.__dict__.copy()
-            for key in model.History.__dict__:
-                # Ignore any private attributes that we doesn't care about, like
-                # "__module__" or "__dict__".
-                # NOTE: We can't modify a dictionary's contents while looping
-                # over it, so we loop over the *original* dictionary instead.
-                if key.startswith('_'):
-                    del history_options[key]
-            for option in history_options:
-                if not option in VALID_OPTIONS:
-                    raise TypeError("'class History' got invalid attribute: %s" % (option,))
-            return history_options
-        return {}
-
     def post_save(self, instance, created, **kwargs):
         if not created and hasattr(instance, 'skip_history_when_saving'):
             return

simple_history/tests/models.py

@@ -268,7 +268,10 @@ class City(models.Model):
 class Contact(models.Model):
     name = models.CharField(max_length=30)
     email = models.EmailField(max_length=255, unique=True)
-    history = HistoricalRecords()
+    history = HistoricalRecords(table_name='contacts_history')
+
+class ContactRegister(models.Model):
+    name = models.CharField(max_length=30)
+    email = models.EmailField(max_length=255, unique=True)
 
-    class History:
-        db_history_table = 'contacts_history'
+register(ContactRegister, table_name='contacts_register_history')

simple_history/tests/tests/test_models.py

@@ -19,7 +19,7 @@
     ExternalModel1, ExternalModel3, UnicodeVerboseName, HistoricalChoice,
     HistoricalState, HistoricalCustomFKError, Series, SeriesWork, PollInfo,
     UserAccessorDefault, UserAccessorOverride, Employee, Country, Province,
-    City, Contact
+    City, Contact, ContactRegister
 )
 from ..external.models import ExternalModel2, ExternalModel4
 
@@ -746,9 +746,16 @@ def test_restore_employee(self):
         with self.assertRaises(Employee.DoesNotExist):
             original.manager
 
-class CustomTableNameTest(TestCase):
+class CustomTableNameTest1(TestCase):
     def get_table_name(self, manager):
         return manager.model._meta.db_table
 
     def test_custom_table_name(self):
         self.assertEqual(self.get_table_name(Contact.history), 'contacts_history')
+
+class CustomTableNameTest2(TestCase):
+    def get_table_name(self, manager):
+        return manager.model._meta.db_table
+    
+    def test_custom_table_name(self):
+        self.assertEqual(self.get_table_name(ContactRegister.history), 'contacts_register_history')