Django

Code

Changeset 7951

Show
Ignore:
Timestamp:
07/18/08 14:00:37 (4 months ago)
Author:
brosner
Message:

newforms-admin: Merged from trunk up to [7950].

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/branches/newforms-admin

    • Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7947 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7950

  • django/branches/newforms-admin/django/test/utils.py

    r7944 r7951  
    141141            'postgresql_psycopg2': get_postgresql_create_suffix, 
    142142            'mysql': get_mysql_create_suffix, 
    143             'mysql_old': get_mysql_create_suffix, 
    144143        }.get(settings.DATABASE_ENGINE, lambda: '')() 
    145144        if settings.TEST_DATABASE_NAME: 

  • django/branches/newforms-admin/docs/settings.txt

    r7881 r7951  
    279279 
    280280The database backend to use. The build-in database backends are 
    281 ``'postgresql_psycopg2'``, ``'postgresql'``, ``'mysql'``, ``'mysql_old'``, 
    282 ``'sqlite3'``, and ``'oracle'``. 
     281``'postgresql_psycopg2'``, ``'postgresql'``, ``'mysql'``, ``'sqlite3'``, and 
     282``'oracle'``. 
    283283 
    284284In the Django development version, you can use a database backend that doesn't 
    …… 
    10301030backend-specific. 
    10311031 
    1032 Supported for the PostgreSQL_ (``postgresql``, ``postgresql_psycopg2``) and MySQL_ (``mysql``, ``mysql_old``) backends. 
     1032Supported for the PostgreSQL_ (``postgresql``, ``postgresql_psycopg2``) and MySQL_ (``mysql``) backends. 
    10331033 
    10341034.. _PostgreSQL: http://www.postgresql.org/docs/8.2/static/multibyte.html 
    …… 
    10451045passed directly to the backend, so its format is backend-specific. 
    10461046 
    1047 Only supported for ``mysql`` and ``mysql_old`` backends (see `section 10.3.2`_ 
    1048 of the MySQL manual for details). 
     1047Only supported for the ``mysql`` backend (see `section 10.3.2`_ of the MySQL 
     1048manual for details). 
    10491049 
    10501050.. _section 10.3.2: http://www.mysql.org/doc/refman/5.0/en/charset-database.html 

  • django/branches/newforms-admin/tests/modeltests/fixtures/models.py

    r6371 r7951  
    5959# Database flushing does not work on MySQL with the default storage engine 
    6060# because it requires transaction support. 
    61 if settings.DATABASE_ENGINE not in ('mysql', 'mysql_old'): 
     61if settings.DATABASE_ENGINE != 'mysql': 
    6262    __test__['API_TESTS'] += \ 
    6363""" 

  • django/branches/newforms-admin/tests/modeltests/lookup/models.py

    r7479 r7951  
    381381 
    382382 
    383 if settings.DATABASE_ENGINE not in ('mysql', 'mysql_old'): 
     383if settings.DATABASE_ENGINE != 'mysql': 
    384384    __test__['API_TESTS'] += r""" 
    385385# grouping and backreferences 

  • django/branches/newforms-admin/tests/modeltests/transactions/models.py

    r7479 r7951  
    2626building_docs = getattr(settings, 'BUILDING_DOCS', False) 
    2727 
    28 if building_docs or settings.DATABASE_ENGINE not in ('mysql', 'mysql_old'): 
     28if building_docs or settings.DATABASE_ENGINE != 'mysql': 
    2929    __test__['API_TESTS'] += """ 
    3030# the default behavior is to autocommit after each save() action