Ticket #1398: CASCADEOption.diff

core/management.py

@@ -159 +159 @@
             # The table doesn't exist, so it doesn't need to be dropped.
             db.db.rollback()
         else:
-            output.append("DROP TABLE %s;" % db.db.quote_name(klass._meta.db_table))
+            if CASCADE:
+                output.append("DROP TABLE %s CASCADE;" % db.db.quote_name(klass._meta.db_table))
+            else:
+                output.append("DROP TABLE %s;" % db.db.quote_name(klass._meta.db_table))
 
     # Output DROP TABLE statements for many-to-many tables.
     for klass in mod._MODELS:
@@ -171 +174 @@
             except:
                 db.db.rollback()
             else:
-                output.append("DROP TABLE %s;" % db.db.quote_name(f.get_m2m_db_table(opts)))
+                if CASCADE:
+                    output.append("DROP TABLE %s CASCADE;" % db.db.quote_name(klass._meta.db_table))
+                else:
+                    output.append("DROP TABLE %s;" % db.db.quote_name(f.get_m2m_db_table(opts)))
 
     app_label = mod._MODELS[0]._meta.app_label
 
@@ -872 +878 @@
     'validate': validate,
 }
 
+CASCADE = False
+
 NO_SQL_TRANSACTION = ('adminindex', 'createcachetable', 'dbcheck', 'install', 'installperms', 'sqlindexes')
 
 class DjangoOptionParser(OptionParser):
@@ -899 +907 @@
     sys.exit(1)
 
 def execute_from_command_line(action_mapping=DEFAULT_ACTION_MAPPING):
+    global CASCADE
     # Parse the command-line arguments. optparse handles the dirty work.
     parser = DjangoOptionParser(get_usage(action_mapping))
     parser.add_option('--settings',
@@ -907 +916 @@
         help='Lets you manually add a directory the Python path, e.g. "/home/djangoprojects/myproject".')
     parser.add_option('--plain', action='store_true', dest='plain',
         help='Tells Django to use plain Python, not IPython, for "shell" command.')
+    parser.add_option('--cascade', action='store_true', dest='cascade',
+        help='Tells Django to output CASCADEing DROP TABLE statements.')
     options, args = parser.parse_args()
 
     # Take care of options.
@@ -914 +925 @@
         os.environ['DJANGO_SETTINGS_MODULE'] = options.settings
     if options.pythonpath:
         sys.path.insert(0, options.pythonpath)
+    CASCADE = options.cascade
 
     # Run the appropriate action. Unfortunately, optparse can't handle
     # positional arguments, so this has to parse/validate them.