mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-27 03:25:58 +00:00
Code Issues 30 Releases Wiki Activity
7,470 Commits 28 Branches 426 Tags 668 MiB
f9ead3fe42
Commit Graph

11 Commits

Author SHA1 Message Date
Russell Keith-Magee
5e2d38465a Fixed #10847 -- Modified handling of extra() to use a masking strategy, rather than last-minute trimming. Thanks to Tai Lee for the report, and Alex Gaynor for his work on the patch. 
This enables querysets with an extra clause to be used in an __in filter; as a side effect, it also means that as_sql() now returns the correct result for any query with an extra clause.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-04-30 15:40:09 +00:00
Russell Keith-Magee
58ea6d4561 Fixed #10256 -- Corrected the interaction of extra(select=) with values() and values_list() where an explicit list of columns is requested. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9837 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-02-16 12:28:37 +00:00
Malcolm Tredinnick
baa960209f Fixed Queryset.dates() in the presence of extra-select columns. 
Any extra(select=...) columns can be ignored in the SQL for dates, since we are
only interested in extracting distinct date values. We were previously
including them by accident and it was generating incorrect SQL.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@9091 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-28 04:36:10 +00:00
Malcolm Tredinnick
7bc5db3a88 Changed the tests added in r8898 very slightly so that they don't return 
unintended results. Doctests aren't self-contained yet when run as part of
the full suite. Refs #5624, #8835.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 17:59:09 +00:00
Malcolm Tredinnick
61cc4a1eee Fixed #8819 -- Don't include two copies of extra-select columns in the query. 
This was triggered by r8794, but was, in fact, fairly fragile before then. The
current fix is the correct way we should be doing this.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8898 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-09-03 03:48:25 +00:00
Malcolm Tredinnick
65c0846c45 Updated a few save() methods on models to accept force_insert and force_update 
parameters. Required as a consequence of [8670] (so they can be used with
create()).


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8673 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-28 19:28:17 +00:00
Malcolm Tredinnick
556fbc78a6 Fixed #8039 -- Make sure that extra(tables=...) tables are always included in 
the resulting SQL. Previously, an optimisation was removing them in some corner
cases.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8429 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-17 22:38:36 +00:00
Malcolm Tredinnick
e3ea9ddef5 Added a test to show that #8063 doesn't seem to be an issue any longer. 
Refs #8063.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8427 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-17 20:18:52 +00:00
Malcolm Tredinnick
2c4b13cbe7 Changed the (internal) way extra(select=.., select_params=...) handling is done 
so that parameters stay with their select items. This means that merging and
trimming of those items is handled correctly.

Refs #7957, #7961. Fixed #8191.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-08-17 20:07:59 +00:00
Ian Kelly
0650bab492 Fixed a test case using extra sql that didnt fit Oracle syntax. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7832 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-07-03 19:02:43 +00:00
Malcolm Tredinnick
5da47e43c7 Fixed #7314 -- Changed the way extra() bits are handled when QuerySets are merged. 
Also added a section to the documentation to indicate why it's probably not a
good idea to rely on this feature for complex stuff. Garbage in, garbage out
applies even to Django code.

Thanks to erik for the test case for this one.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@7791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2008-06-30 06:24:21 +00:00