Changeset 4659

Timestamp:

03/01/07 07:11:08 (1 year ago)

Author:

russellm

Message:

Fixes #2333 -- Added test fixtures framework.

Files:

• django/trunk/django/conf/global_settings.py (modified) (1 diff)
• django/trunk/django/core/management.py (modified) (18 diffs)
• django/trunk/django/core/serializers/base.py (modified) (1 diff)
• django/trunk/django/core/serializers/__init__.py (modified) (1 diff)
• django/trunk/django/db/backends/ado_mssql/base.py (modified) (1 diff)
• django/trunk/django/db/backends/dummy/base.py (modified) (1 diff)
• django/trunk/django/db/backends/mysql/base.py (modified) (1 diff)
• django/trunk/django/db/backends/oracle/base.py (modified) (1 diff)
• django/trunk/django/db/backends/postgresql/base.py (modified) (3 diffs)
• django/trunk/django/db/backends/postgresql_psycopg2/base.py (modified) (3 diffs)
• django/trunk/django/db/backends/sqlite3/base.py (modified) (1 diff)
• django/trunk/django/test/__init__.py (modified) (1 diff)
• django/trunk/django/test/testcases.py (modified) (2 diffs)
• django/trunk/docs/django-admin.txt (modified) (6 diffs)
• django/trunk/docs/settings.txt (modified) (2 diffs)
• django/trunk/docs/testing.txt (modified) (2 diffs)
• django/trunk/tests/modeltests/fixtures (added)
• django/trunk/tests/modeltests/fixtures/fixtures (added)
• django/trunk/tests/modeltests/fixtures/fixtures/fixture1.json (added)
• django/trunk/tests/modeltests/fixtures/fixtures/fixture2.json (added)
• django/trunk/tests/modeltests/fixtures/fixtures/fixture2.xml (added)
• django/trunk/tests/modeltests/fixtures/fixtures/fixture3.xml (added)
• django/trunk/tests/modeltests/fixtures/fixtures/initial_data.json (added)
• django/trunk/tests/modeltests/fixtures/__init__.py (added)
• django/trunk/tests/modeltests/fixtures/models.py (added)
• django/trunk/tests/modeltests/test_client/fixtures (added)
• django/trunk/tests/modeltests/test_client/fixtures/testdata.json (added)
• django/trunk/tests/modeltests/test_client/management.py (deleted)
• django/trunk/tests/modeltests/test_client/models.py (modified) (1 diff)
• django/trunk/tests/urls.py (modified) (1 diff)

django/trunk/django/conf/global_settings.py

@@ -320 +320 @@
-# If None, a name of 'test_' + DATABASE_NAME will be assumed
-TEST_DATABASE_NAME = None
+
+############
+# FIXTURES #
+############
+
+# The list of directories to search for fixtures
+FIXTURE_DIRS = ()

django/trunk/django/core/management.py

@@ -68 +68 @@
-    cursor = connection.cursor()
-    return get_introspection_module().get_table_list(cursor)
+
+def _get_sequence_list():
+    "Returns a list of information about all DB sequences for all models in all apps"
+    from django.db import models
+
+    apps = models.get_apps()
+    sequence_list = []
+
+    for app in apps:
+        for model in models.get_models(app):
+            for f in model._meta.fields:
+                if isinstance(f, models.AutoField):
+                    sequence_list.append({'table':model._meta.db_table,'column':f.column,})
+                    break # Only one AutoField is allowed per model, so don't bother continuing.
+
+            for f in model._meta.many_to_many:
+                sequence_list.append({'table':f.m2m_db_table(),'column':None,})
+
+    return sequence_list
-
-# If the foreign key points to an AutoField, a PositiveIntegerField or a
@@ -335 +354 @@
-get_sql_reset.args = APP_ARGS
-
-
+
+
+
+
+
+
+
+
+
-    from django.db import models
-    from django.conf import settings
@@ -362 +389 @@
-    return output
-
-sql_initial_data
-initial INSERT
+custom_sql
+custom table modifying
-    from django.db.models import get_models
-    output = []
@@ -371 +398 @@
-
-    for model in app_models:
-sql_initial_data
+custom_sql
-
-    return output
-
-
+
+
+
+
+
+
+
+
-
-def get_sql_sequence_reset(app):
@@ -433 +466 @@
-def get_sql_all(app):
-    "Returns a list of CREATE TABLE SQL, initial-data inserts, and CREATE INDEX SQL for the given module."
-sql_initial_data
+custom_sql
-get_sql_all.help_doc = "Prints the CREATE TABLE, initial-data and CREATE INDEX SQL statements for the given model module name(s)."
-get_sql_all.args = APP_ARGS
+
+def _emit_post_sync_signal(created_models, verbosity, interactive):
+    from django.db import models
+    from django.dispatch import dispatcher
+    # Emit the post_sync signal for every application.
+    for app in models.get_apps():
+        app_name = app.__name__.split('.')[-2]
+        if verbosity >= 2:
+            print "Running post-sync handlers for application", app_name
+        dispatcher.send(signal=models.signals.post_syncdb, sender=app,
+            app=app, created_models=created_models,
+            verbosity=verbosity, interactive=interactive)
-
-def syncdb(verbosity=1, interactive=True):
-    "Creates the database tables for all apps in INSTALLED_APPS whose tables haven't already been created."
-    from django.db import connection, transaction, models, get_creation_module
-    from django.db.models import signals
-    from django.conf import settings
-    from django.dispatch import dispatcher
-
-    disable_termcolors()
@@ -504 +547 @@
-    # Send the post_syncdb signal, so individual apps can do whatever they need
-    # to do at this point.
+    _emit_post_sync_signal(created_models, verbosity, interactive)
+
+    # Install custom SQL for the app (but only if this 
+    # is a model we've just created)
-    for app in models.get_apps():
-        app_name = app.__name__.split('.')[-2]
-        if verbosity >= 2:
-            print "Running post-sync handlers for application", app_name
-        dispatcher.send(signal=signals.post_syncdb, sender=app,
-            app=app, created_models=created_models,
-            verbosity=verbosity, interactive=interactive)
-
-        # Install initial data for the app (but only if this is a model we've
-        # just created)
-        for model in models.get_models(app):
-            if model in created_models:
-initial_sql = get_sql_initial_data
-initial
+custom_sql = get_custom_sql
+custom
-                    if verbosity >= 1:
-initial data
+custom SQL
-                    try:
-initial
+custom
-                            cursor.execute(sql)
-                    except Exception, e:
-initial SQL data
+custom SQL
-                                            (app_name, model._meta.object_name, e))
-                        transaction.rollback_unless_managed()
@@ -549 +587 @@
-                        transaction.commit_unless_managed()
-
-
+
+
+
+
-
-def get_admin_index(app):
@@ -602 +643 @@
-diffsettings.args = ""
-
-def install(app):
-    "Executes the equivalent of 'get_sql_all' in the current database."
-    from django.db import connection, transaction
-
-    app_name = app.__name__.split('.')[-2]
-
-    disable_termcolors()
-
-    # First, try validating the models.
-    _check_for_validation_errors(app)
-
-    sql_list = get_sql_all(app)
-
-    try:
-        cursor = connection.cursor()
-        for sql in sql_list:
-            cursor.execute(sql)
-    except Exception, e:
-        sys.stderr.write(style.ERROR("""Error: %s couldn't be installed. Possible reasons:
-  * The database isn't running or isn't configured correctly.
-  * At least one of the database tables already exists.
-  * The SQL was invalid.
-Hint: Look at the output of 'django-admin.py sqlall %s'. That's the SQL this command wasn't able to run.
-The full error: """ % (app_name, app_name)) + style.ERROR_OUTPUT(str(e)) + '\n')
-        transaction.rollback_unless_managed()
-        sys.exit(1)
-    transaction.commit_unless_managed()
-install.help_doc = "Executes ``sqlall`` for the given app(s) in the current database."
-install.args = APP_ARGS
-
-def reset(app, interactive=True):
-    "Executes the equivalent of 'get_sql_reset' in the current database."
@@ -673 +684 @@
-        print "Reset cancelled."
-reset.help_doc = "Executes ``sqlreset`` for the given app(s) in the current database."
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-def _start_helper(app_or_project, name, directory, other_name=''):
@@ -756 +828 @@
-    yield "# Feel free to rename the models, but don't rename db_table values or field names."
-    yield "#"
-initialdata
+custom
-    yield "# into your database."
-    yield ''
@@ -1252 +1324 @@
-test.args = '[--verbosity] ' + APP_ARGS
-
+def load_data(fixture_labels, verbosity=1):
+    "Installs the provided fixture file(s) as data in the database."
+    from django.db.models import get_apps
+    from django.core import serializers
+    from django.db import connection, transaction
+    from django.conf import settings
+    import sys
+     
+    # Keep a count of the installed objects and fixtures
+    count = [0,0]
+    
+    humanize = lambda dirname: dirname and "'%s'" % dirname or 'absolute path'
+
+    # Get a cursor (even though we don't need one yet). This has
+    # the side effect of initializing the test database (if 
+    # it isn't already initialized).
+    cursor = connection.cursor()
+    
+    # Start transaction management. All fixtures are installed in a 
+    # single transaction to ensure that all references are resolved.
+    transaction.commit_unless_managed()
+    transaction.enter_transaction_management()
+    transaction.managed(True)
+    
+    app_fixtures = [os.path.join(os.path.dirname(app.__file__),'fixtures') for app in get_apps()]
+    for fixture_label in fixture_labels:
+        if verbosity > 0:
+            print "Loading '%s' fixtures..." % fixture_label
+        for fixture_dir in app_fixtures + list(settings.FIXTURE_DIRS) + ['']:
+            if verbosity > 1:
+                print "Checking %s for fixtures..." % humanize(fixture_dir)
+            try:
+                fixture_name, format = fixture_label.rsplit('.', 1)
+                formats = [format]
+            except ValueError:
+                fixture_name = fixture_label
+                formats = serializers.get_serializer_formats()
+            
+            label_found = False
+            for format in formats:
+                serializer = serializers.get_serializer(format)
+                if verbosity > 1:
+                    print "Trying %s for %s fixture '%s'..." % \
+                        (humanize(fixture_dir), format, fixture_name)
+                try:
+                    full_path = os.path.join(fixture_dir, '.'.join([fixture_name, format]))
+                    fixture = open(full_path, 'r')
+                    if label_found:
+                        fixture.close()
+                        print style.ERROR("Multiple fixtures named '%s' in %s. Aborting." % 
+                            (fixture_name, humanize(fixture_dir)))
+                        transaction.rollback()
+                        transaction.leave_transaction_management()
+                        return
+                    else:
+                        count[1] += 1
+                        if verbosity > 0:
+                            print "Installing %s fixture '%s' from %s." % \
+                                (format, fixture_name, humanize(fixture_dir))
+                        try:
+                            objects =  serializers.deserialize(format, fixture)
+                            for obj in objects:
+                                count[0] += 1
+                                obj.save()
+                            label_found = True
+                        except Exception, e:
+                            fixture.close()
+                            sys.stderr.write(
+                                style.ERROR("Problem installing fixture '%s': %s\n" % 
+                                     (full_path, str(e))))
+                            transaction.rollback()
+                            transaction.leave_transaction_management()
+                            return
+                        fixture.close()
+                except:
+                    if verbosity > 1:
+                        print "No %s fixture '%s' in %s." % \
+                            (format, fixture_name, humanize(fixture_dir))
+    if count[0] == 0:
+        if verbosity > 0:
+            print "No fixtures found."
+    else:
+        if verbosity > 0:
+            print "Installed %d object(s) from %d fixture(s)" % tuple(count)
+    transaction.commit()
+    transaction.leave_transaction_management()
+        
+load_data.help_doc = 'Installs the named fixture(s) in the database'
+load_data.args = "[--verbosity] fixture, fixture, ..."
+ 
+def dump_data(app_labels, format='json'):
+    "Output the current contents of the database as a fixture of the given format"
+    from django.db.models import get_app, get_apps, get_models
+    from django.core import serializers
+ 
+    if len(app_labels) == 0:
+        app_list = get_apps()
+    else:
+        app_list = [get_app(app_label) for app_label in app_labels]
+ 
+    # Check that the serialization format exists; this is a shortcut to
+    # avoid collating all the objects and _then_ failing.
+    try:
+        serializers.get_serializer(format)
+    except KeyError:
+        sys.stderr.write(style.ERROR("Unknown serialization format: %s\n" % format))        
+    
+    objects = []
+    for app in app_list:
+        for model in get_models(app):
+            objects.extend(model.objects.all())
+    try:
+        print serializers.serialize(format, objects)
+    except Exception, e:
+        sys.stderr.write(style.ERROR("Unable to serialize database: %s\n" % e))
+dump_data.help_doc = 'Output the contents of the database as a fixture of the given format'
+dump_data.args = '[--format]' + APP_ARGS
+
-# Utilities for command-line script
-
@@ -1259 +1449 @@
-    'dbshell': dbshell,
-    'diffsettings': diffsettings,
+    'dumpdata': dump_data,
+    'flush': flush,
-    'inspectdb': inspectdb,
-install': install
+loaddata': load_data
-    'reset': reset,
-    'runfcgi': runfcgi,
@@ -1268 +1460 @@
-    'sqlall': get_sql_all,
-    'sqlclear': get_sql_delete,
+    'sqlcustom': get_custom_sql,
+    'sqlflush': get_sql_flush,
-    'sqlindexes': get_sql_indexes,
-    'sqlinitialdata': get_sql_initial_data,
@@ -1284 +1478 @@
-    'dbshell',
-    'diffsettings',
-    'install',
-    'reset',
-    'sqlindexes',
@@ -1331 +1524 @@
-    parser.add_option('--noreload', action='store_false', dest='use_reloader', default=True,
-        help='Tells Django to NOT use the auto-reloader when running the development server.')
+    parser.add_option('--format', default='json', dest='format',
+        help='Specifies the output serialization format for fixtures')    
-    parser.add_option('--verbosity', action='store', dest='verbosity', default='1',
-        type='choice', choices=['0', '1', '2'],
@@ -1364 +1559 @@
-    elif action in ('validate', 'diffsettings', 'dbshell'):
-        action_mapping[action]()
-== 'syncdb'
+in ('flush', 'syncdb')
-        action_mapping[action](int(options.verbosity), options.interactive)
-    elif action == 'inspectdb':
@@ -1378 +1573 @@
-        except IndexError:
-            parser.print_usage_and_exit()
-== 'test'
+in ('test', 'loaddata')
-        try:
-            action_mapping[action](args[1:], int(options.verbosity))
+        except IndexError:
+            parser.print_usage_and_exit()
+    elif action == 'dumpdata':
+        try:
+            action_mapping[action](args[1:], options.format)
-        except IndexError:
-            parser.print_usage_and_exit()
@@ -1401 +1601 @@
-    elif action == 'runfcgi':
-        action_mapping[action](args[1:])
+    elif action == 'sqlinitialdata':
+        print action_mapping[action](args[1:])
+    elif action == 'sqlflush':
+        print '\n'.join(action_mapping[action]())
-    else:
-        from django.db import models

django/trunk/django/core/serializers/base.py

@@ -142 +142 @@
-class DeserializedObject(object):
-    """
-
+i
-
-    Basically a container for holding the pre-saved deserialized data along

django/trunk/django/core/serializers/__init__.py

@@ -41 +41 @@
-        _load_serializers()
-    return _serializers[format].Serializer
+
+def get_serializer_formats():
+    if not _serializers:
+        _load_serializers()
+    return _serializers.keys()
-    
-def get_deserializer(format):

django/trunk/django/db/backends/ado_mssql/base.py

@@ -138 +138 @@
-    return "DEFAULT"
-
+def get_sql_flush(sql_styler, full_table_list):
+    """Return a list of SQL statements required to remove all data from
+    all tables in the database (without actually removing the tables
+    themselves) and put the database in an empty 'initial' state
+    """
+    # Return a list of 'TRUNCATE x;', 'TRUNCATE y;', 'TRUNCATE z;'... style SQL statements
+    # TODO - SQL not actually tested against ADO MSSQL yet!
+    # TODO - autoincrement indices reset required? See other get_sql_flush() implementations
+    sql_list = ['%s %s;' % \
+                (sql_styler.SQL_KEYWORD('TRUNCATE'),
+                 sql_styler.SQL_FIELD(quote_name(table))
+                 )  for table in full_table_list]
+
-OPERATOR_MAPPING = {
-    'exact': '= %s',

django/trunk/django/db/backends/dummy/base.py

@@ -40 +40 @@
-get_fulltext_search_sql = complain
-get_drop_foreignkey_sql = complain
+get_sql_flush = complain
+
-OPERATOR_MAPPING = {}

django/trunk/django/db/backends/mysql/base.py

@@ -187 +187 @@
-    return "DEFAULT"
-
+def get_sql_flush(style, tables, sequences):
+    """Return a list of SQL statements required to remove all data from
+    all tables in the database (without actually removing the tables
+    themselves) and put the database in an empty 'initial' state
+    
+    """
+    # NB: The generated SQL below is specific to MySQL
+    # 'TRUNCATE x;', 'TRUNCATE y;', 'TRUNCATE z;'... style SQL statements
+    # to clear all tables of all data
+    if tables:
+        sql = ['SET FOREIGN_KEY_CHECKS = 0;'] + \
+              ['%s %s;' % \
+                (style.SQL_KEYWORD('TRUNCATE'),
+                 style.SQL_FIELD(quote_name(table))
+                )  for table in tables] + \
+              ['SET FOREIGN_KEY_CHECKS = 1;']
+              
+        # 'ALTER TABLE table AUTO_INCREMENT = 1;'... style SQL statements
+        # to reset sequence indices
+        sql.extend(["%s %s %s %s %s;" % \
+            (style.SQL_KEYWORD('ALTER'),
+             style.SQL_KEYWORD('TABLE'),
+             style.SQL_TABLE(quote_name(sequence['table'])),
+             style.SQL_KEYWORD('AUTO_INCREMENT'),
+             style.SQL_FIELD('= 1'),
+            ) for sequence in sequences])
+        return sql
+    else:
+        return []
+
-OPERATOR_MAPPING = {
-    'exact': '= %s',

django/trunk/django/db/backends/oracle/base.py

@@ -121 +121 @@
-    return "DEFAULT"
-
+def get_sql_flush(style, tables, sequences):
+    """Return a list of SQL statements required to remove all data from
+    all tables in the database (without actually removing the tables
+    themselves) and put the database in an empty 'initial' state
+    """
+    # Return a list of 'TRUNCATE x;', 'TRUNCATE y;', 'TRUNCATE z;'... style SQL statements
+    # TODO - SQL not actually tested against Oracle yet!
+    # TODO - autoincrement indices reset required? See other get_sql_flush() implementations
+    sql = ['%s %s;' % \
+            (style.SQL_KEYWORD('TRUNCATE'),
+             style.SQL_FIELD(quote_name(table))
+             )  for table in tables]
+
+
-OPERATOR_MAPPING = {
-    'exact': '= %s',

django/trunk/django/db/backends/postgresql/base.py

@@ -52 +52 @@
-        else:
-            return getattr(self.cursor, attr)
+
+postgres_version = None
-
-class DatabaseWrapper(local):
@@ -82 +84 @@
-            cursor.execute("SET TIME ZONE %s", [settings.TIME_ZONE])
-        cursor = UnicodeCursorWrapper(cursor, settings.DEFAULT_CHARSET)
+        global postgres_version
+        if not postgres_version:
+            cursor.execute("SELECT version()")
+            postgres_version = [int(val) for val in cursor.dictfetchone()['version'].split()[1].split('.')]        
-        if settings.DEBUG:
-            return util.CursorDebugWrapper(cursor, self)
@@ -152 +158 @@
-    return "DEFAULT"
-
+def get_sql_flush(style, tables, sequences):
+    """Return a list of SQL statements required to remove all data from
+    all tables in the database (without actually removing the tables
+    themselves) and put the database in an empty 'initial' state
+    
+    """    
+    if tables:
+        if postgres_version[0] >= 8 and postgres_version[1] >= 1:
+            # Postgres 8.1+ can do 'TRUNCATE x, y, z...;'. In fact, it *has to* in order to be able to
+            # truncate tables referenced by a foreign key in any other table. The result is a
+            # single SQL TRUNCATE statement.
+            sql = ['%s %s;' % \
+                (style.SQL_KEYWORD('TRUNCATE'),
+                 style.SQL_FIELD(', '.join(quote_name(table) for table in tables))
+            )]
+        else:
+            # Older versions of Postgres can't do TRUNCATE in a single call, so they must use 
+            # a simple delete.
+            sql = ['%s %s %s;' % \
+                    (style.SQL_KEYWORD('DELETE'),
+                     style.SQL_KEYWORD('FROM'),
+                     style.SQL_FIELD(quote_name(table))
+                     ) for table in tables]
+
+        # 'ALTER SEQUENCE sequence_name RESTART WITH 1;'... style SQL statements
+        # to reset sequence indices
+        for sequence_info in sequences:
+            table_name = sequence_info['table']
+            column_name = sequence_info['column']
+            if column_name and len(column_name)>0:
+                # sequence name in this case will be <table>_<column>_seq
+                sql.append("%s %s %s %s %s %s;" % \
+                    (style.SQL_KEYWORD('ALTER'),
+                    style.SQL_KEYWORD('SEQUENCE'),
+                    style.SQL_FIELD('%s_%s_seq' % (table_name, column_name)),
+                    style.SQL_KEYWORD('RESTART'),
+                    style.SQL_KEYWORD('WITH'),
+                    style.SQL_FIELD('1')
+                    )
+                )
+            else:
+                # sequence name in this case will be <table>_id_seq
+                sql.append("%s %s %s %s %s %s;" % \
+                    (style.SQL_KEYWORD('ALTER'),
+                     style.SQL_KEYWORD('SEQUENCE'),
+                     style.SQL_FIELD('%s_id_seq' % table_name),
+                     style.SQL_KEYWORD('RESTART'),
+                     style.SQL_KEYWORD('WITH'),
+                     style.SQL_FIELD('1')
+                     )
+                )
+        return sql
+    else:
+        return []
+
+        
-# Register these custom typecasts, because Django expects dates/times to be
-# in Python's native (standard-library) datetime/time format, whereas psycopg

django/trunk/django/db/backends/postgresql_psycopg2/base.py

@@ -20 +20 @@
-    # Import copy of _thread_local.py from Python 2.4
-    from django.utils._threading_local import local
+
+postgres_version = None
-
-class DatabaseWrapper(local):
@@ -50 +52 @@
-        if set_tz:
-            cursor.execute("SET TIME ZONE %s", [settings.TIME_ZONE])
+        global postgres_version
+        if not postgres_version:
+            cursor.execute("SELECT version()")
+            postgres_version = [int(val) for val in cursor.dictfetchone()['version'].split()[1].split('.')]        
-        if settings.DEBUG:
-            return util.CursorDebugWrapper(cursor, self)
@@ -112 +118 @@
-    return "DEFAULT"
-
+def get_sql_flush(style, tables, sequences):
+    """Return a list of SQL statements required to remove all data from
+    all tables in the database (without actually removing the tables
+    themselves) and put the database in an empty 'initial' state
+    """
+    if tables:
+        if postgres_version[0] >= 8 and postgres_version[1] >= 1:
+            # Postgres 8.1+ can do 'TRUNCATE x, y, z...;'. In fact, it *has to* in order to be able to
+            # truncate tables referenced by a foreign key in any other table. The result is a
+            # single SQL TRUNCATE statement
+            sql = ['%s %s;' % \
+                    (style.SQL_KEYWORD('TRUNCATE'),
+                     style.SQL_FIELD(', '.join(quote_name(table) for table in tables))
+                    )]
+        else:
+            sql = ['%s %s %s;' % \
+                    (style.SQL_KEYWORD('DELETE'),
+                     style.SQL_KEYWORD('FROM'),
+                     style.SQL_FIELD(quote_name(table))
+                     ) for table in tables]
+                     
+        # 'ALTER SEQUENCE sequence_name RESTART WITH 1;'... style SQL statements
+        # to reset sequence indices
+        for sequence in sequences:
+            table_name = sequence['table']
+            column_name = sequence['column']
+            if column_name and len(column_name) > 0:
+                # sequence name in this case will be <table>_<column>_seq
+                sql.append("%s %s %s %s %s %s;" % \
+                    (style.SQL_KEYWORD('ALTER'),
+                     style.SQL_KEYWORD('SEQUENCE'),
+                     style.SQL_FIELD('%s_%s_seq' % (table_name, column_name)),
+                     style.SQL_KEYWORD('RESTART'),
+                     style.SQL_KEYWORD('WITH'),
+                     style.SQL_FIELD('1')
+                     )
+                )
+            else:
+                # sequence name in this case will be <table>_id_seq
+                sql.append("%s %s %s %s %s %s;" % \
+                    (style.SQL_KEYWORD('ALTER'),
+                     style.SQL_KEYWORD('SEQUENCE'),
+                     style.SQL_FIELD('%s_id_seq' % table_name),
+                     style.SQL_KEYWORD('RESTART'),
+                     style.SQL_KEYWORD('WITH'),
+                     style.SQL_FIELD('1')
+                     )
+                )
+        return sql
+    else:
+        return []
+        
-OPERATOR_MAPPING = {
-    'exact': '= %s',

django/trunk/django/db/backends/sqlite3/base.py

@@ -152 +152 @@
-    return "NULL"
-
+def get_sql_flush(style, tables, sequences):
+    """Return a list of SQL statements required to remove all data from
+    all tables in the database (without actually removing the tables
+    themselves) and put the database in an empty 'initial' state
+    
+    """
+    # NB: The generated SQL below is specific to SQLite
+    # Note: The DELETE FROM... SQL generated below works for SQLite databases
+    # because constraints don't exist
+    sql = ['%s %s %s;' % \
+            (style.SQL_KEYWORD('DELETE'),
+             style.SQL_KEYWORD('FROM'),
+             style.SQL_FIELD(quote_name(table))
+             ) for table in tables]
+    # Note: No requirement for reset of auto-incremented indices (cf. other
+    # get_sql_flush() implementations). Just return SQL at this point
+    return sql
+
-def _sqlite_date_trunc(lookup_type, dt):
-    try:

django/trunk/django/test/__init__.py

@@ +1 @@
+"""
+Django Unit Test and Doctest framework.
+"""
+
+from django.test.client import Client
+from django.test.testcases import TestCase

django/trunk/django/test/testcases.py

@@ -1 +1 @@
-import re, doctest, unittest
-from django.db import transaction
+from django.core import management
+from django.db.models import get_apps
-    
-normalize_long_ints = lambda s: re.sub(r'(?<![\w])(\d+)L(?![\w])', '\\1', s)
@@ -29 +31 @@
-        transaction.rollback_unless_managed()
-
+class TestCase(unittest.TestCase):    
+    def install_fixtures(self):
+        """If the Test Case class has a 'fixtures' member, clear the database and
+        install the named fixtures at the start of each test.
+        
+        """
+        management.flush(verbosity=0, interactive=False)
+        if hasattr(self, 'fixtures'):
+            management.load_data(self.fixtures, verbosity=0)
+
+    def run(self, result=None):
+        """Wrapper around default run method so that user-defined Test Cases 
+        automatically call install_fixtures without having to include a call to 
+        super().
+        
+        """
+        self.install_fixtures()
+        super(TestCase, self).run(result)

django/trunk/docs/django-admin.txt

@@ -97 +97 @@
-Note that Django's default settings live in ``django/conf/global_settings.py``,
-if you're ever curious to see the full list of defaults.
+
+dumpdata [appname appname ...]
+------------------------------
+
+**New in Django development version**
+
+Output to standard output all data in the database associated with the named 
+application(s).
+
+By default, the database will be dumped in JSON format. If you want the output
+to be in another format, use the ``--format`` option (e.g., ``format=xml``). 
+You may specify any Django serialization backend (inclu