3 files changed, 23 insertions, 0 deletions
diff --git a/tests/regressiontests/inspectdb/__init__.py b/tests/regressiontests/inspectdb/__init__.py
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/tests/regressiontests/inspectdb/__init__.py
@@ -0,0 +1 @@
+
diff --git a/tests/regressiontests/inspectdb/models.py b/tests/regressiontests/inspectdb/models.py
new file mode 100644
index 0000000000..fc2548b441
--- /dev/null
+++ b/tests/regressiontests/inspectdb/models.py
@@ -0,0 +1,8 @@
+from django.db import models
+
+
+class People(models.Model):
+    name = models.CharField(max_length=255)
+
+class Message(models.Model):
+    from_field = models.ForeignKey(People, db_column='from_id')
diff --git a/tests/regressiontests/inspectdb/tests.py b/tests/regressiontests/inspectdb/tests.py
new file mode 100644
index 0000000000..a81a97df5e
--- /dev/null
+++ b/tests/regressiontests/inspectdb/tests.py
@@ -0,0 +1,14 @@
+from StringIO import StringIO
+
+from django.core.management import call_command
+from django.test import TestCase
+
+
+class InspectDBTestCase(TestCase):
+    def test_attribute_name_not_python_keyword(self):
+        out = StringIO()
+        call_command('inspectdb', stdout=out)
+        error_message = "inspectdb generated an attribute name which is a python keyword"
+        self.assertFalse("from = models.ForeignKey(InspectdbPeople)" in out.getvalue(), msg=error_message)
+        self.assertTrue("from_field = models.ForeignKey(InspectdbPeople)" in out.getvalue())
+        out.close()