Commit e9d12bae authored by Shai Berger's avatar Shai Berger
Browse files

Made Oracle introspect FloatFields correctly 

Broke InspectDBTestCase.test_field_types in two:
- a test_number_field_types, which now passes on Oracle too
- a test_field_types, for all non-numeric fields, which is still expected to fail

Also made some pep8 fixes in the tests file. Refs #19884

Thanks Tim Graham for review.
parent 1ed02843

django/db/backends/oracle/introspection.py

+13 −10
Original line number Diff line number Diff line
@@ -33,16 +33,19 @@ class DatabaseIntrospection(BaseDatabaseIntrospection): 


    def get_field_type(self, data_type, description):

        # If it's a NUMBER with scale == 0, consider it an IntegerField

        if data_type == cx_Oracle.NUMBER and description[5] == 0:

            if description[4] > 11:

        if data_type == cx_Oracle.NUMBER:

            precision, scale = description[4:6]

            if scale == 0:

                if precision > 11:

                    return 'BigIntegerField'

            elif description[4]==1:

                elif precision == 1:

                    return 'BooleanField'

                else:

                    return 'IntegerField'

        else:

            return super(DatabaseIntrospection, self).get_field_type(

                data_type, description)

            elif scale == -127:

                return 'FloatField'



        return super(DatabaseIntrospection, self).get_field_type(data_type, description)



    def get_table_list(self, cursor):

        "Returns a list of table names in the current database."

tests/inspectdb/tests.py

+39 −27
Original line number Diff line number Diff line
@@ -30,10 +30,8 @@ class InspectDBTestCase(TestCase): 
        # inspected

        self.assertNotIn("class DjangoContentType(models.Model):", out.getvalue(), msg=error_message)



    # Inspecting oracle DB doesn't produce correct results, see #19884

    @expectedFailureOnOracle

    def test_field_types(self):

        """Test introspection of various Django field types"""

    def make_field_type_asserter(self):

        """Call inspectdb and return a function to validate a field type in its output"""

        out = StringIO()

        call_command('inspectdb',

                     table_name_filter=lambda tn: tn.startswith('inspectdb_columntypes'),
@@ -44,6 +42,37 @@ class InspectDBTestCase(TestCase): 
            out_def = re.search(r'^\s*%s = (models.*)$' % name, output, re.MULTILINE).groups()[0]

            self.assertEqual(definition, out_def)



        return assertFieldType



    # Inspecting oracle DB doesn't produce correct results, see #19884

    @expectedFailureOnOracle

    def test_field_types(self):

        """Test introspection of various Django field types"""

        assertFieldType = self.make_field_type_asserter()



        assertFieldType('char_field', "models.CharField(max_length=10)")

        assertFieldType('comma_separated_int_field', "models.CharField(max_length=99)")

        assertFieldType('date_field', "models.DateField()")

        assertFieldType('date_time_field', "models.DateTimeField()")

        assertFieldType('email_field', "models.CharField(max_length=75)")

        assertFieldType('file_field', "models.CharField(max_length=100)")

        assertFieldType('file_path_field', "models.CharField(max_length=100)")

        if connection.vendor == 'postgresql':

            # Only PostgreSQL has a specific type

            assertFieldType('ip_address_field', "models.GenericIPAddressField()")

            assertFieldType('gen_ip_adress_field', "models.GenericIPAddressField()")

        else:

            assertFieldType('ip_address_field', "models.CharField(max_length=15)")

            assertFieldType('gen_ip_adress_field', "models.CharField(max_length=39)")

        assertFieldType('slug_field', "models.CharField(max_length=50)")

        assertFieldType('text_field', "models.TextField()")

        assertFieldType('time_field', "models.TimeField()")

        assertFieldType('url_field', "models.CharField(max_length=200)")



    def test_number_field_types(self):

        """Test introspection of various Django field types"""

        assertFieldType = self.make_field_type_asserter()



        if not connection.features.can_introspect_autofield:

            assertFieldType('id', "models.IntegerField(primary_key=True)  # AutoField?")

        assertFieldType('big_int_field', "models.BigIntegerField()")
@@ -54,28 +83,15 @@ class InspectDBTestCase(TestCase): 
        else:

            assertFieldType('bool_field', "models.BooleanField()")

            assertFieldType('null_bool_field', "models.NullBooleanField()")

        assertFieldType('char_field', "models.CharField(max_length=10)")

        assertFieldType('comma_separated_int_field', "models.CharField(max_length=99)")

        assertFieldType('date_field', "models.DateField()")

        assertFieldType('date_time_field', "models.DateTimeField()")

        if connection.vendor == 'sqlite':

            # Guessed arguments, see #5014

            assertFieldType('decimal_field', "models.DecimalField(max_digits=10, decimal_places=5)  "

                "# max_digits and decimal_places have been guessed, as this database handles decimal fields as float")

                                             "# max_digits and decimal_places have been guessed, "

                                             "as this database handles decimal fields as float")

        else:

            assertFieldType('decimal_field', "models.DecimalField(max_digits=6, decimal_places=1)")

        assertFieldType('email_field', "models.CharField(max_length=75)")

        assertFieldType('file_field', "models.CharField(max_length=100)")

        assertFieldType('file_path_field', "models.CharField(max_length=100)")

        assertFieldType('float_field', "models.FloatField()")

        assertFieldType('int_field', "models.IntegerField()")

        if connection.vendor == 'postgresql':

            # Only PostgreSQL has a specific type

            assertFieldType('ip_address_field', "models.GenericIPAddressField()")

            assertFieldType('gen_ip_adress_field', "models.GenericIPAddressField()")

        else:

            assertFieldType('ip_address_field', "models.CharField(max_length=15)")

            assertFieldType('gen_ip_adress_field', "models.CharField(max_length=39)")

        if connection.vendor == 'sqlite':

            assertFieldType('pos_int_field', "models.PositiveIntegerField()")

            assertFieldType('pos_small_int_field', "models.PositiveSmallIntegerField()")
@@ -86,14 +102,10 @@ class InspectDBTestCase(TestCase): 
                assertFieldType('pos_small_int_field', "models.SmallIntegerField()")

            else:

                assertFieldType('pos_small_int_field', "models.IntegerField()")

        assertFieldType('slug_field', "models.CharField(max_length=50)")

        if connection.vendor in ('sqlite', 'postgresql'):

            assertFieldType('small_int_field', "models.SmallIntegerField()")

        else:

            assertFieldType('small_int_field', "models.IntegerField()")

        assertFieldType('text_field', "models.TextField()")

        assertFieldType('time_field', "models.TimeField()")

        assertFieldType('url_field', "models.CharField(max_length=200)")



    @skipUnlessDBFeature('can_introspect_foreign_keys')

    def test_attribute_name_not_python_keyword(self):