From 7524801bb73457bf2b2e21d2bcf701ef98bdab61 Mon Sep 17 00:00:00 2001
From: Jan-Jelle Kester <janjelle@jjkester.nl>
Date: Sat, 23 Jan 2016 21:13:43 +0100
Subject: [PATCH 1/4] Remove unwanted blank line

---
 src/auditlog/models.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/auditlog/models.py b/src/auditlog/models.py
index 43e8904..78223d0 100644
--- a/src/auditlog/models.py
+++ b/src/auditlog/models.py
@@ -97,7 +97,6 @@ class LogEntryManager(models.Manager):
         else:
             return self.filter(content_type=content_type).filter(Q(object_pk__in=primary_keys)).distinct()
 
-
     def get_for_model(self, model):
         """
         Get log entries for all objects of a specified type.

From 82aca6b352de3133f1fba454d82e1a20f3da2436 Mon Sep 17 00:00:00 2001
From: Jan-Jelle Kester <janjelle@jjkester.nl>
Date: Sat, 23 Jan 2016 21:41:19 +0100
Subject: [PATCH 2/4] Make Django 1.9+ accept the settings file

---
 src/auditlog_tests/test_settings.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/auditlog_tests/test_settings.py b/src/auditlog_tests/test_settings.py
index fa2826f..13ae141 100644
--- a/src/auditlog_tests/test_settings.py
+++ b/src/auditlog_tests/test_settings.py
@@ -22,3 +22,5 @@ DATABASES = {
         'NAME': 'auditlog_tests.db',
     }
 }
+
+ROOT_URLCONF = []

From 091dccf6a7259b22639e83d9f5766482d13659e4 Mon Sep 17 00:00:00 2001
From: Jan-Jelle Kester <janjelle@jjkester.nl>
Date: Sat, 23 Jan 2016 22:38:02 +0100
Subject: [PATCH 3/4] Proposed fix for issue #45

---
 .../migrations/0006_object_pk_index.py        |  2 +-
 .../migrations/0007_object_pk_type.py         | 19 +++++++++++++++++++
 src/auditlog/models.py                        |  2 +-
 3 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 src/auditlog/migrations/0007_object_pk_type.py

diff --git a/src/auditlog/migrations/0006_object_pk_index.py b/src/auditlog/migrations/0006_object_pk_index.py
index 3c29aa7..90402b0 100644
--- a/src/auditlog/migrations/0006_object_pk_index.py
+++ b/src/auditlog/migrations/0006_object_pk_index.py
@@ -14,6 +14,6 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='logentry',
             name='object_pk',
-            field=models.TextField(verbose_name='object pk', db_index=True),
+            field=models.CharField(verbose_name='object pk', max_length=256, db_index=True),
         ),
     ]
diff --git a/src/auditlog/migrations/0007_object_pk_type.py b/src/auditlog/migrations/0007_object_pk_type.py
new file mode 100644
index 0000000..3a724e8
--- /dev/null
+++ b/src/auditlog/migrations/0007_object_pk_type.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('auditlog', '0006_object_pk_index'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='logentry',
+            name='object_pk',
+            field=models.CharField(verbose_name='object pk', max_length=255, db_index=True),
+        ),
+    ]
diff --git a/src/auditlog/models.py b/src/auditlog/models.py
index 78223d0..1a16aae 100644
--- a/src/auditlog/models.py
+++ b/src/auditlog/models.py
@@ -163,7 +163,7 @@ class LogEntry(models.Model):
         )
 
     content_type = models.ForeignKey('contenttypes.ContentType', on_delete=models.CASCADE, related_name='+', verbose_name=_("content type"))
-    object_pk = models.TextField(db_index=True, verbose_name=_("object pk"))
+    object_pk = models.CharField(db_index=True, max_length=255, verbose_name=_("object pk"))
     object_id = models.BigIntegerField(blank=True, db_index=True, null=True, verbose_name=_("object id"))
     object_repr = models.TextField(verbose_name=_("object representation"))
     action = models.PositiveSmallIntegerField(choices=Action.choices, verbose_name=_("action"))

From de355bc25cc27655df97076fbea44a40063bd5db Mon Sep 17 00:00:00 2001
From: Jan-Jelle Kester <janjelle@jjkester.nl>
Date: Sat, 23 Jan 2016 22:44:38 +0100
Subject: [PATCH 4/4] Let Travis use latest Django 1.9 release

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 95e8568..0a09e25 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ python:
 env:
   - DJANGO_VERSION=1.7.*
   - DJANGO_VERSION=1.8.*
-  - DJANGO_VERSION=1.9a1
+  - DJANGO_VERSION=1.9.*
 install:
   - "pip install -r requirements.txt"
   - "pip install Django==$DJANGO_VERSION"