test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Tweaked test added in r16873 so it also works with Oracle. 

* Changed invalid fixture from trying to insert a NULL value in a
  null=False CharField to try with a DateTimeField instead because our
  Oracle backend allows NULLs for CharFields than can be blank and that
  insert wouldn't generate an error.

* cx_Oracle raises a
  `DatabaseError: Could not load fixtures.Article(pk=1): ORA-01407: cannot update ("USER_DEFAULT"."FIXTURES_ARTICLE"."PUB_DATE") to NULL'`
  instead of an IntegrityError like the rest of the DB-API drivers we
  support, changed the error message we test for to start simply with
  'Error' to catch both messages.

  We might want to consider converting DatabaseError to IntegrityError
  in the backend when the error code is ORA-1407.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Ramiro Morales 2011-10-17 03:29:07 +00:00
parent ab72e6bdd1
commit da5c766dbb
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/modeltests/fixtures/fixtures/invalid.json
View File

@ -3,8 +3,8 @@
"pk": "1", "pk": "1",
"model": "fixtures.article", "model": "fixtures.article",
"fields": { "fields": {
"headline": null, "headline": "Breaking news",
"pub_date": "2006-06-16 13:00:00" "pub_date": null
} }
} }
] ]

2
tests/modeltests/fixtures/tests.py
View File

@ -269,7 +269,7 @@ class FixtureLoadingTests(TestCase):
new_io = StringIO.StringIO() new_io = StringIO.StringIO()
management.call_command('loaddata', 'invalid.json', verbosity=0, stderr=new_io, commit=False) management.call_command('loaddata', 'invalid.json', verbosity=0, stderr=new_io, commit=False)
output = new_io.getvalue().strip().split('\n') output = new_io.getvalue().strip().split('\n')
self.assertRegexpMatches(output[-1], "IntegrityError: Could not load fixtures.Article\(pk=1\): .*$") self.assertRegexpMatches(output[-1], "Error: Could not load fixtures.Article\(pk=1\): .*$")
def test_loading_using(self): def test_loading_using(self):
# Load db fixtures 1 and 2. These will load using the 'default' database identifier explicitly # Load db fixtures 1 and 2. These will load using the 'default' database identifier explicitly