Fixed #18843 -- Replaced more special chars in column names (inspectdb)

Thanks airstrike for the report.

2 files changed, 9 insertions, 3 deletions

diff --git a/tests/regressiontests/inspectdb/models.py b/tests/regressiontests/inspectdb/models.py
index 352053aafe..4a6621402f 100644
--- a/tests/regressiontests/inspectdb/models.py
+++ b/tests/regressiontests/inspectdb/models.py
@@ -20,8 +20,11 @@ class DigitsInColumnName(models.Model):
     leading_digit = models.CharField(max_length=11, db_column='4extra')
     leading_digits = models.CharField(max_length=11, db_column='45extra')
 
-class UnderscoresInColumnName(models.Model):
+class SpecialColumnName(models.Model):
     field = models.IntegerField(db_column='field')
+    # Underscores
     field_field_0 = models.IntegerField(db_column='Field_')
     field_field_1 = models.IntegerField(db_column='Field__')
     field_field_2 = models.IntegerField(db_column='__field')
+    # Other chars
+    prc_x = models.IntegerField(db_column='prc(%) x')
diff --git a/tests/regressiontests/inspectdb/tests.py b/tests/regressiontests/inspectdb/tests.py
index b5647e9e38..484e7f4060 100644
--- a/tests/regressiontests/inspectdb/tests.py
+++ b/tests/regressiontests/inspectdb/tests.py
@@ -59,8 +59,10 @@ class InspectDBTestCase(TestCase):
         self.assertNotIn("    45extra = models.CharField", output, msg=error_message)
         self.assertIn("number_45extra = models.CharField", output)
 
-    def test_underscores_column_name_introspection(self):
-        """Introspection of column names containing underscores (#12460)"""
+    def test_special_column_name_introspection(self):
+        """Introspection of column names containing special characters,
+           unsuitable for Python identifiers
+        """
         out = StringIO()
         call_command('inspectdb', stdout=out)
         output = out.getvalue()
@@ -68,3 +70,4 @@ class InspectDBTestCase(TestCase):
         self.assertIn("field_field = models.IntegerField(db_column='Field_')", output)
         self.assertIn("field_field_0 = models.IntegerField(db_column='Field__')", output)
         self.assertIn("field_field_1 = models.IntegerField(db_column='__field')", output)
+        self.assertIn("prc_x = models.IntegerField(db_column='prc(%) x')", output)