Commit Graph

5649 Commits

Author SHA1 Message Date
Carl Meyer 6f65bd1cf0 [1.7.x] Fixed #23872 -- Removed sensitivity of migrations tests to CWD.
Backport of 47b7f601ee from master.
2014-11-26 17:36:04 -07:00
Luke Plant 8e3c3be32d [1.7.x] Fixed bug in circular dependency algo for migration dependencies.
Previous algo only worked if the first item was a part of the loop,
and you would get an infinite loop otherwise (see test).

To fix this, it was much easier to do a pre-pass.

A bonus is that you now get an error message that actually helps you debug
the dependency problem.

Backport of ff3d746e8d from master, with
additional tests from c5def493d0
2014-11-26 08:15:33 +00:00
Simon Charette 2a20bccda9 [1.7.x] Fixed #23754 -- Always allowed reference to the primary key in the admin
This change allows dynamically created inlines "Add related" button to work
correcly as long as their associated foreign key is pointing to the primary
key of the related model.

Thanks to amorce for the report, Julien Phalip for the initial patch,
and Collin Anderson for the review.

Backport of f9c4e14aec from master
2014-11-25 13:32:24 -05:00
Redouane Zait f671905fdb [1.7.x] Fixed #23898 -- Added missing context to admin's deleted_selected view.
Backport of 8e7b384d89 from master
2014-11-25 11:27:30 -05:00
Sergey Fedoseev 78fe7ec14f [1.7.x] Fixed #23888 -- Fixed crash in File.__repr__() when name contains unicode.
Backport of 1e9ac504e4 from master
2014-11-24 15:55:43 -05:00
Alasdair Nicol f91c6ecc22 [1.7.x] Fixed #23865 -- documented how to assign errors to a field in Model.clean()
Also added a unit test wit the simpler syntax which we have documented,
where the dictionary values are strings.

Backport of 5b26a014a8 from master
2014-11-21 13:02:40 -05:00
Andrzej Pragacz feded19104 [1.7.x] Fixed #23794 -- Fixed migrations crash when removing a field that's part of index/unique_together.
Backport of 72729f844e from master
2014-11-21 10:57:38 -05:00
Markus Holtermann 145467a636 [1.7.x] Fixed duplicate index error on Oracle; refs #23859.
Refers to regression introduced in 7b4a994599

Backport of 4c709cc0ef from master
2014-11-20 14:44:05 -05:00
Anssi Kääriäinen 01f2cf2aec [1.7.x] Fixed #23605 -- Fixed nested subquery regression
Added relabeled_clone() method to sql.Query to fix the problem. It
manifested itself in rare cases where at least double nested subquery's
filter condition might target non-existing alias.

Thanks to Trac alias ris for reporting the problem.

Backport of 5c481db295 from master
2014-11-20 13:53:28 -05:00
Markus Holtermann 1b8c067a4f [1.7.x] Cleaned up and reformatted autodetector tests
Backport of 2331650835 from master.
2014-11-19 18:25:00 -05:00
Markus Holtermann 2f8cd09a06 [1.7.x] Formatted model states in autodetector tests
Backport of f17acd5930 from master.
2014-11-19 18:25:00 -05:00
Carl Meyer 03e8c18288 [1.7.x] Fixed #23410 -- Avoided unnecessary rollbacks in related apps when migrating backwards.
Backport of ab2819aa7b from master.
2014-11-19 16:15:05 -07:00
Stratos Moros 50434aebe2 [1.7.x] Fixed #22248 -- Made RenameModel reversible
Backport of cf7a2a000e from master
2014-11-19 09:51:07 -05:00
Tillmann Karras dfcac7d7f5 [1.7.x] Fixed #23799 -- Made makemigrations respect --no-optimize.
Thanks to yamila-moreno for the idea of a skip message.

Backport of d188101319 from master
2014-11-18 09:20:04 +01:00
Markus Holtermann 03d983f7c3 [1.7.x] Fixed #23859 -- Fixed a migration crash when a field is renamed that is part of an index_together
Backport of 7b4a994599 from master.
2014-11-17 15:57:19 -07:00
Adam DePue 2d12a59938 [1.7.x] Fixed #23761 -- Fixed crash with MySQL validator and db_type is None.
The issue was fixed on master in e9103402c0.
2014-11-13 11:03:01 +01:00
Tim Graham d4bec655ae [1.7.x] Fixed flake8 warning.
Backport of dec7da3c4c from master
2014-11-13 10:08:17 +01:00
Baptiste Mispelon 606c57a132 [1.7.x] Fixed #23795 -- Fixed a regression in custom form fields
Custom form fields having a `queryset` attribute but no
`limit_choices_to` could no longer be used in ModelForms.

Refs #2445.

Thanks to artscoop for the report.

Backport of bfb11b9562 from master.

Conflicts:
	django/forms/fields.py
2014-11-12 22:46:00 +01:00
Markus Holtermann 1f50ea730e [1.7.x] Fixed #23770 -- Changed serialization strategy for floats with respect to NaN and Inf
Thanks to w0rp for the report

Backport of c7c098cf97 from master.
2014-11-06 15:31:30 +01:00
Veres Lajos 6b32adda59 [1.7.x] Fixed typos using https://github.com/vlajos/misspell_fixer
Backport of a71a2ea756 from master
2014-11-03 21:07:05 -05:00
Andy Chosak 12e5b87b89 [1.7.x] Fixed #23420 - broken warning for unbound naive datetime objects
Fixed issue with warning message displayed for unbound naive datetime
objects when USE_TZ is True. Adds unit test that demonstrates the issue
(discoverable when using a custom lookup in MySQL).

Backport of ceb1ffcc8d from master.

Conflicts:
	tests/custom_lookups/tests.py
2014-11-03 15:59:17 +02:00
Markus Holtermann 40ad022d5e [1.7.x] Fixed #23738 -- Allowed migrating from NULL to NOT NULL with the same default value
Thanks to Andrey Antukh for the report.

Backport of 715ccfde24 from master
2014-10-31 13:30:56 -04:00
Aymeric Augustin 12bace46c1 [1.7.x] Avoided using private API get_template_from_string.
Conflicts:
	django/contrib/webdesign/tests.py

Backport of c0c1bb9e from master.
2014-10-31 11:43:54 +01:00
Markus Holtermann 21358e7225 [1.7.x] Fixed #23614 -- Changed the way the migration autodetector orders unique/index_together
Thanks to Naddiseo for the report and Tim Graham for the review

Backport of 5c9c1e029d from master
2014-10-29 13:16:23 -04:00
Claude Paroz 6a1bd837b1 [1.7.x] Fixed #23717 -- Fixed makemessages crash when STATIC_ROOT=None
Backport of 528c9af54 from master.
2014-10-27 13:59:09 +01:00
Tim Graham abee4f718e [1.7.x] Fixed stable/1.7.x test failures from refs #23699. 2014-10-27 08:19:57 -04:00
Tim Graham af1c85e851 [1.7.x] Fixed flake8 warning.
Backport of ef9e3c5ed8 from master
2014-10-27 07:13:47 -04:00
Tim Graham 5cc8180a65 [1.7.x] Fixed #23699 -- Prevented flush from loading initial data for apps with migrations.
Backport of dd1ea70779 from master.
2014-10-27 07:13:05 -04:00
Claude Paroz b42930e4b7 [1.7.x] Fixed #23446 -- Officially recommended mysqlclient as MySQL driver
Thanks Corey Farwell for the report and Tim Graham for the review.
Thanks also to Inada Naoki for creating and maintaining mysqlclient.
Backport of 7f089ac2e3 from master.
2014-10-27 09:17:31 +01:00
Loic Bistuer 7fa6781f81 [1.7.x] Fixed #23621 -- Warn for duplicate models when a module is reloaded.
Previously a RuntimeError was raised every time two models clashed
in the app registry. This prevented reloading a module in a REPL;
while it's not recommended to do so, we decided not to forbid this
use-case by turning the error into a warning.

Thanks dfunckt and Sergey Pashinin for the initial patches.

Backport of 8c4ca16c65 and b62f72498a from master
2014-10-26 00:12:17 +07:00
Tim Graham 7750fc8fa8 [1.7.x] Fixed #23702 -- Fixed adding an explicit id field on SQLite.
Thanks gavinwahl for the report.

Backport of 92269b7b53 from master
2014-10-23 14:35:55 -04:00
Tim Graham f70a733abc [1.7.x] Fixed #23630 -- Made AlterModelTable rename auto-created M2M tables.
Thanks Naddiseo for the report, Andrew Godwin for guidance,
and Shai Berger for review.

Backport of 41b337efa0 from master
2014-10-23 08:51:08 -04:00
Claude Paroz d5a273eadb [1.7.x] Fixed #23583 -- More selectively ignored static/media roots
Fixed a regression introduced by 28efafa24c.
Thanks Michal Čihař for the report and initial patch, and
Collin Anderson and Tim Graham for the reviews.
Backport of 8b4cc9df9c from master.
2014-10-21 20:20:26 +02:00
Claude Paroz 53bc81dca3 [1.7.x] Fixed #21740 -- Allowed test client data to be an empty string
This fixes a regression introduced by 2a31d00933.
Thanks tony-zhu for the report.
Backport of f0bb3c98cc from master.
2014-10-21 09:17:42 +02:00
Simon Charette 117e970610 [1.7.x] Fixed a flake8 warning.
Backport of f6c208d95c from master
2014-10-20 13:17:00 -04:00
Tianyi Wang 3f3bed8fb9 [1.7.x] Fixed #23629 -- Allowed autodetector to detect changes in Meta.db_table.
Thanks Naddiseo for reporting.

Backport of 5732424bee from master
2014-10-20 13:15:34 -04:00
Rigel Di Scala e8262b5941 [1.7.x] Fixed #23615 -- Validate that a Model instance's "check" attribute is a method.
The "check" name is a reserved word used by Django's check framework,
and cannot be redefined as something else other than a method, or the check
framework will raise an error.

This change amends the django.core.checks.model_check.check_all_models()
function, so that it verifies that a model instance's attribute "check"
is actually a method. This new check is assigned the id "models.E020".

Conflicts:
	docs/ref/checks.txt

Backport of a5c77417a6 from master
2014-10-17 00:36:43 +07:00
Claude Paroz da0ebe39f6 [1.7.x] Fixed #23651 -- Isolated non-existent fixture tests
Previous versions of the tests were buggy, as initial_data.json
did exist and the test wasn't failing. It was finally failing on
Python 3.4.2.
Thanks Raphaël Hertzog for the report (and Debian bug #765117
contributors).
Backport of 7a893ee771 from master.
2014-10-15 09:18:14 +02:00
Claude Paroz 555952c3e6 [1.7.x] Adapted invalid cookie test to all Python versions
Refs #23638. Older Python versions are less strict when parsing
invalid cookie content. The test just has to ensure Django doesn't
crash.
2014-10-14 09:59:14 +02:00
Claude Paroz 6398ebab93 [1.7.x] Fixed #23638 -- Prevented crash while parsing invalid cookie content
Thanks Philip Gatt for the report and Tim Graham for the review.
Backport of 59d487e7fc from master.
2014-10-13 17:39:23 +02:00
Florian Apolloner bc13a08f89 [1.7.x] Fixed #23063 -- Convert \n and \r to \r\n when using the SMTP backend as per RFC.
Backport of 8d789449c7 from master.
2014-10-12 22:03:01 +02:00
Konrad Świat fd3dccb8dd [1.7.x] Fixed #23616 - Fixed generic relations in ModelAdmin.list_filter.
Thanks ranjur for reporting bug, timgraham for review,
and collinanderson for contributing tips.

Backport of 06b11b617e from master
2014-10-10 13:12:26 -04:00
Markus Holtermann 71988ed953 [1.7.x] Fixed #23609 -- Fixed IntegrityError that prevented altering a NULL column into a NOT NULL one due to existing rows
Thanks to Simon Charette, Loic Bistuer and Tim Graham for the review.

Backport of f633ba778d from master
2014-10-09 22:41:27 +07:00
Rudy Mutter e31be40f16 [1.7.x] Fixed #23365 -- Added support for timezone-aware datetimes to migrations.
Backport of a407b846b4 from master
2014-10-09 22:39:17 +07:00
Ian Foote d830665007 [1.7.x] Fixed #23333 -- Made urlsafe_base64_decode() return proper type on Python 3.
Backport of 03d89168a2 from master
2014-10-08 14:03:46 -04:00
André Ericson fa4b6482df [1.7.x] Fixed #23611 -- update_or_create failing from a related manager
Added update_or_create to RelatedManager, ManyRelatedManager and
GenericRelatedObjectManager.
Added missing get_or_create to GenericRelatedObjectManager.

Conflicts:
	tests/generic_relations/tests.py
	tests/get_or_create/tests.py

Backport of ed37f7e979 from master
2014-10-08 04:55:47 +07:00
Tim Graham 96f022203a [1.7.x] Fixed #23593 -- Fixed crash in AdminEmailHandler with non-ASCII characters in request.
Thanks edevil for the report and Simon Charette for review.

Backport of 9dff5ce7c7 from master
2014-10-06 17:37:38 -04:00
Markus Holtermann c2508990cb [1.7.x] Fixed #23601 -- Ensured view exists in URLconf before importing it in admindocs.
Backport of 2f16ff5a6c from master
2014-10-06 13:44:01 -04:00
Loic Bistuer 082abce81e [1.7.x] Fixed #23594 -- Fixed deepcopy on ErrorList.
Thanks Troy Grosfield for the report and Tim Graham for the tests.

Backport of ec2fd02bb3 from master
2014-10-07 00:14:11 +07:00
Emmanuelle Delescolle f8d845910b [1.7.x] Fixed #23604 -- Allowed related m2m fields to be references in the admin.
Thanks Simon Charette for review.

Backport of a24cf21722 from master
2014-10-06 08:43:05 -04:00