Merged custom_columns_regress into the custom_columns test package.

1 files changed, 3 insertions, 0 deletions

diff --git a/tests/custom_columns/models.py b/tests/custom_columns/models.py
index df1e743be9..6126183ca9 100644
--- a/tests/custom_columns/models.py
+++ b/tests/custom_columns/models.py
@@ -23,6 +23,7 @@ from django.utils.encoding import python_2_unicode_compatible
 
 @python_2_unicode_compatible
 class Author(models.Model):
+    Author_ID = models.AutoField(primary_key=True, db_column='Author ID')
     first_name = models.CharField(max_length=30, db_column='firstname')
     last_name = models.CharField(max_length=30, db_column='last')
 
@@ -36,8 +37,10 @@ class Author(models.Model):
 
 @python_2_unicode_compatible
 class Article(models.Model):
+    Article_ID = models.AutoField(primary_key=True, db_column='Article ID')
     headline = models.CharField(max_length=100)
     authors = models.ManyToManyField(Author, db_table='my_m2m_table')
+    primary_author = models.ForeignKey(Author, db_column='Author ID', related_name='primary_set', null=True)
 
     def __str__(self):
         return self.headline