mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-09-24 19:23:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
19586 commits 30 branches 456 tags 743 MiB
Commit graph

326 commits

Author SHA1 Message Date
Russell Keith-Magee
57311b5998 Fixed #7256 -- Corrected queryset code to return the correct set of columns when the query has an empty values() clause as well as extra selects from an extra() clause. Thanks to Nicolas Lara for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-15 06:24:41 +00:00
Jacob Kaplan-Moss
b5f92938ab Fixed #7298: prevent update() on sliced QuerySet since UPDATE doesn't reliably support LIMIT/OFFSET. Thanks, George Vilches. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7601 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-09 16:17:54 +00:00
Malcolm Tredinnick
2061b3f3ca Undo [7474]. I didn't think it through nearly carefully enough. 
This means that all model construction now goes through the __init__() method
again.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7504 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-29 01:19:42 +00:00
Malcolm Tredinnick
a97f690e5d Added the ability to pickle and unpickle QuerySets and Query classes. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7499 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-28 14:14:41 +00:00
Malcolm Tredinnick
db80f57c6e ValuesQuerySets (and subclasses) were inadvertently not caching their results. 
Fixed.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7497 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-28 12:09:23 +00:00
Adrian Holovaty
a209115969 Fixed a bug with the new QuerySet update() method where it wasn't committing the transaction (on Postgres, at least) 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7487 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-28 00:58:21 +00:00
Malcolm Tredinnick
9c52d56f6f Merged the queryset-refactor branch into trunk. 
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.

Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-04-27 02:50:16 +00:00
Malcolm Tredinnick
1b331f6c1e Fixed #6641 -- If we lose a race when creating a new object in get_or_create, 
re-get the result from the database and return that. Thanks, Jeff Guinness and
Timothée Peignier.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7289 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-03-18 14:08:40 +00:00
Malcolm Tredinnick
805c364fcf Fixed #3511 -- Changed QuerySet.get() to return a MultipleObjectsReturned exception, rather than an assertion error. Thanks, Gary Wilson and cheeming. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6838 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-12-02 18:21:07 +00:00
Jacob Kaplan-Moss
960c1263b6 Fixed #5559: instances sent via post-save signals no longer have pks of None. Thanks, Joseph Kocherhans. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@6411 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-24 18:27:42 +00:00
Matt Boersma
a6b1d65e33 Fixed #5226. Now we check the Oracle version and give an explicit 
error when we encounter a regex operator that isn't supported on 9i or 
earlier.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@6198 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-09-14 18:26:07 +00:00
Adrian Holovaty
14db37319b Refactored OPERATOR_MAPPING so that it exists as django.db.connection.operators instead of django.db.backend.OPERATOR_MAPPING. Refs #5106 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5982 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-20 03:26:55 +00:00
Adrian Holovaty
4c5248f98f Refactored get_field_cast_sql() to DatabaseOperations.field_cast_sql(). Refs #5106 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-20 03:03:40 +00:00
Adrian Holovaty
e13ea3c70d Refactored get_query_set_class() to DatabaseOperations.query_set_class(). Also added BaseDatabaseFeatures.uses_custom_queryset. Refs #5106 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-20 02:39:05 +00:00
Adrian Holovaty
1a8f9b2b97 Implemented BaseDatabaseFeatures and changed all code to access it -- connection.features.foo instead of backend.foo 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-20 02:20:33 +00:00
Adrian Holovaty
221f99ed58 Refactored quote_name() to DatabaseOperations.quote_name(). Refs #5106 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-20 01:03:33 +00:00
Adrian Holovaty
c44fb66551 Refactored get_random_function_sql() to DatabaseOperations.random_function_sql(). Refs #5106 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5962 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-20 00:04:20 +00:00
Adrian Holovaty
d3e69c3a47 Refactored get_limit_offset_sql() to DatabaseOperations.limit_offset_sql(). Refs #5106 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5959 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-19 23:24:59 +00:00
Adrian Holovaty
5a6426448f Refactored get_fulltext_search_sql() to DatabaseOperations.fulltext_search_sql(). Refs #5106 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5957 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-19 23:13:06 +00:00
Adrian Holovaty
29f67dce9e Refactored get_datetime_cast_sql() to DatabaseOperations.datetime_cast_sql(). Refs #5106 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-19 22:55:05 +00:00
Adrian Holovaty
5f51f0524a Refactored get_date_trunc_sql() to DatabaseOperations.date_trunc_sql(). Refs #5106 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-19 22:47:43 +00:00
Adrian Holovaty
aab04a4c2f Refactored get_date_extract_sql() to DatabaseOperations.date_extract_sql(). Refs #5106 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-19 22:40:06 +00:00
Malcolm Tredinnick
7e8efcd4d9 Fixed #5087 -- Fixed support for TextField filtering with Oracle. Thanks, Ian Kelly. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-19 12:37:00 +00:00
Gary Wilson Jr
049212e950 Fixed #5115 -- Fixed QuerySet slices to allow longs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-08-08 21:09:55 +00:00
Adrian Holovaty
5b8d2c9f0d Fixed bug with using values() and extra(select) in the same QuerySet, with a select dictionary containing more than a few elements. This bug was identified in unit test from [5767]. The problem was that we were relying on the dictionary's .items() ordering, which is undefined 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-27 22:07:42 +00:00
Malcolm Tredinnick
953badbea5 Merged Unicode branch into trunk (r4952:5608). This should be fully 
backwards compatible for all practical purposes.

Fixed #2391, #2489, #2996, #3322, #3344, #3370, #3406, #3432, #3454, #3492, #3582, #3690, #3878, #3891, #3937, #4039, #4141, #4227, #4286, #4291, #4300, #4452, #4702


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-07-04 12:11:04 +00:00
Jacob Kaplan-Moss
24512a74be Fixed #1465: added support for regex lookups. Thanks, Tom Tobin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5555 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-27 18:58:10 +00:00
Malcolm Tredinnick
ac64e91a0c Merged boulder-oracle-sprint branch (r3965:5512) back into trunk. All 
expected tests pass for all databases.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5519 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-23 14:16:00 +00:00
Malcolm Tredinnick
08aa5c585b Fixed #4607 -- Tweaked checks for features missing in Python 2.3 to not assume 
things Python does not guarantee. Patch from SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5514 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-06-23 03:18:22 +00:00
Jacob Kaplan-Moss
bf2e62aa3c Fixed #3050: you can now use extra(select=...) with values(). Thanks, Honza Kral 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5385 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-31 02:22:41 +00:00
Malcolm Tredinnick
1c53661bd1 Moved generic relations into django.contrib.contenttypes, since it depends on 
that to work. Backwards incompatible change.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5172 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-08 10:59:35 +00:00
Adrian Holovaty
1889db475d Fixed comma splice in error message introduced in [5133] 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5154 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-06 04:12:08 +00:00
Malcolm Tredinnick
d943f5ae92 Fixed #4130 -- Added more self-explanatory error message when a typo is made in 
a queryset field argument.

We may need to fine-tune the error message based on experience down the line,
but this stands as an improvement on its own. Thanks, Ned Batchelder.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-05-01 03:21:54 +00:00
Adrian Holovaty
4ee7a7be95 Negligible space changes to django/db/models/query.py 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-09 15:35:19 +00:00
Russell Keith-Magee
bbeb62c9af Backwards-incompatible change -- Removed LazyDate helper class. To preserve existing functionality, query arguments can now be callable. Callable query arguments are evaluated with the query is evaluated. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-04-09 13:28:09 +00:00
Malcolm Tredinnick
858ac05802 Fixed #2351 -- Fixed problem with using ".count" attribute of QuerySets in 
templates.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4772 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-22 03:00:12 +00:00
Russell Keith-Magee
55a67ae3f0 Fixed #3738 -- Minor inline documentation fix. Thanks, Simon. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4754 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-03-20 11:09:40 +00:00
Jacob Kaplan-Moss
4477f50f0b Added a "depth" argument to select_related() to control how many "levels" of relations select_related() is willing to follow (refs #3275). 
Also added unit tests for select_related().

git-svn-id: http://code.djangoproject.com/svn/django/trunk@4645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-28 15:24:05 +00:00
Jacob Kaplan-Moss
f2aa1b93e0 Fixed silly typo in [4651]. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4563 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-23 23:05:25 +00:00
Jacob Kaplan-Moss
16bd0aa991 Fixed #3541: queryset.count() now respects the queryset cache. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4561 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-23 20:58:28 +00:00
Adrian Holovaty
4c4209b144 Changed __year lookup to use a BETWEEN SQL statement instead of comparing the result of EXTRACT(year). This should be more efficient. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4505 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-14 06:32:32 +00:00
Malcolm Tredinnick
d123588184 #fixed #2256 -- Made count() interact with slicing on QuerySets. Patch from 
SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4488 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-12 00:16:17 +00:00
Adrian Holovaty
007f17d63e Fixed #3463 -- EmptyQuerySet's iterator() now returns a generator. Thanks, Gary Wilson 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4475 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-10 05:38:38 +00:00
Malcolm Tredinnick
e57ce6b157 Fixed #2348 -- Improved error reporting when query filter arguments are 
misspelt. Variation on a patch from Karen Tracey.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@4470 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-02-10 03:39:56 +00:00
Russell Keith-Magee
12ad69c0b4 Fixed #3215, #3081, #2749 -- Fixed problem with mistaken deletion of objects when a GenericRelation is involved. Thanks to Thomas Steinacher for helping to narrow down the problem (#3215), and Alex Dedul (#3081) for the starting point of a working patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4428 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-01-25 11:24:17 +00:00
Adrian Holovaty
13280259a8 Fixed #3283 -- Added support for empty QuerySets via none() method. Thanks for the patch, medhat 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4394 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-01-23 02:11:08 +00:00
Russell Keith-Magee
ddb9b7d57a Fixed #2473 -- Added special case for '__in=[]' (empty set) queries, because 'WHERE attr IN ()' is invalid SQL on many backends. Thanks, Gary Wilson. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@4283 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2007-01-04 04:00:16 +00:00
Russell Keith-Magee
fbbbf8b9a1 Fixes #2737 -- Added code to allow None as a query value for __exact queries, raising an error otherwise. __exact=None is interpreted as the SQL 'value = NULL'. This fixes some minor problems with queries on unsaved objects with related object sets, and stops queries with a value of None being outright ignored (even if they reference an unknown attribute). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-10-14 02:48:05 +00:00
Russell Keith-Magee
0c41869e6c Made `pk` a generic expansion for the primary key, rather than just an expansion for __id__exact. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3826 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-09-25 13:49:01 +00:00
Adrian Holovaty
be2524182b Fixed #2379 -- Fixed 'search' DB lookup parameter, which was broken by [3248]. Thanks, Tim Keating 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@3400 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2006-07-20 20:13:35 +00:00