Revert "fix model + tests for foreign keys (issue #38)"

This reverts commit febf43b.

simple_history/models.py

@@ -1,6 +1,5 @@
 import copy
 from django.db import models
-from django.db.models.loading import get_model
 from django.conf import settings
 from django.contrib import admin
 from django.utils import importlib
@@ -85,21 +84,10 @@ def copy_fields(self, model):
                 field.__class__ = models.TextField
 
             if isinstance(field, models.ForeignKey):
-                rel_model  = field.rel.to
-                field.name = field.get_attname()
-                if isinstance(field.rel.to, basestring):
-                    rel_model = get_model(*field.rel.to.split('.',1))
-
-                if isinstance(rel_model._meta.pk, models.fields.AutoField):
-                    field.__class__ = models.IntegerField
-                else:
-                    rel_field = rel_model._meta.pk
-                    field.__class__ = type(rel_field)
-                    field.max_length = rel_field.max_length
+                field.__class__ = models.IntegerField
                 #ughhhh. open to suggestions here
                 field.rel = None
                 field.related = None
-                field.related_name = None
                 field.related_query_name = None
                 field.null = True
                 field.blank = True
@@ -118,6 +106,8 @@ def copy_fields(self, model):
                 field._unique = False
                 field.db_index = True
                 field.serialize = True
+            if fk:
+                field.name = field.name + "_id"
             fields[field.name] = field
 
         return fields

simple_history/tests/tests.py

@@ -177,8 +177,8 @@ def test_non_default_primary_key_save(self):
         library.save()
         library.book = None
         library.save()
-        self.assertEqual([l.book_id for l in library.history.all()],
-                         [None, book2.isbn, book1.isbn])
+        self.assertEqual([l.book for l in library.history.all()],
+                         [None, book2, book1])
 
     def test_string_defined_foreign_key_save(self):
         library1 = Library.objects.create()