Ticket #9717: 9717.flush_command.diff

django/django/core/management/commands/flush.py

@@ -27 +27 @@
             except ImportError:
                 pass
 
-        sql_list = sql_flush(self.style, only_django=True)
+        sql_list = sql_flush(self.style, only_django=True, only_existing_django=True)
 
         if interactive:
             confirm = raw_input("""You have requested a flush of the database.

django/django/core/management/sql.py

@@ -116 +116 @@
     "Returns a list of the DROP TABLE SQL, then the CREATE TABLE SQL, for the given module."
     return sql_delete(app, style) + sql_all(app, style)
 
-def sql_flush(style, only_django=False):
+def sql_flush(style, only_django=False, only_existing_django=False):
     """
     Returns a list of the SQL statements used to flush the database.
     
-    If only_django is True, then only table names that have associated Django
+    * If only_django is True, then only table names that have associated Django
     models and are in INSTALLED_APPS will be included.
+    * only_existing_django is only considered if only_django is True. If 
+    only_existing_django is True, then only table names which *actually exist*
+    in database will be included.
     """
     from django.db import connection
     if only_django:
-        tables = connection.introspection.django_table_names()
+        tables = connection.introspection.django_table_names(only_existing=only_existing_django)
     else:
         tables = connection.introspection.table_names()
     statements = connection.ops.sql_flush(style, tables, connection.introspection.sequence_list())