Ticket #9609: mysql_compat.diff

django/forms/fields.py

@@ -582 +582 @@
-        # Explicitly check for the string 'False', which is what a hidden field
-        # will submit for False. Because bool("True") == True, we don't need to
-        # handle that explicitly.
-== 'False'
+in ('False', '0')
-            value = False
-        else:
-            value = bool(value)
@@ -601 +601 @@
-    def clean(self, value):
-        """
-        Explicitly checks for the string 'True' and 'False', which is what a
-Unlike the
-Booleanfield we also need to check for True, because we are not using
-the bool() function
+Also checks for '1' and '0'
+for MySQL compatibility. Unlike the Booleanfield we also need to check
+for True, because we are not using the bool() function.
-        """
-
+, '1'
-            return True
-
+, '0'
-            return False
-        else:
-            return None

tests/regressiontests/forms/fields.py

@@ -1019 +1019 @@
-True
->>> f.clean(0)
-False
+>>> f.clean('1')
+True
+>>> f.clean('0')
+False
->>> f.clean('Django rocks')
-True
-
@@ -1143 +1147 @@
->>> f.clean(False)
-False
->>> f.clean(None)
+>>> f.clean('0')
+False
->>> f.clean('1')
+True
->>> f.clean('2')
->>> f.clean('3')
->>> f.clean('hello')
@@ -1162 +1169 @@
->>> f.cleaned_data['hidden_nullbool2']
-False
-
+# Make sure we're compatible with MySQL, which uses 0 and 1 for its boolean
+# values.
+>>> NULLBOOL_CHOICES = (('1', 'Yes'), ('0', 'No'), ('', 'Unknown'))
+>>> class MySQLNullBooleanForm(Form):
+...     nullbool0 = NullBooleanField(widget=RadioSelect(choices=NULLBOOL_CHOICES))
+...     nullbool1 = NullBooleanField(widget=RadioSelect(choices=NULLBOOL_CHOICES))
+...     nullbool2 = NullBooleanField(widget=RadioSelect(choices=NULLBOOL_CHOICES))
+>>> f = MySQLNullBooleanForm({ 'nullbool0': '1', 'nullbool1': '0', 'nullbool2': '' })
+>>> f.full_clean()
+>>> f.cleaned_data['nullbool0']
+True
+>>> f.cleaned_data['nullbool1']
+False
+>>> f.cleaned_data['nullbool2']
+
-# MultipleChoiceField #########################################################
-
->>> f = MultipleChoiceField(choices=[('1', 'One'), ('2', 'Two')])