Commit a03a8adb authored by Jannis Leidel's avatar Jannis Leidel
Browse files

Fixed #14268 -- Start the deprecation of the reset and sqlreset management command. Thanks, Carl.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14888 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent 3d35ac78
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -20,6 +20,12 @@ class Command(AppCommand):
    output_transaction = True

    def handle_app(self, app, **options):
        # This command breaks a lot and should be deprecated
        import warnings
        warnings.warn(
            'This command has been deprecated. The command ``flush`` can be used to delete everything. You can also use ALTER TABLE or DROP TABLE statements manually.',
            PendingDeprecationWarning
        )
        using = options.get('database', DEFAULT_DB_ALIAS)
        connection = connections[using]

+6 −0
Original line number Diff line number Diff line
@@ -98,6 +98,12 @@ def sql_delete(app, style, connection):

def sql_reset(app, style, connection):
    "Returns a list of the DROP TABLE SQL, then the CREATE TABLE SQL, for the given module."
    # This command breaks a lot and should be deprecated
    import warnings
    warnings.warn(
        'This command has been deprecated. The command ``sqlflush`` can be used to delete everything. You can also use ALTER TABLE or DROP TABLE statements manually.',
        PendingDeprecationWarning
    )
    return sql_delete(app, style, connection) + sql_all(app, style, connection)

def sql_flush(style, connection, only_django=False):
+3 −0
Original line number Diff line number Diff line
@@ -136,6 +136,9 @@ their deprecation, as per the :ref:`Django deprecation policy
          template variable, not an implied string. The new-style
          behavior is provided in the ``future`` template tag library.

        * The :djadmin:`reset` and :djadmin:`sqlreset` management commands
          are deprecated.

    * 2.0
        * ``django.views.defaults.shortcut()``. This function has been moved
          to ``django.contrib.contenttypes.views.shortcut()`` as part of the
+8 −0
Original line number Diff line number Diff line
@@ -491,6 +491,10 @@ several lines in language files.
reset <appname appname ...>
---------------------------

.. deprecated:: 1.3
    This command has been deprecated. The ``flush`` can be used to delete
    everything. You can also use ALTER TABLE or DROP TABLE statements manually.

.. django-admin:: reset

Executes the equivalent of ``sqlreset`` for the given app name(s).
@@ -844,6 +848,10 @@ which to print the SQL.
sqlreset <appname appname ...>
------------------------------

.. deprecated:: 1.3
    This command has been deprecated. The ``sqlflush`` can be used to delete
    everything. You can also use ALTER TABLE or DROP TABLE statements manually.

.. django-admin:: sqlreset

Prints the DROP TABLE SQL, then the CREATE TABLE SQL, for the given app name(s).
+7 −0
Original line number Diff line number Diff line
@@ -468,3 +468,10 @@ in favor of a new :attr:`~django.contrib.admin.AdminSite.login_form`
attribute.

.. _r12634: http://code.djangoproject.com/changeset/12634

``reset`` and ``sqlreset`` management commands
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Those commands have been deprecated. The ``flush`` and ``sqlflush`` commands
can be used to delete everything. You can also use ALTER TABLE or DROP TABLE
statements manually.