mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2024-12-24 10:05:46 +00:00
Code Issues 25 Releases Wiki Activity
27,314 Commits 28 Branches 426 Tags 666 MiB
0ddb4ebf7b
Commit Graph

538 Commits

Author SHA1 Message Date
Ed Henderson
4a4d7f980e Fixed #26021 -- Applied hanging indentation to docs. 2016-06-03 11:44:34 -04:00
MariKiev
30d110ef43 Added imports to docs/topics/db/aggregation.txt example. 2016-05-25 09:52:33 -04:00
Tim Graham
46a38307c2 Removed versionadded/changed annotations for 1.9. 2016-05-20 11:44:29 -04:00
Loïc Bistuer
ed0ff913c6 Fixed #10506, #13793, #14891, #25201 -- Introduced new APIs to specify models' default and base managers. 
This deprecates use_for_related_fields.

Old API:

class CustomManager(models.Model):
    use_for_related_fields = True

class Model(models.Model):
    custom_manager = CustomManager()

New API:

class Model(models.Model):
    custom_manager = CustomManager()

    class Meta:
        base_manager_name = 'custom_manager'

Refs #20932, #25897.

Thanks Carl Meyer for the guidance throughout this work.
Thanks Tim Graham for writing the docs.
 2016-05-17 12:07:22 +07:00
Loïc Bistuer
3a47d42fa3 Fixed #20932, #25897 -- Streamlined manager inheritance. 2016-05-17 02:29:22 +07:00
Aron Podrigal
85ef98dc6e Fixed #24305 -- Allowed overriding fields on abstract models. 
Fields inherited from abstract base classes may be overridden like
any other Python attribute. Inheriting from multiple models/classes
with the same attribute name will follow the MRO.
 2016-05-16 07:32:21 -04:00
Tim Graham
e475e84970 Refs #26021 -- Used hanging indentation in some doc examples. 2016-05-14 19:06:31 -04:00
Tim Graham
af69c9113c Fixed typo in docs/topics/db/models.txt 2016-05-13 15:18:33 -04:00
Matthew Somerville
1962a96a30 Fixed #24938 -- Added PostgreSQL trigram support. 2016-05-13 12:38:21 -04:00
Tim Graham
f5ff5010cd Fixed #26483 -- Updated docs.python.org links to use Intersphinx. 2016-05-08 18:07:43 -04:00
shiblystory
6ae617dc57 Fixed #26595 -- Removed unnecessary save() in one_to_one.txt example. 2016-05-07 06:53:03 -04:00
Tim Graham
fe70f280d7 Refs #25136 -- Fixed nonexistent field reference in aggregation topic guide. 
Thanks Ankush Thakur for the report and Simon for the review.
 2016-04-27 15:16:00 -04:00
Marc Tamlyn
2d877da855 Refs #3254 -- Added full text search to contrib.postgres. 
Adds a reasonably feature complete implementation of full text search
using the built in PostgreSQL engine. It uses public APIs from
Expression and Lookup.

With thanks to Tim Graham, Simon Charettes, Josh Smeaton, Mikey Ariel
and many others for their advice and review. Particular thanks also go
to the supporters of the contrib.postgres kickstarter.
 2016-04-22 10:44:37 +01:00
Simon Charette
64aba7a8ab Fixed #26438 -- Fixed multiple .objects typos in the docs. 
Thanks Pablo Oubiña for the report.
 2016-03-31 18:27:47 -04:00
Akshesh
49f95cc0a0 Fixed #11560 -- Allowed proxy model multiple-inheritance from the same concrete base model. 2016-03-30 13:06:27 -04:00
Tim Shaffer
8550566af6 Fixed typo in docs/topics/db/aggregation.txt. 2016-03-25 13:38:16 -04:00
Tim Graham
22d2a5b00a Corrected a run on sentence in doc/topics/db/models.txt. 2016-02-25 14:22:41 -05:00
Markus Holtermann
228427ab1a Fixed allow_migrate() signature in documentation 2016-02-12 14:16:03 +11:00
Becka R
cf48962b36 Clarified "database column type" explanation. 2016-02-11 18:26:46 -05:00
Tim Graham
8ce8beb3f2 Unified some doc links to OneToOneField and ManyToManyField. 2016-02-01 11:02:26 -05:00
rowanv
a6ef025dfb Fixed #26124 -- Added missing code formatting to docs headers. 2016-02-01 10:42:05 -05:00
James Pulec
f05722a08a Fixed #25354 -- Added class/app_label interpolation for related_query_name. 2016-01-28 11:10:47 -05:00
Elif T. Kus
bca9faae95 Fixed #26020 -- Normalized header stylings in docs. 2016-01-22 12:12:17 -05:00
Tim Graham
e519aab43a Fixed #23868 -- Added support for non-unique django-admin-options in docs. 
Also documented missing short command line options to fix #24134. This bumps
the minimum sphinx version required to build the docs to 1.3.4.

Thanks Simon Charette for review.
 2016-01-14 18:21:33 -05:00
anabelensc
4c1fab0f29 Added a missing bracket in a queries docs example. 2016-01-09 12:17:21 -05:00
Tim Graham
98839e9066 Removed British/Austrialian word: whilist. 2015-12-31 14:29:52 -05:00
Tim Graham
dbb0df2a0e Fixed #25985 -- Updated signature of ModelAdmin.formfield_for_* to make request a positional argument. 2015-12-29 12:49:14 -05:00
Tim Graham
3d2236773b Refs #10060 -- Corrected description of multiple annotations bug. 2015-12-15 07:59:37 -05:00
bphillips
d508326e2f Fixed #25672 -- Clarified why related ManyToManyFields with a custom intermediate model disable the remove() method. 2015-12-08 18:00:10 -05:00
Jon Dufresne
7aabd62380 Fixed #25778 -- Updated docs links to use https when available. 2015-12-01 08:01:34 -05:00
James Beith
e03798a4ae Fixed a typo in the managers docs. 2015-11-27 13:51:58 -05:00
Tim Graham
91a431f48c Fixed #10045 -- Corrected docs about .annotate()/.filter() ordering. 
Thanks Josh, Anssi, and Carl for reviews and advice.
 2015-11-12 12:29:59 -05:00
Attila Tovt
ac750dbbc0 Fixed #25681 -- Added 'default' to DATABASES example. 2015-11-07 11:09:31 +01:00
Tomasz Anielak
b67502fb8d Fixed typo in docs/topics/db/models.txt. 2015-10-31 08:53:00 -04:00
Tim Graham
9c5e272860 Fixed #25550 -- Deprecated direct assignment to the reverse side of a related set. 2015-10-27 07:57:15 -04:00
Tim Graham
e0837f2cb1 Fixed #25508 -- Modified QuerySet.__repr__() to disambiguate it from a list. 2015-10-06 12:38:34 -04:00
David Sanders
5c6316dc34 Clarified that Model.delete() isn't called as a result of a cascading delete. 2015-09-30 08:44:04 -04:00
Tim Graham
de99f558d8 Fixed #25462 -- Removed Model.__unicode__() in favor of @python_2_unicode_compatible. 2015-09-25 13:28:12 -04:00
Tim Graham
361f60479d Fixed #25455 -- Optimized dictfetchall() example. 
Thanks aklim007 for the suggestion.
 2015-09-24 13:17:39 -04:00
Tim Graham
54848a96dd Removed versionadded/changed annotations for 1.8. 2015-09-23 19:31:11 -04:00
Tim Graham
4fd264b6f1 Refs #24351 -- Removed support for the old allow_migrate() signature per deprecation timeline. 2015-09-23 19:31:09 -04:00
Don Kirkby
dcd7358afd Fixed typo in docs/topics/db/examples/one_to_one.txt 2015-09-23 13:31:14 -04:00
Aymeric Augustin
91e9f1c972 Fixed #24921 -- set_autocommit(False) + ORM queries. 
This commits lifts the restriction that the outermost atomic block must
be declared with savepoint=False. This restriction was overly cautious.

The logic that makes it safe not to create savepoints for inner blocks
also applies to the outermost block when autocommit is disabled and a
transaction is already active.

This makes it possible to use the ORM after set_autocommit(False).
Previously it didn't work because ORM write operations are protected
with atomic(savepoint=False).
 2015-09-21 22:21:53 +02:00
Maarten
fe58d96e50 Fixed #25355 -- Made two tweaks to docs/topics/db/aggregation.txt. 2015-09-05 10:19:38 -04:00
Dražen Odobašić
5ab65ca5c9 Fixed #25326 -- Added namedtuple example for executing custom SQL. 2015-09-03 13:11:46 -04:00
Tim Graham
ea47a052ba Fixed #25311 -- Removed vague language about "partial commits" from docs. 2015-08-25 20:23:43 -04:00
Aymeric Augustin
491d01b7e9 Tweak some examples. 
"Area man/woman" is confusing to people not familiar with the
conventions of American journalism (like me).
 2015-08-22 20:25:42 +02:00
Brendan Hayward
c9fb4f3c45 Fixed #25205 -- Removed doc references to deprecated GeoManager class. 2015-08-11 10:14:44 -04:00
Tim Graham
5980b05c1f Fixed #25160 -- Moved unsaved model instance data loss check to Model.save() 
This mostly reverts 5643a3b51b and
81e1a35c36.

Thanks Carl Meyer for review.
 2015-08-10 08:51:32 -04:00
Claude Paroz
64982cc2fb Updated Wikipedia links to use https 2015-08-08 12:02:32 +02:00
Caio Ariede
ec9004728e Fixed #25175 -- Renamed the postgresql_psycopg2 database backend to postgresql. 2015-08-07 09:33:17 -04:00
Tim Graham
e8cd65f829 Fixed #25213 -- Discouraged use of QuerySet.extra() 
Thanks Anssi Kääriäinen for the draft text and Simon Charette
for review.
 2015-08-05 08:01:11 -04:00
Caio Ariede
3862c568ac Fixed #25136 -- Documented Count('X', distinct=True) in aggregate topic guide. 2015-08-04 10:46:04 -04:00
Flavio Curella
c2e70f0265 Fixed #21127 -- Started deprecation toward requiring on_delete for ForeignKey/OneToOneField 2015-07-27 18:28:13 -04:00
Andreas Pelme
00a1d4d042 Fixed #21803 -- Added support for post-commit callbacks 
Made it possible to register and run callbacks after a database
transaction is committed with the `transaction.on_commit()` function.

This patch is heavily based on Carl Meyers django-transaction-hooks
<https://django-transaction-hooks.readthedocs.org/>. Thanks to
Aymeric Augustin, Carl Meyer, and Tim Graham for review and feedback.
 2015-06-30 14:51:00 -04:00
Tim Graham
2fbea621e6 Capitalized "Python" in docs. 2015-06-05 08:24:53 -04:00
Maximiliano
bf07ba523a Simplified wording in QuerySet.update() docs. 2015-06-01 09:42:23 -04:00
Alexander Sosnovskiy
04e8d890ae Fixed #16891 -- Made Model/QuerySet.delete() return the number of deleted objects. 2015-05-22 13:27:16 -04:00
Marco Santamaria
bae72bdd2a Fixed #11078 -- documentation update. 2015-04-19 16:24:14 +02:00
Tim Graham
6b8c969878 Removed docs for removed transaction APIs. 2015-04-14 13:52:45 -04:00
David Seddon
0f6f80c2e7 Corrected typo in documentation 2015-03-25 17:38:56 +00:00
David Seddon
6770b7ecd2 Refs #14645 -- Documented bug with exclude() and multi-value relations 2015-03-20 17:49:07 -04:00
Karl Hobley
81e1a35c36 Fixed #24495 -- Allowed unsaved model instance assignment check to be bypassed. 2015-03-18 19:00:09 -04:00
Adrian Andreias
937643a1f2 Fixed allow_migrate() signature in router examples. 2015-03-16 09:39:18 -04:00
Floris den Hengst
e42a720ba2 Fixed typos and updated spelling wordlist. 2015-03-07 17:59:03 +01:00
Loic Bistuer
bed504d70b Fixed #24351, #24346 -- Changed the signature of allow_migrate(). 
The new signature enables better support for routing RunPython and
RunSQL operations, especially w.r.t. reusable and third-party apps.

This commit also takes advantage of the deprecation cycle for the old
signature to remove the backward incompatibility introduced in #22583;
RunPython and RunSQL won't call allow_migrate() when when the router
has the old signature.

Thanks Aymeric Augustin and Tim Graham for helping shape up the patch.

Refs 22583.
 2015-02-20 21:34:09 +07:00
Loic Bistuer
71ada3a8e6 Fixed #6707 -- Added RelatedManager.set() and made descriptors' __set__ use it. 
Thanks Anssi Kääriäinen, Carl Meyer, Collin Anderson, and Tim Graham for the reviews.
 2015-02-05 12:45:08 +07:00
darkryder
9ec8aa5e5d Fixed #24149 -- Normalized tuple settings to lists. 2015-02-03 14:59:45 -05:00
Tim Graham
c79faae761 Removed versionadded/changed notes for 1.7. 2015-02-01 21:02:40 -05:00
Loic Bistuer
8f4877c89d Fixed #22583 -- Allowed RunPython and RunSQL to provide hints to the db router. 
Thanks Markus Holtermann and Tim Graham for the review.
 2015-01-10 00:30:48 +07:00
Helen Sherwood-Taylor
4ccdf6e57f Fixed #24041 -- Documented effect of changing a model instance's primary key. 2014-12-24 15:06:09 -05:00
David Cramer
27f68f8659 Correct scoping of savepoint example 2014-12-20 12:02:26 -08:00
Claude Paroz
0a4b04fc23 Used https for most *.python.org links 2014-12-19 18:07:52 +01:00
wrwrwr
34a06d99e0 Cleaned up a note in docs/topics/db/sql.txt. 2014-12-06 09:25:48 -05:00
Tim Graham
dc2d75f4d4 Fixed typo in aggregation docs link. 2014-12-03 20:07:40 -05:00
Benjamin Bach
3ab8d0b8c7 Fixed a typo in aggregation docs. 2014-12-03 19:52:54 -05:00
Benjamin Bach
4b23a6c7a9 Documented a current limitation of multiple table annotation; refs #10060. 2014-12-03 19:18:55 -05:00
Éric Araujo
cbffc900bb Fix link target markup 
This markup for a code block is redundant with the code-block directive below,
and blocks the following line from working as link target.
 2014-11-17 16:37:18 -07:00
Josh Smeaton
f59fd15c49 Fixed #14030 -- Allowed annotations to accept all expressions 2014-11-15 14:00:43 +00:00
Ismail Badawi
e501d4c505 Fixed #23597 -- Clarified the manager that {Single,Multiple}ObjectMixin.model uses. 2014-10-06 08:23:42 -04:00
Duane Hilton
054bdfeff1 Fixed #17638 -- Added crosslinks between topic and reference guides. 
Thanks oinopion for the suggestion and jarus for the initial patch.
 2014-09-29 18:06:31 -04:00
Greg Brown
9e8658db51 Fixed typo in docs/topics/db/managers.txt 2014-09-29 07:45:28 -04:00
Corey Farwell
4db75925be Fixed typo in docs/topics/db/transactions.txt. 2014-09-03 11:49:00 -04:00
Tim Graham
5ecead9ab9 Fixed #22620 -- Emphasized role of DATABASE_ROTERS in multi-db docs. 
Thanks Mike O'Connor for the suggestions.
 2014-08-26 15:43:23 -04:00
areski
9d6551204e Removed unnecessary code-block directives. 2014-08-19 16:44:25 -04:00
Tim Graham
7006187064 Fixed #23282 -- Corrected inheritance and reverse relations example. 
Thanks knowledgepoint-devs for the report and claudep for review.
 2014-08-19 06:28:48 -04:00
Ola Sitarska
6947885926 Fixed #23283 -- Added default=False to BooleanField's in the docs. 
Thanks Baptiste for the suggestion.
 2014-08-13 18:23:52 -04:00
Tim Graham
fb4f3e04b1 Updated MySQL links to version 5.6. 2014-08-02 10:27:01 -04:00
Christoph Heer
d47409831f Fixed #23067 -- Updated docs to use django-admin 2014-07-30 14:14:03 -04:00
Tim Graham
9f18b6bcb0 Fixed #22978 -- Removed a USA-centric example that didn't add much. 2014-07-08 08:56:41 -04:00
Éric Araujo
5842d8eba4 Removed non-existent reference to args/kwargs in manager docs. 2014-07-02 07:54:02 -04:00
Moayad Mardini
2d425116e2 Fixed #22349 -- Added a note clarifying RawQuerySet has no __len__. 
Thanks cdestigter for the report.
 2014-06-12 16:41:49 -04:00
Éric Araujo
84cafc2b35 Fix missing highlighting in some code examples 2014-06-05 14:54:28 -04:00
Anubhav Joshi
5643a3b51b Fixed #10811 -- Made assigning unsaved objects to FK, O2O, and GFK raise ValueError. 
This prevents silent data loss.

Thanks Aymeric Augustin for the initial patch and Loic Bistuer for the review.
 2014-06-05 13:12:01 -04:00
Moayad Mardini
2ea1e70b85 Fixed #22601 -- Added a note about model inheritance. 
Thanks semenov for the report.
 2014-05-27 19:42:16 -04:00
Flavio Curella
beec05686c Fixed #22667 -- Replaced leader/follower terminology with primary/replica 2014-05-22 11:59:17 -04:00
Alex Gaynor
8a95b4fca7 Merge pull request #2692 from fcurella/patch-5 
#22667 replaced occurrences of master/slave terminology with leader/follower
 2014-05-20 09:37:04 -07:00
Flavio Curella
73a57b06f9 replaced occurrences of master/slave terminology with leader/follower 2014-05-20 11:35:16 -05:00
Aliaksandr Semianiuk
5b185ecc68 Fixed #22019 -- Added Model.objects reference documentation. 2014-05-17 08:32:05 -04:00
Haris Ibrahim K. V
f2a8e47cfd Fixed typo in transactions.txt 2014-05-13 07:27:33 -04:00
Tim Graham
57296b4162 Removed some references to django.contrib.comments which has been removed. 2014-05-13 07:24:28 -04:00
Tim Graham
8ec388a69d Fixed #22442 -- Provided additional documentation regarding id fields clashing. 
Thanks benjaoming for raising the issue and Loic for the examples.
 2014-04-30 07:36:12 -04:00
Claude Paroz
680a0f08b1 Updated doc links to point to Python 3 documentation 2014-04-26 16:02:53 +02:00
Moayad Mardini
3776926cfe Fixed #22493 - Added warnings to raw() and extra() docs about SQL injection 
Thanks Erik Romijn for the suggestion.
 2014-04-25 09:54:49 -04:00
Erik Romijn
75c0d4ea3a Fixed queries that may return unexpected results on MySQL due to typecasting. 
This is a security fix; disclosure to follow shortly.
 2014-04-21 18:11:26 -04:00
Tim Graham
c487b1e230 Fixed #22419 -- Typo in docs/topics/db/multi-db.txt. 
Thanks Josh Kupershmidt.
 2014-04-10 19:33:00 -04:00
Shai Berger
f095356ba2 Fixed #22343 -- Disallowed select_for_update in autocommit mode 
The ticket was originally about two failing tests, which are
fixed by putting their queries in transactions.

Thanks Tim Graham for the report, Aymeric Augustin for the fix,
and Simon Charette, Tim Graham & Loïc Bistuer for review.
 2014-04-10 03:04:51 +03:00
Tim Graham
51c8045145 Removed versionadded/changed annotations for 1.6. 2014-03-24 11:42:56 -04:00
Adam Kaliński
ec08d62a20 Fixed #22048 - Enhanced docs to cover nonexistent one-to-one relationships. 
Thanks EvilDMP for the suggestion.
 2014-03-24 09:41:04 -04:00
Claude Paroz
3a97f992fb Fixed #22313 -- Removed 'u' prefixes from documentation 2014-03-22 21:32:20 +01:00
Akis Kesoglou
aaad3e27ac Fixed #22217 - ManyToManyField.through_fields fixes. 
- Docs description of arguments mix up.
- Keep it from erroneously masking E332 check.
- Add checks E338 and E339, tweak message of E337.
 2014-03-11 19:33:04 -03:00
Akis Kesoglou
c627da0ccc Fixed #14549 - Removed restriction of single FKs on intermediary tables 
Thanks to Loic Bistuer for review. Minor changes to error messages
done by committer.
 2014-03-05 22:33:58 +02:00
Alex de Landgraaf
c8d61fa109 Fixed #21986 -- Added some guidelines for database indexes. 
Thanks django-issues at colons.co for the suggestion.
 2014-03-03 11:16:41 -05:00
Tim Graham
7f2505ad9e Fixed doc typos. 2014-02-28 11:44:03 -05:00
Tim Graham
4132e013ec Removed a nonexistent link in the docs. 2014-02-25 11:28:36 -05:00
Szczepan Cieślik
e816198034 Fixed docs typos. 2014-02-25 10:28:32 -05:00
Nicolaas Heyning
e1d2a0bd04 added documentation on Model attributes 2014-02-23 17:16:12 +01:00
David Sanders
adcedfe8ba Capitalize SQL keywords 2014-02-20 11:32:04 -07:00
David Sanders
6dfd02f88c Capitalize SQL keywords 2014-02-20 11:26:59 -07:00
Loic Bistuer
99416c7ad0 Added an example to the release notes for custom reverse managers. 2014-02-19 07:45:24 -05:00
Alasdair Nicol
8aa1efff6d Fixed #21951 -- Updated docs to use __str__ for Python 3 
Thanks Tim Graham for the report and recommendations
 2014-02-13 07:12:40 -05:00
Loic Bistuer
f265c1ef13 Fixed gendered examples in the docs. 2014-02-05 14:58:50 -05:00
Aymeric Augustin
8e1fc03491 Fixed typo. Refs #21836. 2014-01-26 09:30:10 +01:00
Chris Jerdonek
798fd59fad Fixed #21836 -- Improved transaction docs about autocommit mode 
Clarified that queries in autocommit mode are committed immediately
only if a transaction has not already been started. Added to the
main transaction docs that Django's TestCase class implicitly wraps
its tests in transactions.
 2014-01-25 21:20:17 +01:00
Russell Keith-Magee
d818e0c9b2 Fixed #16905 -- Added extensible checks (nee validation) framework 
This is the result of Christopher Medrela's 2013 Summer of Code project.

Thanks also to Preston Holmes, Tim Graham, Anssi Kääriäinen, Florian
Apolloner, and Alex Gaynor for review notes along the way.

Also: Fixes #8579, fixes #3055, fixes #19844.
 2014-01-20 10:45:21 +08:00
Tim Graham
5c7ac7494a Fixed #18907 -- Correct docs regard population of model backrefs. 
Thanks simonpercivall for the report and Aymeric for the patch.
 2014-01-19 09:35:59 -05:00
Tim Graham
b87c59b04b Removed some unnecessary __exact operators in filters. 2014-01-17 18:12:45 -05:00
Tim Graham
a6e3fb80b0 Fixed #21343 -- Noted many-to-many restrictions with intermediate model. 
Thanks EvilDMP for the report.
 2014-01-16 08:38:40 -05:00
Frank Tobia
6dd8631617 Fixed typos. Changed grammar. 
Minor typos. Some grammar changes.
 2014-01-02 14:22:52 -05:00
Frank Wiles
164df40501 Fixing manager documentation inaccuracy 2013-12-04 18:03:28 -06:00
Tim Graham
f3e7ab366c Removed gender-based pronouns per [c0a2daad78]. 2013-11-30 08:37:15 -05:00
Loic Bistuer
27f04e79b1 Fixed #21479 -- Favor 'migrate' over 'syncdb' in the docs. 2013-11-21 15:12:39 +01:00
Cody Scott
a8e84521c4 Noted that .clear() will delete intermediary models 2013-11-08 19:24:31 -05:00
Florian Hahn
5240b83462 Fixed #17027 -- Added support for the power operator in F expressions. 
Thanks dan at dlo.me for the initial patch.

- Added __pow__ and __rpow__ to ExpressionNode
- Added oracle and mysql specific power expressions
- Added used-defined power function for sqlite
 2013-10-22 10:29:57 -04:00
Cody Scott
8bfc7cc64c Minor edits to docs/topics/db/queries.txt. 2013-10-11 15:34:11 -04:00
Cody Scott
695bc0d191 Small improvements to docs/topics/db/models.txt 2013-10-10 20:56:11 -04:00
Tim Graham
75bb6ba966 Fixed #10913 -- Documented how related_name affects QuerySet filtering 
Thanks neithere for the suggestion.
 2013-10-02 12:12:53 -04:00
Aymeric Augustin
728548e483 Fixed #21134 -- Prevented queries in broken transactions. 
Squashed commit of the following:

commit 63ddb271a44df389b2c302e421fc17b7f0529755
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
Date:   Sun Sep 29 22:51:00 2013 +0200

    Clarified interactions between atomic and exceptions.

commit 2899ec299228217c876ba3aa4024e523a41c8504
Author: Aymeric Augustin <aymeric.augustin@m4x.org>
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 <aymeric.augustin@m4x.org>
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 <aymeric.augustin@m4x.org>
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 <aymeric.augustin@m4x.org>
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.
 2013-09-30 09:42:27 +02:00
Michael Manfre
99c87f1410 Fixed #17671 - Cursors are now context managers. 2013-09-25 21:47:26 +03:00
Loic Bistuer
04a2a6b0f9 Fixed #3871 -- Custom managers when traversing reverse relations. 2013-09-25 21:15:59 +03:00
Ramiro Morales
9dc45efeba Reference Meta.index_together in DB performance guide. 2013-09-22 11:11:02 -03:00
evildmp
dc8f95b639 Fixed #20877 -- added a performance optimization guide 2013-09-20 23:21:49 +01:00
Aymeric Augustin
4db2752e28 Clarified why one must not catch database errors inside atomic. 2013-09-20 21:56:35 +02:00
e0ne
cbf08c6b0c Fixed #16895 -- Warned about cost of QuerySet ordering 
Thanks outofculture at gmail.com for the suggestion.
 2013-09-09 09:47:18 -04:00
evildmp
79cc66692a Consolidated documentation for F() and Q() 2013-09-06 12:57:25 -05:00
Eric Boersma
4d13cc56de Fixed #21035 -- Changed docs to treat the acronym SQL phonetically. 
The documentation and comments now all use 'an' to
refer to the word SQL and not 'a'.
 2013-09-05 20:14:58 -04:00
Andrew Godwin
b6a957f0ba Merge remote-tracking branch 'core/master' into schema-alteration 
Conflicts:
	docs/ref/django-admin.txt
 2013-08-19 18:30:48 +01:00
Tim Graham
7b69c3e775 Removed versionadded/changed annotations for 1.5 2013-08-19 09:09:41 -04:00
Tim Graham
29255fcb4f Fixed some ReST errors regarding backticks 2013-08-15 07:14:10 -04:00
Andrew Godwin
de64c4d6e9 Merge remote-tracking branch 'core/master' into schema-alteration 
Conflicts:
	django/core/management/commands/flush.py
	django/core/management/commands/syncdb.py
	django/db/models/loading.py
	docs/internals/deprecation.txt
	docs/ref/django-admin.txt
	docs/releases/1.7.txt
 2013-08-09 14:17:30 +01:00