Fixed #22848: Ignore no-migrations errors during makemigrations only (2b79be2b) · Commits · Dom Sekotill / django

django/core/management/commands/makemigrations.py

+1 −1

Original line number	Diff line number	Diff line
		@@ -49,7 +49,7 @@ class Command(BaseCommand):

		# Load the current graph state. Pass in None for the connection so
		# the loader doesn't try to resolve replaced migrations from DB.
		loader = MigrationLoader(None)
		loader = MigrationLoader(None, ignore_no_migrations=True)

		# Before anything else, see if there's conflicting apps and drop out
		# hard if there are any and they don't want to merge

+6 −2

Original line number	Diff line number	Diff line
		@@ -39,10 +39,11 @@ class MigrationLoader(object):
		in memory.
		"""

		def __init__(self, connection, load=True):
		def __init__(self, connection, load=True, ignore_no_migrations=False):
		self.connection = connection
		self.disk_migrations = None
		self.applied_migrations = None
		self.ignore_no_migrations = ignore_no_migrations
		if load:
		self.build_graph()

		@@ -156,6 +157,9 @@ class MigrationLoader(object):
		else:
		return list(self.graph.root_nodes(key[0]))[-1]
		except IndexError:
		if self.ignore_no_migrations:
		return None
		else:
		raise ValueError("Dependency on app with no migrations: %s" % key[0])
		raise ValueError("Dependency on unknown app: %s" % key[0])