2 files changed, 19 insertions, 0 deletions
diff --git a/tests/regressiontests/inspectdb/models.py b/tests/regressiontests/inspectdb/models.py
index fac47aa34f..9f815855b6 100644
--- a/tests/regressiontests/inspectdb/models.py
+++ b/tests/regressiontests/inspectdb/models.py
@@ -15,3 +15,7 @@ class PeopleMoreData(models.Model):
     people_unique = models.ForeignKey(People, unique=True)
     license = models.CharField(max_length=255)
 
+class DigitsInColumnName(models.Model):
+    all_digits = models.CharField(max_length=11, db_column='123')
+    leading_digit = models.CharField(max_length=11, db_column='4extra')
+    leading_digits = models.CharField(max_length=11, db_column='45extra')
diff --git a/tests/regressiontests/inspectdb/tests.py b/tests/regressiontests/inspectdb/tests.py
index e2eced576d..944eb64568 100644
--- a/tests/regressiontests/inspectdb/tests.py
+++ b/tests/regressiontests/inspectdb/tests.py
@@ -18,3 +18,18 @@ class InspectDBTestCase(TestCase):
         self.assertIn("people_unique = models.ForeignKey(InspectdbPeople, unique=True)",
             out.getvalue())
         out.close()
+
+    def test_digits_column_name_introspection(self):
+        """Introspection of column names consist/start with digits (#16536/#17676)"""
+        out = StringIO()
+        call_command('inspectdb', stdout=out)
+        error_message = "inspectdb generated a model field name which is a number"
+        self.assertNotIn("    123 = models.CharField", out.getvalue(), msg=error_message)
+        self.assertIn("number_123 = models.CharField", out.getvalue())
+
+        error_message = "inspectdb generated a model field name which starts with a digit"
+        self.assertNotIn("    4extra = models.CharField", out.getvalue(), msg=error_message)
+        self.assertIn("number_4extra = models.CharField", out.getvalue())
+
+        self.assertNotIn("    45extra = models.CharField", out.getvalue(), msg=error_message)
+        self.assertIn("number_45extra = models.CharField", out.getvalue())