Commit d0b35369 authored by Andrew Godwin's avatar Andrew Godwin
Browse files

More schema test fixing

parent 9313dea7

django/core/management/commands/syncdb.py

+3 −1
Original line number Diff line number Diff line
@@ -71,9 +71,11 @@ class Command(NoArgsCommand): 
        def model_installed(model):

            opts = model._meta

            converter = connection.introspection.table_name_converter

            return not ((converter(opts.db_table) in tables) or

            # Note that if a model is unmanaged we short-circuit and never try to install it

            return opts.managed and not ((converter(opts.db_table) in tables) or

                (opts.auto_created and converter(opts.auto_created._meta.db_table) in tables))





        manifest = SortedDict(

            (app_name, list(filter(model_installed, model_list)))

            for app_name, model_list in all_models

django/db/models/loading.py

+2 −1
Original line number Diff line number Diff line
@@ -252,13 +252,14 @@ class AppCache(object): 
        return {

            "app_store": SortedDict(self.app_store.items()),

            "app_labels": dict(self.app_labels.items()),

            "app_models": SortedDict(self.app_models.items()),

            "app_models": SortedDict((k, SortedDict(v.items())) for k, v in self.app_models.items()),

            "app_errors": dict(self.app_errors.items()),

        }



    def restore_state(self, state):

        """

        Restores the AppCache to a previous state from save_state.

        Note that the state is used by reference, not copied in.

        """

        self.app_store = state['app_store']

        self.app_labels = state['app_labels']

tests/modeltests/schema/tests.py

+58 −50
Original line number Diff line number Diff line
@@ -31,20 +31,18 @@ class SchemaTests(TestCase): 
        # The unmanaged models need to be removed after the test in order to

        # prevent bad interactions with the flush operation in other tests.

        self.cache_state = cache.save_state()

        cache.load_app("modeltests.schema")

        for model in self.models:

            model._meta.managed = True



    def tearDown(self):

        # Rollback anything that may have happened

        connection.rollback()

        # Delete any tables made for our models

        self.delete_tables()

        # Rollback anything that may have happened

        connection.rollback()

        connection.leave_transaction_management()

        # Unhook our models

        for model in self.models:

            model._meta.managed = False

        if "schema" in self.cache_state['app_labels']:

            del self.cache_state['app_labels']['schema']

        cache.restore_state(self.cache_state)



    def delete_tables(self):
@@ -280,6 +278,7 @@ class SchemaTests(TestCase): 
        # Create an M2M field

        new_field = ManyToManyField("schema.Tag", related_name="authors")

        new_field.contribute_to_class(AuthorWithM2M, "tags")

        try:

            # Ensure there's no m2m table there

            self.assertRaises(DatabaseError, self.column_classes, new_field.rel.through)

            connection.rollback()
@@ -305,6 +304,10 @@ class SchemaTests(TestCase): 
            # Ensure there's no m2m table there

            self.assertRaises(DatabaseError, self.column_classes, new_field.rel.through)

            connection.rollback()

        finally:

            # Cleanup model states

            AuthorWithM2M._meta.local_many_to_many.remove(new_field)

            del AuthorWithM2M._meta._m2m_cache



    def test_m2m_repoint(self):

        """
@@ -330,6 +333,7 @@ class SchemaTests(TestCase): 
        # Repoint the M2M

        new_field = ManyToManyField(UniqueTest)

        new_field.contribute_to_class(BookWithM2M, "uniques")

        try:

            editor = connection.schema_editor()

            editor.start()

            editor.alter_field(
@@ -350,6 +354,10 @@ class SchemaTests(TestCase): 
                        break

                else:

                    self.fail("No FK constraint for tag_id found")

        finally:

            # Cleanup model states

            BookWithM2M._meta.local_many_to_many.remove(new_field)

            del BookWithM2M._meta._m2m_cache



    @skipUnless(connection.features.supports_check_constraints, "No check constraints")

    def test_check_constraints(self):