mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-25 02:26:12 +00:00
Code Issues 25 Releases Wiki Activity
9,954 Commits 28 Branches 426 Tags 666 MiB
afd040d4d3
Commit Graph

96 Commits

Author SHA1 Message Date
Russell Keith-Magee
afd040d4d3 Updated test assertions that have been deprecated by the move to unittest2. In summary, this means: 
assert_ -> assertTrue
 assertEquals -> assertEqual
 failUnless -> assertTrue

For full details, see http://www.voidspace.org.uk/python/articles/unittest2.shtml#deprecations

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15728 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 15:04:39 +00:00
Russell Keith-Magee
b7c41c1fbb Fixed #12252 -- Ensure that queryset unions are commutative. Thanks to benreynwar for the report, and draft patch, and to Karen and Ramiro for the review eyeballs and patch updates. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15726 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-03 13:51:54 +00:00
Carl Meyer
227c5e80db Fixed #11319 - Added lookup support for ForeignKey.to_field. Also reverted no-longer-needed model formsets workaround for lack of such support from r10756. Thanks Russell and Alex for review. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15303 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-25 03:14:28 +00:00
Russell Keith-Magee
5502fa5980 Refs #14661 -- Corrected (well... hacked around) a test failure under MySQL/MyISAM with the queries regression test. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15238 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-18 16:42:24 +00:00
Ramiro Morales
a360240c56 Fixed a couple of tests migrated to unit tests in r14279 so they actually and correctly exercise the functionality under test. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-12-18 23:03:23 +00:00
Alex Gaynor
678f626c24 Fixed a suite of errors in the ORM -- a) fixed calling values_list().values_list() and changing whether the results are flat, b) fixed an issue with fields on the left-hand side of what becomes the HAVING clause not being included in the GROUP BY clause, and c) fixed a bug with fields from values() calls not being included in the GROUP BY clause. This fixed the recent test failures under postgresql. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-26 14:24:08 +00:00
Alex Gaynor
8da8d6c586 Added a test for using an __in lookup with a ValueListQueryset from a none() call. Refs #14622. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-11-16 02:33:51 +00:00
Ramiro Morales
cfbba28c39 Fixed errors introduced in r14279 when running Django tests under Python < 2.6. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14287 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-19 17:27:38 +00:00
Ramiro Morales
bdaaac1254 Converted queries tests from doctests to unittests. 
Thanks Russell and Alex for reviews and suggestions.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14279 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-19 04:07:22 +00:00
Ramiro Morales
e1182306fd Fixed a small typo introduced in r14139. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-19 00:14:41 +00:00
Ramiro Morales
08d14925c9 Fixed #12192 -- Don't execute any DB query when the QS slicing being performed 
will result in use of LIMIT 0. Thanks Suor for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@14204 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-13 23:36:16 +00:00
Russell Keith-Magee
121d2e3678 Fixed #12991 -- Added unittest2 support. Thanks to PaulM for the draft patch, and to Luke, Karen, Justin, Alex, Łukasz Rekucki, and Chuck Harmston for their help testing and reviewing the final patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14139 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-11 12:55:17 +00:00
Alex Gaynor
3234c7a123 Fixed #14011 -- Doing a subquery with __in and an EmptyQuerySet no longer raises an Exception. This is actually just a test for this, it was fixed by [14084]. Thanks to skatei for the report and mk for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14086 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 16:51:34 +00:00
Alex Gaynor
560fedde4c Fixed #14366 -- Model.objects.none().values() now correctly returns a QuerySet with no items, rather than raising an Exception. Thanks to Carl Meyer for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14084 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-10-09 16:45:58 +00:00
Ian Kelly
320c46999c Fixed #14244: Allow lists of more than 1000 items to be used with the 'in' lookup in Oracle, by breaking them up into groups of 1000 items and ORing them together. Thanks to rlynch for the report and initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-09-16 19:53:41 +00:00
Russell Keith-Magee
5211f48ae3 Fixed #12164 -- Removed the Python 2.3 compatibility imports and workarounds. Thanks to timo and claudep for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@13094 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-05-04 14:00:30 +00:00
Russell Keith-Magee
9ac4d2fc61 Fixed a test failure under Postgres caused by primary key sequence allocation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-15 14:43:40 +00:00
Russell Keith-Magee
e93f56b174 Fixed #13227 -- Ensure that the query cache is flushed when a QuerySet is deepcopied, avoiding problems when an evaluated queryset is used as a subquery. Thanks to claudep for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12970 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-13 15:18:10 +00:00
Russell Keith-Magee
82efb48403 Fixed #12328 -- Corrected the handling of subqueries with ordering and slicing, especially when used in delete subqueries. Thanks to Walter Doekes for the report. 
This fixes a feature that isn't available under MySQL and Oracle (Refs #10099).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@12912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-04-04 17:05:43 +00:00
Russell Keith-Magee
b31b2d4da3 Fixed #13227 -- Modified ForeignKeys to fully honor the db_prep/prep separation introduced by multidb. This was required to ensure that model instances aren't deepcopied as a result of being involved in a filter clause. Thanks to claudep for the report, and Alex Gaynor for the help on the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12865 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-27 15:16:27 +00:00
Karen Tracey
9150fb6b0c Fixed #12239: Fixed results of gte and lt queries when comparing floats to integer field values. 
Thanks waverider, aroy, SmileyChris, and pmclanahan.



git-svn-id: http://code.djangoproject.com/svn/django/trunk@12819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-20 17:56:22 +00:00
Russell Keith-Magee
9f6a82fafb Fixed #13156 -- Ensure that exists() queries are as fast as they can be. Thanks to Jerome Leclanche for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12810 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-03-20 10:37:57 +00:00
Adrian Holovaty
2dd9a85819 Fixed #7235 -- EmptyQuerySet no longer raises and exception when it's filter()ed (along with some other QuerySet methods). Thanks, taylormarshall 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12147 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2010-01-09 21:27:39 +00:00
Russell Keith-Magee
ff60c5f9de Fixed #1142 -- Added multiple database support. 
This monster of a patch is the result of Alex Gaynor's 2009 Google Summer of Code project.
Congratulations to Alex for a job well done.

Big thanks also go to:
 * Justin Bronn for keeping GIS in line with the changes,
 * Karen Tracey and Jani Tiainen for their help testing Oracle support
 * Brett Hoerner, Jon Loyens, and Craig Kimmerer for their feedback.
 * Malcolm Treddinick for his guidance during the GSoC submission process.
 * Simon Willison for driving the original design process
 * Cal Henderson for complaining about ponies he wanted.

... and everyone else too numerous to mention that helped to bring this feature into fruition.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@11952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-22 15:18:51 +00:00
Russell Keith-Magee
77755aa5a0 Fixed #12242 -- Corrected a problem with masking extra selects() in a DateQuerySet. Thanks to Alex Gaynor for his help debugging this one. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11748 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-19 04:35:53 +00:00
Matt Boersma
e0ce9d76e1 Fixed an assumed ordering in the queries regression tests by making it explicit. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11474 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-08-20 16:05:25 +00:00
Brian Rosner
89df572c47 Fixed #11274 -- Corrected doctests to not cause test failures due to missing newlines. Thanks Honza Kral. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-07 18:07:53 +00:00
Russell Keith-Magee
151d88af4e Fixed #11082 -- Ensured that subqueries used in an exclude(X__in=) clause aren't pre-evaluated. Thanks to Henry Andrews for the report, and clement for the fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-06 13:35:33 +00:00
Jacob Kaplan-Moss
c00e8d2064 Added a QuerySet.ordered property to check if a queryset is already ordered. Refs #10163. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-22 22:16:19 +00:00
Malcolm Tredinnick
50dbda9a3e Added a test from Jamie Gennis to ensure #9848 doesn't reappear. 
The bug itself was fixed at some point in the past months (there have
been a few improvements to update() recently). Fixed #9848.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10528 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-12 00:13:03 +00:00
Malcolm Tredinnick
fd46f673bd Fixed #9926 -- Fixes for some select_related() situations. 
Using select_related(...) across a nullable relation to a multi-table
model inheritance situation no longer excludes results. Thanks to AdamG
for a test demonstrating part of the problem.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10136 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-24 03:59:38 +00:00
Ian Kelly
64ddff1b11 Fixed a false failure in the test suite when running Oracle. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10125 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-23 22:01:16 +00:00
Malcolm Tredinnick
255cb391d1 Fixed #10547 -- Worked around some odd behaviour in Python 2.3 and 2.4. 
Calling the super() version of __reduce__ in Model.__reduce__ led to infinite
loops in Python prior to 2.5. We don't do that any longer.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10099 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-20 01:37:11 +00:00
Malcolm Tredinnick
29050ef999 Fixed #5420 -- Added support for delayed loading of model fields. 
In extreme cases, some fields are expensive to load from the database
(e.g. GIS fields requiring conversion, or large text fields). This
commit adds defer() and only() methods to querysets that allow the
caller to specify which fields should not be loaded unless they are
accessed.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10090 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-19 09:06:04 +00:00
Malcolm Tredinnick
cd99c62e2d Fixed #10432 -- Handle all kinds of iterators in queryset filters. 
Only consumes the iterators once and works with Python 2.3.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-08 03:32:16 +00:00
Malcolm Tredinnick
851461aa72 Fixed #10181 -- Handle an EmptyResultSet exception case properly in nested querysets. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-02 06:08:02 +00:00
Malcolm Tredinnick
c6a404d1e9 Fixed insert/update handling when no database interaction is required. 
Fixed #10205 as part of this.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-01 01:56:59 +00:00
Malcolm Tredinnick
bbea457fbb Fixed #10202 -- Fixed another couple of slicing edge-cases with querysets. 
Patch from Alex Gaynor and Ramiro Morales.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9924 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-03-01 01:24:03 +00:00
Malcolm Tredinnick
415ffa8df5 Fixed #10028 -- Fixed a problem when ordering by related models. 
Some results were inadvertently being excluded if we were ordering across a
nullable relation which itself ordering by a non-nullable relation.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9916 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-02-28 02:59:40 +00:00
Malcolm Tredinnick
d579e716fe Fixed #9997 -- Fixed use of ValuesQuerySets as rvalues in filters. 
Previous behaviour was pretty stupid. Let's never speak of it again. New
behaviour both works and is documented.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9759 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-16 10:59:43 +00:00
Malcolm Tredinnick
c5bdfab9ae Fixed #9985 -- qs.values_list(...).values(...) was constructing incorrect SQL. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9717 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-08 05:49:03 +00:00
Malcolm Tredinnick
d068ad0c01 Using querysets as an rvalue in filter() calls was causing an unnecessary 
database query, due to a bool() call. This change stops that behaviour.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9715 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-08 05:16:21 +00:00
Malcolm Tredinnick
f747b61c20 Nested query support. 
This extends previous functionality that allowed passing Query objects as the
rvals to filters. You can now pass QuerySets, which requires less poking at
opaque attributes. See the documentation of the "__in" lookup type for the
details.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9701 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-05 11:47:48 +00:00
Malcolm Tredinnick
062a94ef45 Reconciling where- and having-clause behaviour. 
Extricated the code that works directly with SQL columns (standard
"where" stuff) from the the code that takes SQL fragments and combines
it with lookup types and values. The latter portion is now more
generally reusable. Any existing code that was poking at Query.having
will now break in very visible ways (no subtle miscalculations, which is
a good thing).

This patch, en passant, removes the existing "having" test, since the
new implementation requires more setting up than previously. The
aggregates support (currently in a separate codebase) has tests for this
functionality that work as a replacement for the removed test.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@9700 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-01-05 11:47:14 +00:00
Malcolm Tredinnick
a1cbeb9afb If an SQL query doesn't specify any ordering, avoid the implicit sort 
that happens with MySQL when a "GROUP BY" clause is included. This is a
backend-specific operation, so any other databases requiring similar
encouragement can have a function added to their own backend code.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9637 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-10 05:19:27 +00:00
Malcolm Tredinnick
33c0f0de67 This fixes a group of problems in the SQL created by QuerySet.exclude() when 
used in a few situations where NULL results can appear.

Fixed #8921 (the only ticket I know of that noticed any of these).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9590 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-08 02:39:51 +00:00
Malcolm Tredinnick
d4f0ae42a2 Fixed #9188 -- Fixed a case where we were generating syntactically invalid SQL in some exclude() queries. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9588 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-12-07 05:48:01 +00:00
Malcolm Tredinnick
3b5d975ff6 Fixed #9411 -- Changed the test from r9081 to be more robust across different database backends. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9254 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-24 06:24:04 +00:00
Ian Kelly
9a72913edd Fixed .distinct() not working with slicing in Oracle, due to the 
row numbers necessarily being distinct.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9221 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-10 17:15:58 +00:00
Malcolm Tredinnick
559aca7d78 A queryset that has had ordering removed (order_by()) can have ordering added 
again later (order_by('foo')). Or, at least, it can now. Thanks to Ilya
Novoselov for diagnosing the problem here.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9206 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-10-08 09:45:27 +00:00