Ticket #19341: 19341-1.diff

django/core/management/commands/inspectdb.py

@@ -108 +108 @@
                 # Add 'null' and 'blank', if the 'null_ok' flag was present in the
                 # table description.
                 if row[6]: # If it's NULL...
-                    extra_params['blank'] = True
-                    if not field_type in ('TextField(', 'CharField('):
-                        extra_params['null'] = True
+                    if field_type == 'BooleanField(':
+                        field_type = 'NullBooleanField('
+                    else:
+                        extra_params['blank'] = True
+                        if not field_type in ('TextField(', 'CharField('):
+                            extra_params['null'] = True
 
                 field_desc = '%s = models.%s' % (att_name, field_type)
                 if extra_params:

django/db/backends/sqlite3/introspection.py

@@ -45 +45 @@
                 return ('CharField', {'max_length': size})
             raise KeyError
 
+    def values(self):
+        return self.base_data_types_reverse.values()
+
+
 class DatabaseIntrospection(BaseDatabaseIntrospection):
     data_types_reverse = FlexibleFieldLookupDict()
 

tests/regressiontests/inspectdb/models.py

@@ -3 +3 @@
 
 class People(models.Model):
     name = models.CharField(max_length=255)
+    is_admin = models.BooleanField()
+    has_family = models.NullBooleanField()
 
 class Message(models.Model):
     from_field = models.ForeignKey(People, db_column='from_id')

tests/regressiontests/inspectdb/tests.py

@@ -3 +3 @@
 from django.core.management import call_command
 from django.db import connection
 from django.test import TestCase, skipUnlessDBFeature
+from django.test.testcases import _deferredSkip
 from django.utils.six import StringIO
 
 
+def skipUnlessIntrospectBoolean():
+    return _deferredSkip(
+        lambda: 'BooleanField' not in connection.introspection.data_types_reverse.values(),
+        "Database cannot introspect boolean fields")
+
+
 class InspectDBTestCase(TestCase):
 
+    @skipUnlessIntrospectBoolean()
+    def test_boolean_inspection(self):
+        out = StringIO()
+        # Lets limit the introspection to the test target table
+        call_command('inspectdb',
+                     table_name_filter=lambda tn:tn=='inspectdb_people',
+                     stdout=out)
+        output = out.getvalue()
+        self.assertIn("is_admin = models.BooleanField()", output)
+        self.assertIn("has_family = models.NullBooleanField()", output)
+
     def test_stealth_table_name_filter_option(self):
         out = StringIO()
         # Lets limit the introspection to tables created for models of this