1
0
mirror of https://github.com/django/django.git synced 2025-03-12 10:22:37 +00:00

6526 Commits

Author SHA1 Message Date
Abhaya Agarwal
290c9d6654 [1.8.x] Fixed #24698, #24712 -- Added ForeignKey.get_db_prep_value()
Fixed crashes with ForeignKey to UUIDField and inheritance with UUIDField
primary keys.
2015-05-12 19:37:37 -04:00
Anssi Kääriäinen
d5ce2dd7bc [1.8.x] Fixed #24748 -- Fixed incorrect GROUP BY on MySQL in some queries
When the query's model had a self-referential foreign key, the
compiler.get_group_by() code incorrectly used the self-referential
foreign key's column (for example parent_id) as GROUP BY clause
when it should have used the model's primary key column (id).

Backport of adc57632bc26cc8fe42bdb6aff463f883214980a from master
2015-05-11 11:52:14 -04:00
Anssi Kääriäinen
056a91dbfa [1.8.x] Fixed #24766 -- Added join promotion for Case expressions
Backport of be9d645346a20a6c394bf70d47b1b1d5c81ff530 from master
2015-05-11 11:17:37 -04:00
Anssi Kääriäinen
5b5858575c [1.8.x] Fixed #24752 -- query crash when reusing Case expressions
Case expressions weren't copied deep enough (self.cases list was
reused resulting in an error).

Backport of 7b05d2fdaed582662d8f79130932f600f4f966a0 from master
2015-05-05 11:38:48 -04:00
Aymeric Augustin
1f0a6082ec [1.8.x] Fixed #24685 -- Fixed check for template name unicity.
Thanks Preston Timmons for the report.

Backport of 1563b89 from master
2015-05-04 07:39:28 +02:00
Tim Graham
556b1c8ad3 [1.8.x] Fixed model_regress test failure on non-ASCII path; refs #24717.
Backport of 29e90f3ae0b0b72bbdf342e0136414bff917c6a6 from master
2015-04-30 08:13:30 -04:00
Markus Holtermann
bf4dc5733f [1.8.x] Fixed #24725 -- Allowed renaming of target models in ManyToMany relations
This is a regression caused by introducing rendered migration states in
1aa3e09c2043 and the _meta refactoring in fb48eb05816b.

Thanks to Danilo Bargen for reporting the issue and Marten Kenbeek and
Tim Graham for triaging the bug and providing the initial test case.

Backport of 63f9b633f9cb620a4c4764b47dca127706a8d7b4 from master
2015-04-30 13:46:24 +02:00
David D. Riddle
8c58caaf9d [1.8.x] Fixed #24717 -- Fixed model_regress test failure on RHEL6 SCL
The test failed on RHEL6 systems running python 2.7 from a RedHat
Software Collection (SCL) because this test runs an external python
script with a stripped system environment. RedHat SCLs work by setting
a number of system environment variables when these are stripped out by
this test the python 2.7 interpreter is no longer able to function
properly because it can not find the system libraries needed.

Now we use use mock to modify the system environment directly.

Backport of 31e6c9c8e310e68a96c1f76b9657242c6cecaa4d from master
2015-04-29 12:28:39 -04:00
Aric Coady
b67bd1b483 [1.8.x] Fixed #24719 -- Restored the ability to use interators as queryset related object filters.
Backport of 9c2d8cde77ee6edd407e92f93eacd4624290394f from master
2015-04-28 11:00:58 -04:00
Alasdair Nicol
c37eb3c870 [1.8.x] Fixed #24714 -- Used more specific assertions than assertEqual in tests.
Backport of eaeea6f94701547ce1b50dbcf5cf71460e9e4c91 from master
2015-04-28 09:31:35 -04:00
Alasdair Nicol
5105c1628d [1.8.x] Used assertIsInstance in tests.
Backport of d91321e8be0d8e52546026d461b14157d565870c from master
2015-04-27 08:42:52 -04:00
Markus Holtermann
419f296259 [1.8.x] Fixed #24701 -- Converted model manager names to unicode in migrations
Thanks to Reto Aebersold for reporting the issue and Tim Graham and
Claude Paroz for the review.

Backport of faad6070ee2eeea270c76381f9ca5999bf1ac15f from master
2015-04-25 18:18:40 +02:00
Markus Holtermann
0cacb8f8ba [1.8.x] Fixed #24573 -- Considered new related models for reloading
Thanks tttomekkk for the report.

Backport of b93690c4652a108b4305c0df34509bfc267fd927 from master
2015-04-21 12:06:11 +02:00
Yoong Kang Lim
b8f203b3f2 [1.8.x] Fixed #24667 --- Repaired model_fields cardinality test
Backport of 36eab95e7fde7fad4368192ddbef4e2dbb32dc91 from master
2015-04-20 09:41:38 -04:00
Claude Paroz
ff6e8681a3 [1.8.x] Fixed #24658 -- Added missing Meta attribute in schema tests
Without that, the Note model would be initially created and then
the tests using that model failed when run in isolation.
Backport of f54c0ec06e from master.
2015-04-19 00:08:21 +02:00
Shai Berger
8363f217f2 [1.8.x] Fixed #24595 Oracle test failure
The only problem for Oracle was the test, which tested nullity on
text/char fields -- but Oracle interprets_empty_strings_as_null.

Backport of d5a0acc from master
2015-04-18 18:55:54 +03:00
Claude Paroz
bbfcd9618b [1.8.x] Fixed #24595 -- Prevented loss of null info in MySQL field alteration
Thanks Simon Percivall for the report, and Simon Charette and Tim
Graham for the reviews.
Backport of 02260ea3f6 from master.
2015-04-17 11:01:36 +02:00
Tim Graham
d0b18542f7 [1.8.x] Fixed gis_tests when run without GIS dependencies.
Backport of ed336a1a5d3991acef2208b7aaf9fbe99af48a14 from master
2015-04-16 20:01:30 -04:00
Anssi Kääriäinen
581afddc77 [1.8.x] Fixed #24605 -- Fixed incorrect reference to alias in subquery.
Thanks to charettes and priidukull for investigating the issue, and to
kurevin for the report.

Backport of 355c5edd9390caad5725375abca03460805f663b from master
2015-04-16 09:31:29 -04:00
Anssi Kääriäinen
70ff455a35 [1.8.x] Fixed #24615 -- ordering by expression not part of SELECT
Fixed queries where an expression was used in order_by() but the
expression wasn't in the query's select clause (for example the
expression could be masked by .values() call)

Thanks to Trac alias MattBlack85 for the report.
Backport of fb5c7748da from master.
2015-04-16 09:42:42 +02:00
Jon Dufresne
c38d8f0f87 [1.8.x] Fixed model_fields tests to use django TestCase.
Backport of 97bb48d9ba864060d57a3137fb9c456b98ecc79b from master
2015-04-15 08:19:55 -04:00
Markus Holtermann
584c6591a3 [1.8.x] Refs #24625 -- Filtered docutils warnings output in tests
Instead of setting ``warning_stream`` in the docutils config overrides
to ``False`` I opted for filtering the stderr in the tests to keep the
error output showing up in server logs.

Thanks Tim Graham for the report and review

Backport of 3caf7efb44712f89d6552076c240a3c898673a2c from master
2015-04-14 11:27:57 +02:00
Jay Wineinger
496800b3bf [1.8.x] Fixed #24611 -- Fixed update() crash with related UUID pk object.
Backport of 923da0274a9a8c4ef2ac9776f71bd14628e39fc3 from master
2015-04-13 12:20:41 -04:00
Markus Holtermann
3862826fed [1.8.x] Fixed #24625 -- Prevented arbitrary file inclusion in admindocs
Thanks Tim Graham for the review.

Backport of 09595b4fc67ac4c94ed4e0d4c69acc1e4a748c81 from master
2015-04-11 21:12:09 +02:00
Claude Paroz
774d09a7dd [1.8.x] Fixed #24624 -- Replaced obsoleted rel.opts in admindocs view
Thanks Scott Sanders for the report, and Markus Holtermann and
Tim Graham for the reviews. Refs #24381.
Backport of 4e7ed8d0d from master.
2015-04-11 15:34:02 +02:00
Tim Graham
b1dc128a03 [1.8.x] Fixed #24578 -- Fixed crash with QuerySet.update() on FK to O2O fields.
Thanks Anssi Kääriäinen for review.

Backport of 10b4c010ab2cdaa6ba8bfaec3e3540299ea77be from master
2015-04-09 08:24:07 -04:00
Patryk Zawadzki
9f632dc702 [1.8.x] Fixed #24513 -- Made sure a model is only rendered once during reloads
This also prevents state modifications from corrupting previous states.
Previously, when a model defining a relation was unregistered first,
clearing the cache would cause its related models' _meta to be cleared
and would result in the old models losing track of their relations.

Backport of 0385dad073270c37f8c4a5f13edce43f2a69ba8a from master
2015-04-07 14:56:33 +02:00
Jon Dufresne
551d4bb46a [1.8.x] Fixed #24584 -- Fixed microsecond handling with older MySQLdb
Backport of 2cf58e80d from master.
2015-04-06 22:45:36 +02:00
Marten Kenbeek
773387ce42 [1.8.x] Fixed #24278 -- Fixed serialization of migration operations.
Fixed MigrationWriter.serialize() to correctly handle migration
operations by utilizing OperationWriter.

Thanks Piotr Maliński for the report.

Backport of e8e4f978dd4b7a3d0c689c6e3301e3c6f9e50003 from master
2015-04-05 20:29:27 +02:00
Marten Kenbeek
651cc369ad [1.8.x] Refs #24278 -- Allowed multi-line serializations in OperationWriter.
Changed OperationWriter to support multi-line serialized values with
correct indentation.

Backport of d597174bd4cfd9a0e1b34dae8b4d8d027a8cab72 from master
2015-04-05 20:29:21 +02:00
Tim Graham
3313156d8e [1.8.x] Fixed flake8 warning. 2015-04-04 07:50:53 -04:00
Claude Paroz
3a76276212 [1.8.x] Fixed #24569 -- Made some translation functions accept None value
get_language() can return None when translations are deactivated.
Thanks Nicola Peduzzi for the reporti and Tim Graham for the review.
Backport of 7a0d9b5cda from master.
2015-04-04 10:58:54 +02:00
Claude Paroz
7821f856a6 [1.8.x] Fixed #24571 -- Restored testserver positional arguments parsing
Thanks Domas Lapinskas for the report and Tim Graham for the
review.
Backport of 426b63ba04 from master.
2015-04-04 10:48:40 +02:00
Baptiste Mispelon
09188b5024 [1.8.x] Fixed #24566 -- Added support for serializing timedelta
Thanks to knbk for the report.

Backport of 30a3c2f74c030449d3a8b9f02ab6744874712e54 from master.
2015-04-02 17:41:08 +02:00
Tim Graham
e7366ab1f9 [1.8.x] Fixed mistakes in tests unveiled by version bump to 1.8.1. 2015-04-02 07:01:42 -04:00
Claude Paroz
70c5031d56 [1.8.x] Adapted form regression test to new translations
Backport of 2112b7d78 from master.
2015-04-01 19:53:11 +02:00
Tim Graham
5a4f95805f [1.8.x] Refs #24538 -- Simplified a test per Aymeric's feedback.
Backport of a184a99123e4dc4c2a90c20e1604e5d301cd76bf from master
2015-04-01 13:19:57 -04:00
Tim Graham
5c63c45512 [1.8.x] Fixed #23441, #24555 -- Improved the behavior of InclusionNode.
This change:

* Makes the InclusionNode cache-safe by removing render-time side effects
  to its nodelist.
* Ensures the render_context stack is properly scoped and reset by updating
  the render call to use Template.render rather than Nodelist.render.

Backport of 0808ccce3808235c5b5a56e3f689cec0d4bc0ebf from master
2015-04-01 13:12:18 -04:00
Tim Heap
ff8eabc5cc [1.8.x] Fixed #24538 -- Allowed self in Jinja context
Rendering a Jinja template with self in the context threw an error.
While self is a reserved variable in Jinja, including self in the
context is not an error, so Django should respect that.

Backport of 4ea1909d3c420ba1fbdbf7221cad518d43aef885 from master
2015-04-01 12:27:52 -04:00
Tim Graham
7b9f7b6670 [1.8.x] Fixed sessions test on Python 3.5; refs #23763.
SimpleCookie.__repr__() changed in
https://hg.python.org/cpython/rev/88e1151e8e02

Backport of 4e59156c10d36eeb1e6fced4dff0f11157f68264 from master
2015-03-31 08:41:31 -04:00
Tim Graham
c0102dc7ff [1.8.x] Fixed skipping of gis_tests when dependencies not installed.
Backport of ba1665ed75264e57b7bc6cd7606e072ad3050a3b from master
2015-03-28 09:39:49 -04:00
Moritz Sichert
44a05a8a91 [1.8.x] Fixed #24469 -- Refined escaping of Django's form elements in non-Django templates.
Backport of 1f2abf784a9fe550959de242d91963b2ad6f7e9c from master
2015-03-27 20:01:41 -04:00
Varun Sharma
8f5e8ab666 [1.8.x] Added test for LogEntry.get_edited_object(); refs #24244.
Backport of 74f8110e74927c231bfcd106fa28bf6e6dd034e6 from master
2015-03-23 08:52:32 -04:00
Bas Peschier
015a9b928a [1.8.x] Fixed #13525 -- Added tests and docs for nested parameters in URL patterns.
When reversing, only outer parameters are used if captured parameters are
nested. Added tests to check the edge cases and documentation for the
behavior with an example to avoid it.

Backport of 23a5d64f40b0f4a3fbfef7427ca793cb1df1034e from master
2015-03-23 08:43:58 -04:00
Tim Graham
ce6062dbd9 [1.8.x] Fixed backport of refs #24485 tests. 2015-03-22 16:14:15 -04:00
Josh Smeaton
e654123f7f Fixed #24485 -- Allowed combined expressions to set output_field 2015-03-22 17:41:12 +11:00
Josh Smeaton
3a1886d111 [1.8.x] Fixed #24508 -- Made annotations commutative
Backport of 127b3873d03704f77428b984de022664b268314e from master
2015-03-22 17:35:22 +11:00
Claude Paroz
8e4b0d6010 [1.8.x] Fixed #24515 -- Fixed DjangoTranslation plural handling
Backport of 9e83f30cd31 from master.
2015-03-21 10:29:22 +01:00
Tim Graham
770427c289 [1.8.x] Made is_safe_url() reject URLs that start with control characters.
This is a security fix; disclosure to follow shortly.
2015-03-18 19:23:21 -04:00
Tim Graham
5447709a57 [1.8.x] Fixed an infinite loop possibility in strip_tags().
This is a security fix; disclosure to follow shortly.
2015-03-18 19:23:21 -04:00