mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 18:29:11 +00:00
Code Issues 32 Releases Wiki Activity

[soc2009/multidb] Corrected some test errors introduced by merging trunk. Patch from Russell Keith-Magee.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor 2009-12-15 17:58:04 +00:00
parent 255608f085
commit 5afff61b02
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
django/db/models/fields/__init__.py
View File

@ -1,5 +1,6 @@
import copy
import datetime
import decimal
import os
import re
import time

0
tests/modeltests/fixtures/fixtures/fixture6.default.json → tests/modeltests/fixtures/fixtures/db_fixture_1.default.json
View File

0
tests/modeltests/fixtures/fixtures/fixture7.default.json.gz → tests/modeltests/fixtures/fixtures/db_fixture_2.default.json.gz
View File

0
tests/modeltests/fixtures/fixtures/fixture8.nosuchdb.json → tests/modeltests/fixtures/fixtures/db_fixture_3.nosuchdb.json
View File

18
tests/modeltests/fixtures/models.py
View File

@ -262,28 +262,28 @@ Multiple fixtures named 'fixture5' in '...fixtures'. Aborting.
>>> management.call_command('flush', verbosity=0, interactive=False)
# Load fixtures 6 and 7. These will load using the 'default' database identifier implicitly
>>> management.call_command('loaddata', 'fixture6', verbosity=0)
>>> management.call_command('loaddata', 'fixture7', verbosity=0)
# Load db fixtures 1 and 2. These will load using the 'default' database identifier implicitly
>>> management.call_command('loaddata', 'db_fixture_1', verbosity=0)
>>> management.call_command('loaddata', 'db_fixture_2', verbosity=0)
>>> Article.objects.all()
[<Article: Who needs more than one database?>, <Article: Who needs to use compressed data?>, <Article: Python program becomes self aware>]
>>> management.call_command('flush', verbosity=0, interactive=False)
# Load fixtures 6 and 7. These will load using the 'default' database identifier explicitly
>>> management.call_command('loaddata', 'fixture6', verbosity=0, using='default')
>>> management.call_command('loaddata', 'fixture7', verbosity=0, using='default')
# Load db fixtures 1 and 2. These will load using the 'default' database identifier explicitly
>>> management.call_command('loaddata', 'db_fixture_1', verbosity=0, using='default')
>>> management.call_command('loaddata', 'db_fixture_2', verbosity=0, using='default')
>>> Article.objects.all()
[<Article: Who needs more than one database?>, <Article: Who needs to use compressed data?>, <Article: Python program becomes self aware>]
>>> management.call_command('flush', verbosity=0, interactive=False)
# Try to load fixture 8. This won't load because the database identifier doesn't match
>>> management.call_command('loaddata', 'fixture8', verbosity=0)
# Try to load db fixture 3. This won't load because the database identifier doesn't match
>>> management.call_command('loaddata', 'db_fixture_3', verbosity=0)
>>> Article.objects.all()
[<Article: Python program becomes self aware>]
>>> management.call_command('loaddata', 'fixture8', verbosity=0, using='default')
>>> management.call_command('loaddata', 'db_fixture_3', verbosity=0, using='default')
>>> Article.objects.all()
[<Article: Python program becomes self aware>]