django.git/django/db/models/query.py, branch 1.6.8

[1.6.x] Fixed #23370 -- defer() + select_related() crashed with inherited models.

2014-08-30T11:16:47Z

Backport of 6613ea6e3f from master

[1.6.x] Fixed #22508 -- Avoided overwriting select_related.

2014-05-10T15:05:09Z

Previously, known related objects overwrote related objects loaded though select_related. This could cancel the effect of select_related when it was used over more than one level. Thanks boxm for the bug report and timo for bisecting the regression. Conflicts: tests/select_related_regress/tests.py Backport of f574220f from master

[1.6.x] Fixed #21566 -- Fixed AttributeError when using bulk_create with ForeignObject.

2014-02-15T01:57:32Z

Backport of bbc73e6a12 from master.

Fixed #21134 -- Prevented queries in broken transactions.

2013-09-30T08:14:22Z

Backport of 728548e4 from master. Squashed commit of the following: commit 63ddb271a44df389b2c302e421fc17b7f0529755 Author: Aymeric Augustin Date: Sun Sep 29 22:51:00 2013 +0200 Clarified interactions between atomic and exceptions. commit 2899ec299228217c876ba3aa4024e523a41c8504 Author: Aymeric Augustin Date: Sun Sep 22 22:45:32 2013 +0200 Fixed TransactionManagementError in tests. Previous commit introduced an additional check to prevent running queries in transactions that will be rolled back, which triggered a few failures in the tests. In practice using transaction.atomic instead of the low-level savepoint APIs was enough to fix the problems. commit 4a639b059ea80aeb78f7f160a7d4b9f609b9c238 Author: Aymeric Augustin Date: Tue Sep 24 22:24:17 2013 +0200 Allowed nesting constraint_checks_disabled inside atomic. Since MySQL handles transactions loosely, this isn't a problem. commit 2a4ab1cb6e83391ff7e25d08479e230ca564bfef Author: Aymeric Augustin Date: Sat Sep 21 18:43:12 2013 +0200 Prevented running queries in transactions that will be rolled back. This avoids a counter-intuitive behavior in an edge case on databases with non-atomic transaction semantics. It prevents using savepoint_rollback() inside an atomic block without calling set_rollback(False) first, which is backwards-incompatible in tests. Refs #21134. commit 8e3db393853c7ac64a445b66e57f3620a3fde7b0 Author: Aymeric Augustin Date: Sun Sep 22 22:14:17 2013 +0200 Replaced manual savepoints by atomic blocks. This ensures the rollback flag is handled consistently in internal APIs.

[1.6.x] Fixed #19918 -- Modified select_for_update to run on the write database.

2013-08-06T14:58:32Z

Backport of 1c64a0f29e from master

Support 'pyformat' style parameters in raw queries, Refs #10070

2013-06-28T03:59:10Z

Add support for Oracle, fix an issue with the repr of RawQuerySet, add tests and documentations. Also added a 'supports_paramstyle_pyformat' database feature, True by default, False for SQLite. Thanks Donald Stufft for review of documentation.

Fixed #16856 - Added a way to clear select_related.

2013-05-30T15:06:05Z

Thanks Carl for the suggestion and David Cramer for the patch.

Fixed #16137 - Removed kwargs requirement for QuerySet.get_or_create

2013-05-27T14:01:14Z

Thanks wilfred@, poirier, and charettes for work on the patch.

Replaced `and...or...` constructs with PEP 308 conditional expressions.

2013-05-27T02:47:50Z

Optimisation in prefetch_related_objects

2013-05-24T10:19:44Z