django.git/django/db/models/sql/query.py, branch 1.6.6 django http://cgit.adnoto.dev/django.git/atom?h=1.6.6 2014-05-05T10:27:54Z [1.6.x] Fixed #22429 -- Incorrect SQL when using ~Q and F 2014-05-05T10:27:54Z Anssi Kääriäinen akaariai@gmail.com 2014-04-28T12:27:36Z urn:sha1:0e3704963693ddfaaa525054c42333f6ffdb4b47 Backpatch of 5e1f4656b98816c96a1cc051224c1b699db480e0 from master. Conflicts: django/db/models/sql/query.py tests/queries/models.py tests/queries/tests.py [1.6.x] Fixed #21748 -- join promotion for negated AND conditions 2014-02-04T17:06:37Z Anssi Kääriäinen akaariai@gmail.com 2014-01-08T17:35:47Z urn:sha1:fd3fa851b592700a8b04af46f626454db0db02e4 Made sure Django treats case .filter(NOT (a AND b)) the same way as .filter((NOT a OR NOT b)) for join promotion. Heavily modified backpatch of 35cecb1ebd0ccda0be7a518d1b7273333d26fbae from master. Conflicts: django/db/models/sql/query.py tests/queries/tests.py [1.6.x] Fixed #21787 -- regression in MTI .exclude() queries 2014-01-24T08:18:57Z Anssi Kääriäinen akaariai@gmail.com 2014-01-20T16:28:16Z urn:sha1:e47b90e48f3532d312afcfaec55b2711b2129c02 Backpatch of 78a2617703bc1dada409f126db5c3db214913ff4 from master. [1.6.x] Fixed #21150 -- Improved Query.add_fields() join promotion logic 2013-09-24T16:04:42Z Anssi Kääriäinen akaariai@gmail.com 2013-09-24T15:42:40Z urn:sha1:1a922870ea07e730281c0e2a7b3a170232a81236 Thanks to Eivind Fonn for the report and test case. [1.6.x] Removed stale add_q() comment 2013-08-30T06:46:16Z Anssi Kääriäinen akaariai@gmail.com 2013-08-30T06:44:56Z urn:sha1:cd10e998b6a8f9daaf2e25cad55f33f3df51ea88 Backport of 13be3bfef1 from master Fixed #14930 -- values_list() failure on qs ordered by extra column 2013-06-18T20:56:51Z Florian Hahn flo@fhahn.com 2013-02-05T23:11:28Z urn:sha1:2f35c6f10fcbae541691207fb0c0560a13b754fc Thanks lsaffre for the report and simon29, vicould, and Florian Hahn for the patch. Some changes done by committer. Fixed #20583 -- ORM always uses setup_joins() for join generation 2013-06-16T12:44:52Z Anssi Kääriäinen akaariai@gmail.com 2013-06-15T17:31:46Z urn:sha1:aa22cbd51aa6cb35fc658dd704948a18b27d1981 There were a couple of places which used Query.join() directly. By using setup_joins() in these places the code is more DRY, and in addition there is no need to directly call field.get_joining_columns() unless the field is the given join_field from get_path_info(). This makes it easier to make sure a ForeignObject subclass generates joins correctly in all cases. Fixed #20528 -- regression in select_related join promotion 2013-06-14T13:29:06Z Anssi Kääriäinen akaariai@gmail.com 2013-06-10T15:22:30Z urn:sha1:89bf7a45250cf554295f3d17d708311d3edba101 The join used by select_related was incorrectly INNER when the query had an ORed filter for nullable join that was trimmed away. Fixed this by forcing the join type to LOUTER even when a join was trimmed away in ORed queries. Fixed #20564 -- Generic relations exclude() regression 2013-06-05T22:54:46Z Anssi Kääriäinen akaariai@gmail.com 2013-06-05T21:29:44Z urn:sha1:31fd64ad8a98d7de0acb9144ae6f7bd124700cb0 The patch for #19385 caused a regression in certain generic relations .exclude() filters if a subquery was needed. The fix contains a refactoring to how Query.split_exclude() and Query.trim_start() interact. Thanks to Trac alias nferrari for the report. Replaced an antiquated pattern. 2013-05-17T16:08:58Z Aymeric Augustin aymeric.augustin@m4x.org 2013-05-17T14:33:36Z urn:sha1:9c487b5974ee7e7f196079611d7352364e8873ed Thanks Lennart Regebro for pointing it out.