Changeset 6013

Timestamp:

08/25/07 14:32:30 (1 year ago)

Author:

adrian

Message:

Fixed #5086 -- The 'flush' and 'sqlflush' management commands no longer touch tables that Django is not aware of (tables that are not in INSTALLED_APPS and/or do not have associated models. Thanks for bringing this up, shaun@cuttshome.net

Files:

• django/trunk/django/core/management/commands/flush.py (modified) (1 diff)
• django/trunk/django/core/management/commands/sqlflush.py (modified) (1 diff)
• django/trunk/django/core/management/sql.py (modified) (2 diffs)
• django/trunk/docs/django-admin.txt (modified) (4 diffs)

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

@@ -25 +25 @@
-                pass
-
-
+, only_django=True
-
-        if interactive:

django/trunk/django/core/management/commands/sqlflush.py

@@ -8 +8 @@
-    def handle_noargs(self, **options):
-        from django.core.management.sql import sql_flush
-
+, only_django=True

django/trunk/django/core/management/sql.py

@@ -13 +13 @@
-    cursor = connection.cursor()
-    return get_introspection_module().get_table_list(cursor)
+
+def django_table_list(only_existing=False):
+    """
+    Returns a list of all table names that have associated Django models and
+    are in INSTALLED_APPS.
+
+    If only_existing is True, the resulting list will only include the tables
+    that actually exist in the database.
+    """
+    from django.db import models
+    tables = []
+    for app in models.get_apps():
+        for model in models.get_models(app):
+            tables.append(model._meta.db_table)
+            tables.extend([f.m2m_db_table() for f in model._meta.many_to_many])
+    if only_existing:
+        existing = table_list()
+        tables = [t for t in tables if t in existing]
+    return tables
-
-def installed_models(table_list):
@@ -182 +201 @@
-    return sql_delete(app, style) + sql_all(app, style)
-
-
-
+
+
+
+
+
+
+
-    from django.db import connection
-
+
+
+
+
+
-    return statements
-

django/trunk/docs/django-admin.txt

@@ -124 +124 @@
-post-synchronization handlers will be re-executed, and the ``initial_data``
-fixture will be re-installed.
+
+The behavior of this command has changed in the Django development version.
+Previously, this command cleared *every* table in the database, including any
+table that Django didn't know about (i.e., tables that didn't have associated
+models and/or weren't in ``INSTALLED_APPS``). Now, the command only clears
+tables that are represented by Django models and are activated in
+``INSTALLED_APPS``.
-
-inspectdb
@@ -241 +248 @@
-runfcgi [options]
------------------
+
-Starts a set of FastCGI processes suitable for use with any web server
-which supports the FastCGI protocol. See the `FastCGI deployment
@@ -338 +346 @@
-
-sqlclear [appname appname ...]
---------
+
-
-Prints the DROP TABLE SQL statements for the given appnames.
@@ -361 +369 @@
-Note that the order in which the SQL files are processed is undefined.
-
+sqlflush
+--------
+
+Prints the SQL statements that would be executed for the `flush`_ command.
+
-sqlindexes [appname appname ...]
---------
+
-
-Prints the CREATE INDEX SQL statements for the given appnames.
-
-sqlreset [appname appname ...]
+------------------------------
+
+Prints the DROP TABLE SQL, then the CREATE TABLE SQL, for the given appnames.
+
+sqlsequencereset [appname appname ...]
---------------------------------------
-
-Prints the DROP TABLE SQL, then the CREATE TABLE SQL, for the given appnames.
-
-sqlsequencereset [appname appname ...]
-----------------------------------------------
-
-Prints the SQL statements for resetting sequences for the given