Changeset 5380

Timestamp:

05/29/07 07:42:08 (1 year ago)

Author:

mtredinnick

Message:

Added new TEST_DATABASE_CHARSET and TEST_DATABASE_COLLATION settings to ensure
that databases are created with the expected encoding during testing.

Files:

• django/trunk/django/conf/global_settings.py (modified) (1 diff)
• django/trunk/django/test/utils.py (modified) (4 diffs)
• django/trunk/docs/settings.txt (modified) (2 diffs)
• django/trunk/docs/testing.txt (modified) (1 diff)

django/trunk/django/conf/global_settings.py

@@ -333 +333 @@
-TEST_DATABASE_NAME = None
-
+# Strings used to set the character set and collation order for the test
+# database. These values are passed literally to the server, so they are
+# backend-dependent. If None, no special settings are sent (system defaults are
+# used).
+TEST_DATABASE_CHARSET = None
+TEST_DATABASE_COLLATION = None
+
-############
-# FIXTURES #

django/trunk/django/test/utils.py

@@ -74 +74 @@
-        connection.connection.set_isolation_level(0)
-
+def get_mysql_create_suffix():
+    suffix = []
+    if settings.TEST_DATABASE_CHARSET:
+        suffix.append('CHARACTER SET %s' % settings.TEST_DATABASE_CHARSET)
+    if settings.TEST_DATABASE_COLLATION:
+        suffix.append('COLLATE %s' % settings.TEST_DATABASE_COLLATION)
+    return ' '.join(suffix)
+
+def get_postgresql_create_suffix():
+    assert settings.TEST_DATABASE_COLLATION is None, "PostgreSQL does not support collation setting at database creation time."
+    if settings.TEST_DATABASE_CHARSET:
+        return "WITH ENCODING '%s'" % settings.TEST_DATABASE_CHARSET
+    return ''
+
-def create_test_db(verbosity=1, autoclobber=False):
-    if verbosity >= 1:
@@ -82 +96 @@
-        TEST_DATABASE_NAME = ":memory:"
-    else:
+        suffix = {
+            'postgresql': get_postgresql_create_suffix,
+            'postgresql_psycopg2': get_postgresql_create_suffix,
+            'mysql': get_mysql_create_suffix,
+            'mysql_old': get_mysql_create_suffix,
+        }.get(settings.DATABASE_ENGINE, lambda: '')()
-        if settings.TEST_DATABASE_NAME:
-            TEST_DATABASE_NAME = settings.TEST_DATABASE_NAME
@@ -93 +113 @@
-        _set_autocommit(connection)
-        try:
-" % backend.quote_name(TEST_DATABASE_NAME
+ %s" % (backend.quote_name(TEST_DATABASE_NAME), suffix
-        except Exception, e:            
-            sys.stderr.write("Got an error creating the test database: %s\n" % e)
@@ -105 +125 @@
-                    if verbosity >= 1:
-                        print "Creating test database..."
-" % backend.quote_name(TEST_DATABASE_NAME
+ %s" % (backend.quote_name(TEST_DATABASE_NAME), suffix
-                except Exception, e:
-                    sys.stderr.write("Got an error recreating the test database: %s\n" % e)

django/trunk/docs/settings.txt

@@ -827 +827 @@
-.. _How invalid variables are handled: ../templates_python/#how-invalid-variables-are-handled
-
+TEST_DATABASE_CHARSET
+---------------------
+
+**New in Django development version**
+
+Default: ``None``
+
+The character set encoding used to create the test database. The value of this
+string is passed directly through to the database, so its format is
+backend-specific.
+
+Supported for the PostgreSQL_ (``postgresql``, ``postgresql_psycopg2``) and MySQL_ (``mysql``, ``mysql_old``) backends.
+
+.. _PostgreSQL: http://www.postgresql.org/docs/8.2/static/multibyte.html
+.. _MySQL: http://www.mysql.org/doc/refman/5.0/en/charset-database.html
+
+TEST_DATABASE_COLLATION
+------------------------
+
+**New in Django development version**
+
+Default: ``None``
+
+The collation order to use when creating the test database. This value is
+passed directly to the backend, so it's format is backend-specific.
+
+Only supported for ``mysql`` and ``mysql_old`` backends (see `section 10.3.2`_
+of the MySQL manual for details).
+
+.. _section 10.3.2: http://www.mysql.org/doc/refman/5.0/en/charset-database.html
+
+TEST_DATABASE_NAME
+------------------
+
+Default: ``None``
+
+The name of database to use when running the test suite. If a value of
+``None`` is specified, the test database will use the name ``'test_' + settings.DATABASE_NAME``. See `Testing Django Applications`_.
+
+.. _Testing Django Applications: ../testing/
+
-TEST_RUNNER
------------
@@ -832 +873 @@
-Default: ``'django.test.simple.run_tests'``
-
- 
+
-`Testing Django Applications`_.
-
-.. _Testing Django Applications: ../testing/
-
-TEST_DATABASE_NAME
-------------------
-
-Default: ``None``
-
-The name of database to use when running the test suite. If a value of 
-``None`` is specified, the test database will use the name ``'test_' + settings.DATABASE_NAME``. See `Testing Django Applications`_.
-
-.. _Testing Django Applications: ../testing/

django/trunk/docs/testing.txt

@@ -571 +571 @@
-If you wish to use a name other than the default for the test database,
-you can use the ``TEST_DATABASE_NAME`` setting to provide a name.
+
+
+**New in Django development version:** If you wish to have fine-grained
+control over the character set encoding used in your database, you can control
+this with the ``TEST_DATABASE_CHARSET`` setting. For MySQL users, you can also
+control the particular collation used by the test database with the
+``TEST_DATABASE_COLLATION`` setting. Refer to the settings_ documentation for
+details of these advanced settings.
+
+.. _settings: ../settings.txt
-
-The test database is created by the user in the ``DATABASE_USER`` setting.