Django

Code

Changeset 5981

Show
Ignore:
Timestamp:
08/19/07 22:16:55 (1 year ago)
Author:
adrian
Message:

Changed backend create_test_db() and destroy_test_db() hooks NOT to take the backend as an argument, as the backend as an object is going away

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/db/backends/oracle/creation.py

    r5908 r5981  
    3737REMEMBER = {} 
    3838 
    39  
    40 def create_test_db(settings, connection, backend, verbosity=1, autoclobber=False): 
    41  
     39def create_test_db(settings, connection, verbosity=1, autoclobber=False): 
    4240    TEST_DATABASE_NAME = _test_database_name(settings) 
    4341    TEST_DATABASE_USER = _test_database_user(settings) 
    …… 
    116114    cursor = connection.cursor() 
    117115 
    118  
    119 def destroy_test_db(settings, connection, backend, old_database_name, verbosity=1): 
     116def destroy_test_db(settings, connection, old_database_name, verbosity=1): 
    120117    connection.close() 
    121118 
    …… 
    152149        _destroy_test_db(cursor, parameters, verbosity) 
    153150    connection.close() 
    154  
    155151 
    156152def _create_test_db(cursor, parameters, verbosity): 
    …… 
    169165    _execute_statements(cursor, statements, parameters, verbosity) 
    170166 
    171  
    172167def _create_test_user(cursor, parameters, verbosity): 
    173168    if verbosity >= 2: 
    …… 
    183178    _execute_statements(cursor, statements, parameters, verbosity) 
    184179 
    185  
    186180def _destroy_test_db(cursor, parameters, verbosity): 
    187181    if verbosity >= 2: 
    …… 
    193187    _execute_statements(cursor, statements, parameters, verbosity) 
    194188 
    195  
    196189def _destroy_test_user(cursor, parameters, verbosity): 
    197190    if verbosity >= 2: 
    …… 
    202195    ] 
    203196    _execute_statements(cursor, statements, parameters, verbosity) 
    204  
    205197 
    206198def _execute_statements(cursor, statements, parameters, verbosity): 
    …… 
    215207            raise 
    216208 
    217  
    218209def _test_database_name(settings): 
    219210    name = TEST_DATABASE_PREFIX + settings.DATABASE_NAME 
    …… 
    226217        raise 
    227218    return name 
    228  
    229219 
    230220def _test_database_create(settings): 
    …… 
    241231    return name 
    242232 
    243  
    244233def _test_user_create(settings): 
    245234    name = True 
    …… 
    255244    return name 
    256245 
    257  
    258246def _test_database_user(settings): 
    259247    name = TEST_DATABASE_PREFIX + settings.DATABASE_NAME 
    …… 
    267255    return name 
    268256 
    269  
    270257def _test_database_passwd(settings): 
    271258    name = PASSWORD 
    …… 
    279266    return name 
    280267 
    281  
    282268def _test_database_tblspace(settings): 
    283269    name = TEST_DATABASE_PREFIX + settings.DATABASE_NAME 
    …… 
    291277    return name 
    292278 
    293  
    294279def _test_database_tblspace_tmp(settings): 
    295280    name = TEST_DATABASE_PREFIX + settings.DATABASE_NAME + '_temp' 

  • django/trunk/django/test/utils.py

    r5967 r5981  
    11import sys, time 
    22from django.conf import settings 
    3 from django.db import connection, backend, get_creation_module 
     3from django.db import connection, get_creation_module 
    44from django.core import mail 
    55from django.core.management import call_command 
    …… 
    9898    creation_module = get_creation_module() 
    9999    if hasattr(creation_module, "create_test_db"): 
    100         creation_module.create_test_db(settings, connection, backend, verbosity, autoclobber) 
     100        creation_module.create_test_db(settings, connection, verbosity, autoclobber) 
    101101        return 
    102102 
    …… 
    166166    creation_module = get_creation_module() 
    167167    if hasattr(creation_module, "destroy_test_db"): 
    168         creation_module.destroy_test_db(settings, connection, backend, old_database_name, verbosity) 
     168        creation_module.destroy_test_db(settings, connection, old_database_name, verbosity) 
    169169        return 
    170170