mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-21 04:39:17 +00:00
Code Issues 32 Releases Wiki Activity
13,153 Commits 30 Branches 459 Tags
Commit Graph

223 Commits

Author SHA1 Message Date
Anssi Kääriäinen
fa1083fb0c [1.5.x] Fixed Oracle failure caused by None converted to '' in select_related case 
Backpatch of c159d9cec0baab7bbd04d5d51a92a51e354a722a
 2012-10-27 19:25:14 +03:00
Anssi Kääriäinen
7de439f32d Fixed #19187 -- Raise consistent error from qs.values().delete() 2012-10-25 17:16:56 +03:00
Jan Bednařík
b87e2f46c8 Fixed #19151 -- Added missing methods to EmptyQuerySet. 
Added values() and values_list() methods to EmptyQuerySet.
 2012-10-21 00:19:38 +02:00
Anssi Kääriäinen
1cd6e04cd4 Fixed #18676 -- Allow fast-path deletion of objects 
Objects can be fast-path deleted if there are no signals, and there are
no further cascades. If fast-path is taken, the objects do not need to
be loaded into memory before deletion.

Thanks to Jeremy Dunck, Simon Charette and Alex Gaynor for reviewing
the patch.
 2012-09-28 18:16:08 +03:00
Carl Meyer
4e9a74b81d Revert "Fixed #16865 -- Made get_or_create use read database for initial get query." 
Thanks to Jeremy Dunck for pointing out the problem with this change. If in a
single transaction, the master deletes a record and then get_or_creates a
similar record, under the new behavior the get_or_create would find the record
in the slave db and fail to re-create it, leaving the record nonexistent, which
violates the contract of get_or_create that the record should always exist
afterwards. We need to do everything against the master here in order to ensure
correctness.

This reverts commit 901af865505310a70dd02ea5b3becbf45819b652.
 2012-09-19 11:15:12 -06:00
Carl Meyer
901af86550 Fixed #16865 -- Made get_or_create use read database for initial get query. 
Thanks Rick van Hattem for the report and trbs for the patch.
 2012-09-19 10:06:53 -06:00
Malcolm Tredinnick
c4aa26a983 Internal refactoring; moving LOOKUP_SEP up one level. 
In an ideal world, nothing except django.db.models.query should have to
import stuff from django.models.sql.*. A few things were needing to get
hold of sql.constants.LOOKUP_SEP, so this commit moves it up to
django.db.models.constants.LOOKUP_SEP.

There are still a couple of places (admin) poking into sql.* to get
QUERY_TERMS, which is unfortunate, but a slightly different issue and
harder to adjust.
 2012-09-08 19:51:36 -04:00
Alex Gaynor
b7c3b044fc Cleaned up the implementation of in_bulk 2012-08-24 16:08:16 -07:00
Aymeric Augustin
0c198b85a3 [py3] Replace filter/lambda by list comprehensions 
This is more idiomatic and avoids returning a list on Python 2 and
an iterator on Python 3.
 2012-08-14 14:31:06 +02:00
Claude Paroz
15fffcc751 [py3] Fixed reraising of exceptions 
reraise with second argument to None is not supported.
 2012-08-11 23:46:23 +02:00
Alex Gaynor
4c97101b1f remove a bunch of unnescesarry iterkeys() calls 2012-08-08 07:33:15 -07:00
Claude Paroz
576ec12f8e [py3] Replaced __nonzero__ by __bool__ 
Of course, __nonzero__ alias has been kept for Python 2 compatibility.
 2012-08-08 15:02:31 +02:00
Aymeric Augustin
ee191715ea [py3] Fixed access to dict keys/values/items. 2012-08-07 12:00:22 +02:00
Aymeric Augustin
56dbe924a6 [py3] Removed longs. 2012-07-22 09:29:53 +02:00
Aymeric Augustin
d796c94b03 [py3] Used six.reraise wherever necessary. 2012-07-22 09:29:52 +02:00
Anssi Kääriäinen
29132ebdef Fixed #17788 -- Added batch_size argument to qs.bulk_create() 
The qs.bulk_create() method did not work with large batches together
with SQLite3. This commit adds a way to split the bulk into smaller
batches. The default batch size is unlimited except for SQLite3 where
the batch size is limited to 999 SQL parameters per batch.

Thanks to everybody who participated in the discussions at Trac.
 2012-07-17 15:24:41 +03:00
Anssi Kääriäinen
b6c356b7bb Fixed #17485 -- Made defer work with select_related 
This commit tackles a couple of issues. First, in certain cases there
were some mixups if field.attname or field.name should be deferred.
Field.attname is now always used.

Another issue tackled is a case where field is both deferred by
.only(), and selected by select_related. This case is now an error.

A lot of thanks to koniiiik (Michal Petrucha) for the patch, and
to Andrei Antoukh for review.
 2012-06-26 18:08:42 +03:00
Aymeric Augustin
1e6c3368f2 Fixed #18177 -- Cached known related instances. 
This was recently fixed for one-to-one relations; this patch adds
support for foreign keys. Thanks kaiser.yann for the report and
the initial version of the patch.
 2012-05-24 13:25:01 +02:00
Claude Paroz
169b1a404c Replaced foo.next() by next(foo). 
This new syntax for next() has been introduced in Python 2.6 and is
compatible with Python 3.
 2012-05-10 20:15:49 +02:00
Claude Paroz
3904b74a3f Fixed #18013 -- Use the new 'as' syntax for exceptions. 
Thanks Clueless for the initial patch.
Note that unittest has been purposely left out (external package only used by Python 2.6).
 2012-04-29 20:57:15 +02:00
Anssi Kääriäinen
d5b93d3281 Fixed #10494 -- Added kwargs to QuerySet.get() error message in the case no objects were found. 
Thanks brondsem for the report, Szymon Pyzalski for the patch and oinopion for review.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-20 11:09:32 +00:00
Aymeric Augustin
632b6a1a73 Fixed #17439 -- Prevented spurious queries for missing objects after prefetch_related has run. 
That affects nullable foreign key, nullable one-to-one, and reverse one-to-one relations.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@17899 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-04-11 21:11:22 +00:00
Karen Tracey
9d98b9eb4b Fix #17876: Corrected an exception (regression) raised where select_realted and only is used on a proxy model. Thanks milosu and charettes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-03-12 22:33:18 +00:00
Luke Plant
de9942a667 Fixed #17668 - prefetch_related does not work in in_bulk 
Thanks to gurets for the report, and akaariai for the initial patch.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17600 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-02-28 19:34:04 +00:00
Julien Phalip
31b1cbc623 Fixed #16340 -- Made get_or_create() re-raise any IntegrityError with its original traceback. Thanks to d0ugal and Jonas Obrist. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17333 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2012-01-02 21:30:47 +00:00
Ramiro Morales
287565779d Added support for modifying the effect of `DISTINCT` clauses so they 
only consider some fields (PostgreSQL only).

For this, the ``distinct()`` QuerySet method now accepts an optional
list of model fields names and generates ``DISTINCT ON`` clauses on
these cases. Thanks Jeffrey Gelens and Anssi Kääriäinen for their work.

Fixes #6422.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17244 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-22 20:42:40 +00:00
Adrian Holovaty
073d987a84 Fixed #16818 -- Fixed ORM bug with many-to-many add() method where it wasn't committing the change. Thanks, pressureman and kmtracey 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17189 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-09 23:16:56 +00:00
Adrian Holovaty
5f9dbef4bb Fixed #17335 -- Added supports_select_related hook for django-nonrel. Thanks, jonash 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17170 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-12-05 23:11:43 +00:00
Luke Plant
f2ebb169f9 Small code clarification in prefetch_related code using better variable names 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17162 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-11-29 12:50:10 +00:00
Luke Plant
64da8eec30 Fixed #17014 - added protection against infinite recursion. 
Thanks to akaariai for the report and tests.

No tests have been added, since unittests for termination are basically
impossible, and the failure condition will take down the developer's machine
in this case. It has been tested against the cases in #17014.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16940 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 16:06:02 +00:00
Luke Plant
052a011ee6 Fixed #17003 - prefetch_related should support foreign keys/one-to-one 
Support for `GenericForeignKey` is also included.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-07 16:05:53 +00:00
Luke Plant
662eea116f Fixed #16937 - added QuerySet.prefetch_related to prefetch many related objects. 
Many thanks to akaariai for lots of review and feedback, bug finding,
additional unit tests and performance testing.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-05 23:14:52 +00:00
Luke Plant
d30fbf8b78 Fixed #16902 - select_related() results in a poor perfomance 
Thanks to ivan_virabyan for the great patch!

(For the record, some very small tweaks were made by me).

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16929 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-10-05 22:56:09 +00:00
Alex Gaynor
345c4c4629 Remove a bunch of deadcode/dead imports. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 22:31:38 +00:00
Alex Gaynor
b45a4acf6f Ensure bulk_create returns the right value if the argument is an empty list. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 21:46:59 +00:00
Alex Gaynor
f2bc919ec0 Ensure bulk_create returns what it is supposed to. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-10 21:44:57 +00:00
Alex Gaynor
7deb25b8dd Fixed #7596. Added Model.objects.bulk_create, and make use of it in several places. This provides a performance benefit when inserting multiple objects. THanks to Russ for the review, and Simon Meers for the MySQl implementation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16739 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-09-09 19:22:28 +00:00
Jannis Leidel
50ed810c1f Fixed #16472 -- Removed stale code in the query code. Thanks, fva@chtd.org. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16562 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-29 09:40:09 +00:00
Jannis Leidel
24f4764a48 Fixed #16225 -- Removed unused imports. Many thanks to Aymeric Augustin for the work on the patch and Alex for reviewing. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16539 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-13 09:35:51 +00:00
Ramiro Morales
b2050ff546 Fixed #16409 -- Fixed an error condition when using QuerySet only()/defer() on the result of an annotate() call. Thanks jaklaassen AT gmail DOT com and Tai Lee for the reports and Tai for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16522 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-07-07 01:12:45 +00:00
Ramiro Morales
a8598c7de2 Fixed #11789 -- Fixed aggregates so it interacts with QuerySet none() in a way consistent with other empty query sets. Thanks alexr for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16254 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-05-21 16:54:25 +00:00
Jannis Leidel
c77372cad0 Fixed #14729 -- RawQuerySet.__repr__ fails when params passed as list. Thanks, intgr for ticket and accuser for patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16088 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-22 18:17:26 +00:00
Jannis Leidel
a845eba8dd Fixed #11283 -- Made sure that latest() clears previously specified ordering in a QuerySet. Thanks to benmoran, punteney, mk and and Julien Phalip. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16067 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-22 12:02:07 +00:00
Jacob Kaplan-Moss
8f0f73c7b8 Fixed #2705: added a select_for_update() clause to querysets. 
A number of people worked on this patch over the years -- Hawkeye, Colin Grady,
KBS, sakyamuni, anih, jdemoor, and Issak Kelly. Thanks to them all, and
apologies if I missed anyone.

Special thanks to Dan Fairs for picking it up again at the end and seeing this
through to commit.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16058 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-20 20:42:07 +00:00
Adrian Holovaty
d546179c71 Fixed incorrect usage of its in query.py docstring 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-04-11 20:27:53 +00:00
Adrian Holovaty
13864703bc Removed a bunch more Python 2.4 workarounds now that we don't support that version. Refs #15702 -- thanks to jonash for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-28 02:11:19 +00:00
Adrian Holovaty
15295a852f Fixed #15647 -- Changed in_bulk() not to type check its input, which now allows for passing any iterable. Thanks, calvinspealman 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-03-26 17:50:10 +00:00
Russell Keith-Magee
337a6bc0f6 Fixed #15283 -- Made a minor performance tweak to __iter__. Thanks to lanyjie for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15491 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-12 05:23:41 +00:00
Russell Keith-Magee
340eaded4e Fixed #15116 -- Strip ordering clause from in_bulk() queries, since ordering information will be lost. Thanks to lamby for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15457 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-02-08 14:05:38 +00:00
Russell Keith-Magee
ae8ff5f476 Fixed #14707 -- Relax the protections on aggregate naming collisions when a ValuesQuerySet removes the colliding name. Thanks to Andy McKay for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@15223 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2011-01-16 08:03:25 +00:00