diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-09-13 06:33:41 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-09-13 06:33:41 +0000 |
| commit | ff3f6df54c40aa76c2ef23d54d7f4b3c462538cf (patch) | |
| tree | b15eb50246227bf42326b614e2921d9ef5b3db6f /tests | |
| parent | 184a6435cd3e1945823ccb9e7692f3c6e3875411 (diff) | |
Fixed some more join and lookup tests.
git-svn-id: http://code.djangoproject.com/svn/django/branches/queryset-refactor@6121 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/modeltests/lookup/models.py | 2 | ||||
| -rw-r--r-- | tests/regressiontests/queries/models.py | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/tests/modeltests/lookup/models.py b/tests/modeltests/lookup/models.py index aa90d1e5ec..06070b9a01 100644 --- a/tests/modeltests/lookup/models.py +++ b/tests/modeltests/lookup/models.py @@ -258,7 +258,7 @@ TypeError: Cannot resolve keyword 'pub_date_year' into field. Choices are: id, h >>> Article.objects.filter(headline__starts='Article') Traceback (most recent call last): ... -TypeError: Cannot resolve keyword 'headline__starts' into field. Choices are: id, headline, pub_date +TypeError: Join on field 'headline' not permitted. # Create some articles with a bit more interesting headlines for testing field lookups: >>> now = datetime.now() diff --git a/tests/regressiontests/queries/models.py b/tests/regressiontests/queries/models.py index 38e89dc515..8a24160419 100644 --- a/tests/regressiontests/queries/models.py +++ b/tests/regressiontests/queries/models.py @@ -111,11 +111,9 @@ Bug #4464 >>> Item.objects.filter(tags__in=[t1, t2]).filter(tags=t3) [<Item: two>] -Bug #2080 -# FIXME: Still problematic: the join needs to be "left outer" on the reverse -# fk, but the individual joins only need to be inner. -# >>> Author.objects.filter(Q(name='a3') | Q(item__name='one')) -# [<Author: a3>] +Bug #2080, #3592 +>>> Author.objects.filter(Q(name='a3') | Q(item__name='one')) +[<Author: a1>, <Author: a3>] Bug #2939 # FIXME: ValueQuerySets don't work yet. |