summaryrefslogtreecommitdiff
path: root/django/db/models/sql
AgeCommit message (Collapse)Author
2010-04-30[1.1.X] Fixed #12851 -- Another attempt at fixing select_related() with ↵Russell Keith-Magee
inherited models, this time with only(). Thanks to phxx for the test case. Backport of r13059 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13060 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-30[1.1.X] Fixed #12851 -- Corrected the loading of values when ↵Russell Keith-Magee
select_related() is used on inherited models. Thanks to phxx for the report and test case. Backport of r13054 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13055 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-23[1.1.X] Fixed #11764 -- Added a missing set of parentheses in a call ↵Russell Keith-Magee
calculating the select_related tables. Thanks to aurelio for the report and original patch, and wogan for the updated patch. Backport of r13019 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13020 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-04[1.1.X] Fixed #12328 -- Corrected the handling of subqueries with ordering ↵Russell Keith-Magee
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). Backport of r12912 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12914 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-03[1.1.X] Fixed #12247 -- Corrected the way update queries are processed when ↵Russell Keith-Magee
the update only refers to attributes on a base class. Thanks to jsmullyan for the report, and matiasb for the fix. Backport of r12910 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31[1.1.X] Fixed #11916 -- Corrected handling of aggregation when there is a ↵Russell Keith-Magee
subquery provided in an extra(select=) clause. Thanks to jaklaassen@gmail.com for the report, and to tobias, paluh, Karen Tracey and Ian Kelly for their work on the fix. Backport of r12896 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-21[1.1.X] Fixed #12822: Don't copy the _aggregate_select_cache when cloning a ↵Karen Tracey
query set, as that can lead to incorrect SQL being generated for the query. Thanks to mat for the report and test, tobias for the fix, and Alex for review. r12830 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08[1.1.X] Fixed #12240 - select_related doesn't work correctly when mixing ↵Luke Plant
nullable and non-nullable keys Thanks to embe for report and Alex for fix. Backport of 12719 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12720 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07[1.1.X] Fixed #12876 -- Corrected a problem with recursive relations under ↵Russell Keith-Magee
deepcopy. Thanks to elachuni for the patch. Backport of r12700 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26[1.1.X] Fixed a bunch of Python 2.3 incompatibilities that had crept into ↵Karen Tracey
the 1.1.X branch. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23Fixed #12855 -- QuerySets? with extra where parameters now combine ↵Justin Bronn
correctly. Thanks, Alex Gaynor. Backport of r12502 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12507 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-10[1.1.X] Fixed #11535: Corrected SQL generated for queries involving generic ↵Karen Tracey
relations and ORed Q objects. Thanks to brianglass for report, tobias for fix and test, and Alex for review. r12405 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12406 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-01-29[1.1.X] Really this time -- fixed #12721: Ensured objects with generic ↵Karen Tracey
relations that use non-integer object ID fields can be deleted on PostgreSQL. Thanks much carljm for patch and Russ for review. Remainder of r12353 from trunk, previous attempt only picked up the new tests. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12356 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-17[1.1.X] Fixed #11753 - Q objects with callables no longer explode on Python ↵Jacob Kaplan-Moss
2.4. Thanks, Jeremy Dunck. Backport of [11901]. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11903 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-11-19[1.1.X] Fixed #12242 -- Corrected a problem with masking extra selects() in ↵Russell Keith-Magee
a DateQuerySet. Thanks to Alex Gaynor for his help debugging this one. Backport of r11748 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11749 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-16[1.1.X] Fixed #11886 -- Corrected handling of F() expressions that use ↵Russell Keith-Magee
parentheses. Thanks to Brent Hagany for the report. Merge of r11581 from trunk. git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-06Fixed #11082 -- Ensured that subqueries used in an exclude(X__in=) clause ↵Russell Keith-Magee
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-06Fixed #10572 -- Corrected the operation of the defer() and only() clauses ↵Russell Keith-Magee
when used on inherited models. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-29Fixed #11216 and #11218 -- Corrected a few typos, thanks buriy.Gary Wilson Jr
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10861 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-11Fixed #10953, #10955: proxies of proxies now work correctly, though I still ↵Jacob Kaplan-Moss
don't quite understand why you'd want to do such a thing. Thanks, Armin Ronacher. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10738 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-30Fixed #10847 -- Modified handling of extra() to use a masking strategy, ↵Russell Keith-Magee
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-11Fixed #10796 -- Corrected a pickling problem introduced by [10522]. Thanks ↵Russell Keith-Magee
to carljm for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10526 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-11Fixed #10197 -- Corrected pickling of querysets when a subset of fields was ↵Russell Keith-Magee
selected. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10522 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-11Fixed #10766 -- Raise an error when annotate() references another ↵Russell Keith-Magee
aggreagte(). Thanks to aseering@mit.edu for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10521 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-08Fixed #10666 -- Corrected the handling of inherited fields with aggregate() ↵Russell Keith-Magee
and annotate(). Thanks to julienb for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10446 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-04Fixed a problem when computing deferred fields on multiple related models.Malcolm Tredinnick
Fixed #10710, as this fixes the second bug reported there. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-02Fixed #10670: fixed reusing QuerySets previously used in a filter ↵Jacob Kaplan-Moss
expression. Thanks, Alex Gaynor. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10357 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-04-01Fixed #9871 -- Geometry objects are now returned in dictionaries and tuples ↵Justin Bronn
returned by `values()` and `values_list()`, respectively; updated `GeoQuery` methods to be compatible with `defer()` and `only`; removed defunct `GeomSQL` class; and removed redundant logic from `Query.get_default_columns`. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10326 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-24Fixed #9926 -- Fixes for some select_related() situations.Malcolm Tredinnick
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-19Fixed #5420 -- Added support for delayed loading of model fields.Malcolm Tredinnick
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-18Fixed #10356 -- Added pure-Python inheritance for models (a.k.a proxy models).Malcolm Tredinnick
Large portions of this are needed for #5420, so I implemented it fully. Thanks to Ryan Kelly for an initial patch to get this started. Refs #5420. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10083 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-14Fixed #10425 -- Corrected the interaction of .count() with .annotate() when ↵Russell Keith-Magee
.values() is also involved. Thanks to kmassey for the report. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10053 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-13Fixed a case where column aliases weren't being quoted properly.Ian Kelly
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10048 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-13Prevented InsertQuery from appending a 'RETURNING' clause when it's not ↵Ian Kelly
actually interested in the result. This was causing some problems for Oracle. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10047 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-12Fixed #10473: Added Oracle support for "RETURNING" ids from insert statements.Ian Kelly
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10044 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-12Return last insert ID correctly when the feature is enabled.Malcolm Tredinnick
This was overlooked when merging the patch from #3460 in r10029. Thank to Ian Kelly for noticing. Refs #10467. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10034 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-11Fixed #3460 -- Added an ability to enable true autocommit for psycopg2 backend.Malcolm Tredinnick
Ensure to read the documentation before blindly enabling this: requires some code audits first, but might well be worth it for busy sites. Thanks to nicferrier, iamseb and Richard Davies for help with this patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10029 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-09Pass values through get_db_prep_save() in a QuerySet.update() call.Malcolm Tredinnick
This removes a long-standing FIXME in the update() handling and allows for greater flexibility in the values passed in. In particular, it brings updates into line with saves for django.contrib.gis fields, so fixed #10411. Thanks to Justin Bronn and Russell Keith-Magee for help with this patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10003 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08Fixed #10432 -- Handle all kinds of iterators in queryset filters.Malcolm Tredinnick
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-06Improved table join handling for comparisons against NULL.Malcolm Tredinnick
This fixes a broad class of bugs involving filters that look for missing related models and fields. Most of them don't seem to have been reported (the added tests cover the root cause). The exception is that this has also fixed #9868. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-04Fixed #10251 -- Fixed model inheritance when there's also an explicit pk field.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9970 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-04Fixed #10362 -- An update() that only affects a parent model no longer crashes.Malcolm Tredinnick
This includes a fairly large refactor of the update() query path (and the initial portions of constructing the SQL for any query). The previous code appears to have been only working more or less by accident and was very fragile. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-04Changed the row count value returned from update queries in some cases.Malcolm Tredinnick
If an update only affected an ancestor model (not the child), we were returning 0 for the number of rows updated. This could have been misleading if the value is used to detect an update occuring. So we now return the rowcount from the first non-trivial query that is executed (if any). Still a slight compromise, but better than what we had. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9966 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02Fixed #10181 -- Handle an EmptyResultSet exception case properly in nested ↵Malcolm Tredinnick
querysets. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-01Fixed insert/update handling when no database interaction is required.Malcolm Tredinnick
Fixed #10205 as part of this. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-01Fixed #10202 -- Fixed another couple of slicing edge-cases with querysets.Malcolm Tredinnick
Patch from Alex Gaynor and Ramiro Morales. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9924 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-28Fixed #10028 -- Fixed a problem when ordering by related models.Malcolm Tredinnick
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-25Fixed #10290: do not use aliases when adding extra_selects to the GROUP BY ↵Ian Kelly
clause, to generate compliant sql that will be accepted by Oracle. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9905 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-24Fixed #10161 -- Modified evaluation of query expressions to allow for ↵Russell Keith-Magee
operators that take the form of functions. This is mostly for the benefit of Oracle, but it should prove useful later on. Thanks to Ian for the report and feedback on the fix. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9898 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-02-23Fixed #10182 -- Corrected realiasing and the process of evaluating values() ↵Russell Keith-Magee
for queries with aggregate clauses. This means that aggregate queries can now be used as subqueries (such as in an __in clause). Thanks to omat for the report. This involves a slight change to the interaction of annotate() and values() clauses that specify a list of columns. See the docs for details. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9888 bcc190cf-cafb-0310-a4f2-bffc1f526a37