Fixed #22738 -- made finer distinctions for when Boolean is not detected on Oracle

Thanks Claude Paroz for partial fix and Simon Charrette for review

2 files changed, 12 insertions, 11 deletions

diff --git a/tests/inspectdb/tests.py b/tests/inspectdb/tests.py
index 8b187191ae..708bae4fb8 100644
--- a/tests/inspectdb/tests.py
+++ b/tests/inspectdb/tests.py
@@ -9,6 +9,8 @@ from django.db import connection
 from django.test import TestCase, skipUnlessDBFeature
 from django.utils.six import PY3, StringIO
 
+from .models import ColumnTypes
+
 
 class InspectDBTestCase(TestCase):
 
@@ -87,19 +89,18 @@ class InspectDBTestCase(TestCase):
         else:
             assertFieldType('big_int_field', "models.IntegerField()")
 
-        if connection.features.introspected_boolean_field_type == 'BooleanField':
-            assertFieldType('bool_field', "models.BooleanField()")
-            if connection.features.can_introspect_null:
-                assertFieldType('null_bool_field', "models.NullBooleanField()")
-            else:
-                assertFieldType('null_bool_field', "models.BooleanField()")
+        bool_field = ColumnTypes._meta.get_field('bool_field')
+        bool_field_type = connection.features.introspected_boolean_field_type(bool_field)
+        assertFieldType('bool_field', "models.{}()".format(bool_field_type))
+        null_bool_field = ColumnTypes._meta.get_field('null_bool_field')
+        null_bool_field_type = connection.features.introspected_boolean_field_type(null_bool_field)
+        if 'BooleanField' in null_bool_field_type:
+            assertFieldType('null_bool_field', "models.{}()".format(null_bool_field_type))
         else:
-            field_type = connection.features.introspected_boolean_field_type
-            assertFieldType('bool_field', "models.{}()".format(field_type))
             if connection.features.can_introspect_null:
-                assertFieldType('null_bool_field', "models.{}(blank=True, null=True)".format(field_type))
+                assertFieldType('null_bool_field', "models.{}(blank=True, null=True)".format(null_bool_field_type))
             else:
-                assertFieldType('null_bool_field', "models.{}()".format(field_type))
+                assertFieldType('null_bool_field', "models.{}()".format(null_bool_field_type))
 
         if connection.features.can_introspect_decimal_field:
             assertFieldType('decimal_field', "models.DecimalField(max_digits=6, decimal_places=1)")
diff --git a/tests/schema/tests.py b/tests/schema/tests.py
index 82377041dc..88290338a1 100644
--- a/tests/schema/tests.py
+++ b/tests/schema/tests.py
@@ -314,7 +314,7 @@ class SchemaTests(TransactionTestCase):
         columns = self.column_classes(Author)
         # BooleanField are stored as TINYINT(1) on MySQL.
         field_type = columns['awesome'][0]
-        self.assertEqual(field_type, connection.features.introspected_boolean_field_type)
+        self.assertEqual(field_type, connection.features.introspected_boolean_field_type(new_field, created_separately=True))
 
     def test_add_field_default_transform(self):
         """