Commit Graph

6638 Commits

Author SHA1 Message Date
Tim Graham 31cb25adec [1.8.x] Fixed incorrect session.flush() in cached_db session backend.
This is a security fix; disclosure to follow shortly.

Thanks Sam Cooke for the report and draft patch.
2015-05-20 13:49:07 -04:00
Simon Charette 2b2a2157d0 [1.8.x] Refs #24652 -- Made sure template backend tests call their super setUpClass.
Backport of ead36e8a47 from master
2015-05-20 13:32:36 -04:00
Simon Charette 3ab3be4b5d [1.8.x] Refs #24652 -- Converted a template test to avoid executing queries.
Backport of 8bf1449edb from master
2015-05-20 13:32:35 -04:00
Simon Charette e846ea0649 [1.8.x] Refs #24652 -- Enforced test isolation in file_storage tests.
Backport of 3db21c351b from master
2015-05-20 13:32:35 -04:00
Tim Graham 525fd2f405 [1.8.x] Fixed typo in file_storage tests.
Backport of e2b77acedd from master
2015-05-20 13:06:10 -04:00
Anssi Kääriäinen db65660928 [1.8.x] Fixed #24705 -- Fixed negated Q objects in expressions.
Avoided split_exclude() for Q when used as an expression.

Backport of bc87061a3c from master
2015-05-20 09:41:42 -04:00
Tim Graham 3c0e03ef42 [1.8.x] Fixed #24812 -- Fixed app registry RuntimeWarnings in schema and migrations tests.
Backport of f5da438072 from master
2015-05-18 10:14:57 -04:00
Claude Paroz cdf7f90f95 [1.8.x] Fixed #24791 -- Added fallback when 'postgres' database isn't available
Thanks Carl Meyer and Tim Graham for the reviews.
Backport of 322605035 from master.
2015-05-15 18:46:05 +02:00
Bo Lopker 3c659856eb [1.8.x] Fixed #24799 -- Fixed session cookie deletion when using SESSION_COOKIE_DOMAIN
Backport of 2dee853ed4 from master
2015-05-15 11:24:18 -04:00
Claude Paroz 6a0d9f068f [1.8.x] Fixed #24757 -- Recreated MySQL index when needed during combined index removal
Thanks Thomas Recouvreux for the report and Tim Graham for the tests and
review.
Backport of ae635cc36 from master.
2015-05-15 17:08:49 +02:00
Tim Graham 30e5703844 [1.8.x] Fixed #24802 -- Delayed GDAL check for OSMGeoAdmin
Backport of a37dcfd0a3 from master
2015-05-15 09:20:04 -04:00
Tim Graham df0674eabb [1.8.x] Fixed #24751 -- Fixed HStoreField isnull lookup.
Backport of 3c8fe5dddf from master
2015-05-13 10:34:15 -04:00
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 adc57632bc 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 be9d645346 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 7b05d2fdae 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 29e90f3ae0 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
1aa3e09c20 and the _meta refactoring in fb48eb0581.

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 63f9b633f9 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 31e6c9c8e3 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 9c2d8cde77 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 eaeea6f947 from master
2015-04-28 09:31:35 -04:00
Alasdair Nicol 5105c1628d [1.8.x] Used assertIsInstance in tests.
Backport of d91321e8be 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 faad6070ee 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 b93690c465 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 36eab95e7f 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 ed336a1a5d 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 355c5edd93 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 97bb48d9ba 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 3caf7efb44 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 923da0274a 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 09595b4fc6 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 0385dad073 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 e8e4f978dd 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 d597174bd4 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 30a3c2f74c 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 a184a99123 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 0808ccce38 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 4ea1909d3c 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 4e59156c10 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 ba1665ed75 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 1f2abf784a 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 74f8110e74 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 23a5d64f40 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 127b3873d0 from master
2015-03-22 17:35:22 +11:00
Claude Paroz 8e4b0d6010 [1.8.x] Fixed #24515 -- Fixed DjangoTranslation plural handling
Backport of 9e83f30cd3 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
Karl Hobley a8c53041f9 [1.8.x] Fixed #24495 -- Allowed unsaved model instance assignment check to be bypassed.
Backport of 81e1a35c36 from master
2015-03-18 19:12:46 -04:00
Tim Graham 247251c2e1 [1.8.x] Refs #24483 -- Added a test for deconstruction of Field.choices
Backport of b4a56ed4f5 from master
2015-03-18 13:56:33 -04:00
Moritz Sichert 571e093a25 [1.8.x] Refs #24469 -- Fixed escaping of forms, fields, and media in non-Django templates.
Backport of 6bff343989 from master
2015-03-18 09:11:44 -04:00
Josh Smeaton a0cebe82b5 [1.8.x] Refs #24485 -- Renamed some expression types
Backport of 88d798d71a from master
2015-03-17 08:40:45 -04:00
Josh Smeaton 34e09e532d [1.8.x] Fixed #24486 -- Fixed error with datetime and DurationField arithmetic
Backport of ff2aa40192 from master
2015-03-17 08:36:15 -04:00
John Giannelos e150bbd4d6 [1.8.x] Fixed #24427 -- Stopped writing migration files in dry run mode when merging.
Also added display of migration to stdout when verbosity=3.

Backport of 8758a63ddb from master
2015-03-16 19:45:55 -04:00
Marten Kenbeek febcbbf89d [1.8.x] Fixed #24488 -- Made create_default_site() use default pk of 1.
Fixed create_default_site() to use a default value in case
settings.SITE_ID isn't set; refs #23945.

Backport of 818182b514 from master
2015-03-16 13:31:22 -04:00
Matthew Wilkes 22a67d22e9 [1.8.x] Refs #24354 -- Prevented repointing of relations on superclasses when migrating a subclass's name change
Forwardport of test and release note from stable/1.7.x

Backport of ae87ad005f from master
2015-03-14 15:47:10 -04:00
Tim Graham aba74d6f1e [1.8.x] Fixed escaping regression in urlize filter.
Now that the URL is always unescaped as of refs #22267,
we should re-escape it before inserting it into the anchor.

Backport of 7b1a67cce5 from master
2015-03-10 19:12:20 -04:00
Baptiste Mispelon 35d68e8e76 [1.8.x] Refs #24461 -- Added test/release notes for XSS issue in ModelAdmin.readonly_fields
This issue was fixed by refs #24464.
2015-03-09 10:15:12 -04:00
Erik Romijn d16e4e1d6f [1.8.x] Fixed #24464 -- Made built-in HTML template filter functions escape their input by default.
This may cause some backwards compatibility issues, but may also
resolve security issues in third party projects that fail to heed warnings
in our documentation.

Thanks Markus Holtermann for help with tests and docs.

Backport of fa350e2f30 from master
2015-03-09 09:31:07 -04:00
Anssi Kääriäinen 3a0fe942dd [1.8.x] Fixed #24171 -- Fixed failure with complex aggregate query and expressions
The query used a construct of qs.annotate().values().aggregate() where
the first annotate used an F-object reference and the values() and
aggregate() calls referenced that F-object.

Also made sure the inner query's select clause is as simple as possible,
and made sure .values().distinct().aggreate() works correctly.

Backport of fb146193c4 from master
2015-03-09 07:51:05 -04:00
Aymeric Augustin 311b880fa9 [1.8.x] Prevented some tests from writing in the CWD.
Backport of 90b069c33f from master
2015-03-07 10:40:17 -05:00
Jean-Louis Fuchs 1ae2df6bfc [1.8.x] Fixed #24447 -- Made migrations add FK constraints for existing columns
When altering from e.g. an IntegerField to a ForeignKey, Django didn't
add a constraint.

Backport of f4f0060fea from master
2015-03-07 14:15:27 +01:00
Claude Paroz ac07890f95 [1.8.x] Fixed urlize regression with entities in query strings
Refs #22267.
Thanks Shai Berger for spotting the issue and Tim Graham for the
initial patch.
Backport of ec808e807 from master.
2015-03-06 22:22:51 +01:00
Josh Smeaton 823f8cdbc9 [1.8.x] Fixed #24420 -- Allowed ordering by case expressions
Backport of ceaf31adff from master
2015-03-06 13:31:43 +11:00
Tim Graham 20bf320502 [1.8.x] Fixed #24426 -- Displayed admin actions panel when show_full_result_count=False.
Backport of 36a17be9f3 from master
2015-03-04 13:56:51 -05:00
Markus Holtermann bff446c205 [1.8.x] Fixed #24435 -- Prevented m2m field removal and addition in migrations when changing blank
Thanks Mark Tranchant for the report and Tim Graham for the test and
review.

Backport of a9e29fae10 from master
2015-03-04 15:44:38 +01:00
Claude Paroz c0df8d1be9 [1.8.x] Fixed #24413 -- Prevented translation fallback for English
Thanks Tomasz Kontusz for the report, Baptiste Mispelon for
analysis and Tim Graham for the review.
Backport of 3cf1c02695 from master.
2015-02-28 10:09:01 +01:00
Claude Paroz b825ec38c1 [1.8.x] Fixed #24418 -- Prevented crash in refresh_from_db with null fk
Thanks Johannes Lerch for the report, Tim Graham for the test case,
and Simon Charette for the review.
Backport of 5cf96b49e4 from master.
2015-02-27 20:25:12 +01:00
Michael Angeletti 278b698794 [1.8.x] Fixed #24391 -- Made BoundField.value() cache callable values.
Backport of 65441bbdb0 from master
2015-02-24 20:05:16 -05:00
Stanislas Guerra a3fca05b05 [1.8.x] Fixed #24395 -- Ensured inline ModelsForms have an updated related instance.
Backport of 4c2f546b55 from master
2015-02-24 11:49:27 -05:00
Preston Timmons 450b42eafe [1.8.x] Cleaned up template directory handling in template tests.
Backport of 8e129b42ad from master
2015-02-24 09:22:25 -05:00
Preston Timmons b22d20dd18 [1.8.x] Combined TemplateTests and TemplateRegressionTests.
Backport of 32c108a221 from master
2015-02-24 09:22:20 -05:00
Preston Timmons 2e7414cdf4 [1.8.x] Moved test_token_smart_split into ParserTests.
Backport of 25a0b5cdcd from master
2015-02-24 09:22:15 -05:00
Preston Timmons e15292daa0 [1.8.x] Moved ifchanged tests into syntax_tests/test_if_changed.py.
Backport of 3d8fee6051 from master
2015-02-24 09:22:05 -05:00
Preston Timmons f3a49c628e [1.8.x] Moved cache tests into syntax_tests/test_cache.py.
Backport of f6d087b628 from master
2015-02-24 09:21:54 -05:00
Preston Timmons d8114552a0 [1.8.x] Moved RequestContextTests into test_context.
Backport of 250a3d1993 from master
2015-02-24 09:18:28 -05:00
Preston Timmons c1bf9e47ec [1.8.x] Moved TemplateTagLoading cases into test_custom.
Backport of ff67ce5076 from master
2015-02-24 09:17:45 -05:00
Preston Timmons 272208c124 [1.8.x] Moved include tests into syntax_tests/test_include.py.
Backport of 06ffc764a9 from master
2015-02-24 09:10:01 -05:00
Preston Timmons cdb73ec8cd [1.8.x] Moved ssi tests into syntax_tests/test_ssi.py.
Backport of 441a47e1ef from master
2015-02-24 09:09:52 -05:00
Tim Graham 210bf24ddb [1.8.x] Cleaned up template loader tests.
Backport of 1827aa9024 from master
2015-02-24 08:59:05 -05:00
Nik Nyby 3e0df285fd [1.8.x] Fixed typos in flatpages_tests comments.
Backport of 2be6b52656 from master
2015-02-24 06:31:59 -05:00
Aymeric Augustin e3953de900 [1.8.x] Normalized usage of the tempfile module.
Specifically stopped using the dir argument.

Backport of a8fe12417f from master
2015-02-23 15:26:35 -05:00
Aymeric Augustin fae31f2348 [1.8.x] Guaranteed removal of temporary files during tests.
Dropped the DJANGO_TEST_TEMP_DIR environment variable.

Before this change, proper removal depended on the developer passing
dir=os.environ['DJANGO_TEST_TMP_DIR'] to tempfile functions.

Backport of 934400759d from master
2015-02-23 15:26:26 -05:00
Tim Graham 41d5ed480c [1.8.x] Fixed #24377 -- Fixed model inline formsets with primary key's that have defaults.
Backport of 1306cd1e8a from master
2015-02-23 09:01:00 -05:00
Anssi Kääriäinen 155a127afb [1.8.x] Fixed #24381 -- removed ForeignObjectRel opts and to_opts
These cached properies were causing problems with pickling, and in
addition they were confusingly defined: field.rel.model._meta was
not the same as field.rel.opts.

Instead users should use field.rel.related_model._meta inplace of
field.rel.opts, and field.rel.to._meta in place of field.rel.to_opts.

Backport of f95122e541 from master
2015-02-23 07:26:10 -05:00
Marten Kenbeek 980dfca717 [1.8.x] Fixed #24366 -- Optimized traversal of large migration dependency graphs.
Switched from an adjancency list and uncached, iterative depth-first
search to a Node-based design with direct parent/child links and a
cached, recursive depth-first search. With this change, calculating
a migration plan for a large graph takes several seconds instead of
several hours.

Marked test `migrations.test_graph.GraphTests.test_dfs` as an expected
failure due to reaching the maximum recursion depth.

Backport of 78d43a5e10 from master
2015-02-23 12:55:43 +01:00
Aymeric Augustin c564033408 [1.8.x] Fixed #24389 -- Isolated the CSRF view from the TEMPLATES setting.
Thanks uranusjr for the report and analysis.

Backport of 88a5f17 from master
2015-02-22 15:47:11 +01:00
Michael Angeletti 1feeefe918 [1.8.x] Fixed #24376 -- added verbose_name arg to UUIDField
Backport of ea3168dc6c from master
2015-02-21 14:26:47 -05:00
Aymeric Augustin 481d3bd617 [1.8.x] Removed obsolete reference to media directory.
Backport of 787dd6519a from master
2015-02-21 13:08:15 -05:00
Aymeric Augustin 82e323167d [1.8.x] Removed workaround for SVN limitations.
In addition to simplifying the code, this reduces the number of writes.

Backport of bd059e3f8c from master
2015-02-21 13:07:59 -05:00
Aymeric Augustin de3bda9cd3 [1.8.x] [1.8.x] Avoided collecting admin static files in tests.
This makes the staticfiles tests 2.5 times faster.

Backport of 2bb5b0e098 from master

Backport of bd059e3f8c from master
2015-02-21 13:07:42 -05:00
Aymeric Augustin 5c02c75068 [1.8.x] Removed TestServeAdminMedia.
It should have been removed when the ADMIN_MEDIA_PREFIX setting was deprecated.

Backport of 1d9d39fa1c from master
2015-02-21 13:05:11 -05:00
Loic Bistuer 850b2ca794 Removed zombie file again.
Refs 5355baf6c7.
2015-02-21 22:34:00 +07:00
Loic Bistuer 1b73c764d4 Fixed a couple of allow_migrate routers in tests.
This reverts commit 88e6fbb2e3.
2015-02-21 21:44:05 +07:00
foresmac 3207fcd0a0 [1.8.x] Fixed #24341 -- Added specific error messages to RangeField subclasses
Backport of 1d1d5d1c31 from master
2015-02-20 16:50:41 -05:00
Tim Graham 88e6fbb2e3 Silenced a deprecation warning in commands_sql test. 2015-02-20 13:24:29 -05:00
Tim Graham 5355baf6c7 Removed an inadvertently added test directory. 2015-02-20 13:16:42 -05:00
Anssi Kääriäinen 6f03a4ca91 [1.8.x] Fixed #24328 -- cleaned up Options._get_fields() implementation
Backport of bad5f262bf from master
2015-02-20 13:11:59 -05:00
Loic Bistuer 3a6c37fce4 [1.8.x] 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.

Conflicts:
	django/db/utils.py

Backport of bed504d70b from master
2015-02-20 21:55:50 +07:00
Marc Tamlyn b6ef67d752 [1.8.x] Fixed #24373 -- Added run_validators to ArrayField.
Thanks to DavidMuller for the report.

Backport of c490e410af from master
2015-02-20 11:53:17 +00:00
Marc Tamlyn 3886338c1d [1.8.x] Update converters to take a consistent set of parameters.
As suggested by Anssi. This has the slightly strange side effect of
passing the expression to Expression.convert_value has the expression
passed back to it, but it allows more complex patterns of expressions.

Backport of 32d4db66b9 from master
2015-02-20 11:47:48 +00:00
Marc Tamlyn c54d73ae01 [1.8.x] Fixed #24343 -- Ensure db converters are used for foreign keys.
Joint effort between myself, Josh, Anssi and Shai.

Conflicts:
	django/db/models/query.py
	tests/model_fields/models.py

Backport of 4755f8fc25 from master.
2015-02-20 11:46:57 +00:00
Alex Vidal 82f39bfb1a [1.8.x] Fixed typo in django.core.servers.basehttp message.
Backport of e467919c63 from master
2015-02-19 19:37:22 -05:00
Aymeric Augustin cc4effba0b [1.8.x] Set context.template instead of context.engine while rendering.
This opens more possibilities, like accessing context.template.origin.

It also follows the chain of objects instead of following a shortcut.

Backport of 1bfcc95 from master
2015-02-19 22:10:56 +01:00
Claude Paroz 84e7fec88d [1.8.x] Fixed #20889 -- Prevented BadHeaderError when Python inserts newline
Workaround for http://bugs.python.org/issue20747.
In some corner cases, Python 2 inserts a newline in a header value
despite `maxlinelen` passed in Header constructor.
Thanks Tim Graham for the review.
Backport of efb1f99f94 from master.
2015-02-19 20:19:38 +01:00
Shai Berger 66d37e593c [1.8.x] Fixed #24307: Avoided redundant column nullability modifications on Oracle
Thanks Joris Benschop for the report, and Tim Graham for the tests.

Backport of ceadc94f09 from master
2015-02-19 02:44:08 +02:00
Shai Berger e2a3be1e4d [1.8.x] Fixed #24362: Made test run each migration operation in its own schema editor
Thanks Tim Graham for pointing out the fix.

Backport of f7d34fe from master ticket_24362
2015-02-18 22:51:06 +02:00
Marten Kenbeek 84c9b24c5a [1.8.x] Fixed #24291 - Fixed migration ModelState generation with unused swappable models
Swapped out models don't have a _default_manager unless they have
explicitly defined managers. ModelState.from_model() now accounts for
this case and uses an empty list for managers if no explicit managers
are defined and a model is swapped out.

Backport of 15dc8d1c9d from master
2015-02-18 19:11:51 +01:00
Tim Graham 5068a51d88 [1.8.x] Refs #24324 -- Skipped fixtures_regress tests that fail on Python 2 on a non-ASCII path.
Backport of b8d6cdbcc9 from master
2015-02-18 07:36:02 -05:00
Tim Graham 2aa06e439a [1.8.x] Refs #24324 -- Fixed Python 2 test failures when path to Django source contains non-ASCII characters.
Backport of 307c0f299a from master
2015-02-17 19:05:31 -05:00
Tim Graham ec9119d4ec [1.8.x] Fixed "environment can only contain strings" in model_regress test on Windows.
Backport of ad50b6c853 from master
2015-02-17 13:55:18 -05:00
Tim Graham b2f7daa4a6 [1.8.x] Refs #24324 -- Fixed UnicodeDecodeError in model_regress test on non-ASCII path.
Backport of d316b43d0a from master
2015-02-17 07:35:00 -05:00
Tim Graham a00a0f8804 [1.8.x] Fixed #24290 -- Skipped postgres_tests if not running with PostgreSQL.
Backport of 8b39f33d78 from master
2015-02-17 06:35:17 -05:00
Tim Graham 730fb593ad [1.8.x] Fixed #24335 -- Bumped required psycopg2 version to 2.4.5 (2.5 for contrib.postgres).
Backport of 3adc5f1ee6 from master
2015-02-17 06:21:59 -05:00
Tim Graham ad2c6a756b [1.8.x] Moved contrib.contenttypes tests out of contrib.
Backport of 664c038f2c from master
2015-02-16 18:06:13 -05:00
Markus Holtermann 906d682ba0 Fixed regression in test introduced in d538e37e1b 2015-02-16 20:38:18 +01:00
Markus Holtermann b7cf99a8c3 [1.8.x] Added tests for get_related_models_recursive
Backport of d538e37e1b from master
2015-02-16 19:38:10 +01:00
Markus Holtermann 4e9ecfee77 [1.8.x] Refs #24282 -- Added failing test case for assigning models of wrong type to FK
Thanks Jeff Singer for the test case.

Backport of 273bc4b667 from master
2015-02-16 19:37:57 +01:00
Markus Holtermann 8ca0eb2af7 [1.8.x] Refs #24264 -- Added failing test case for updating a FK when changing a PK
When the primary key column is altered, foreign keys of referencing
models must be aware of a possible data type change as well and thus
need to be re-rendered.

Thanks Tim Graham for the report.

Backport of cc22b009e0 from master
2015-02-16 19:37:51 +01:00
Claude Paroz 10ea9ef012 [1.8.x] Refs #24225 -- Added failing test case for removing a previously added field in migrations
When a related field is deleted, the related model must be updated. As
unchanged models are shared in migration states, the related model must
be re-rendered so that the change applies to a new copy of the related
model.

Thanks Henrik Heimbuerger for the report.

Backport of 58d0dd9260 from master
2015-02-16 19:37:40 +01:00
Marten Kenbeek bc2eb6bfef [1.8.x] Fixed #24345 -- Isolated sitemaps_tests from contenttypes_tests; refs #11505
Backport of f668bac9d2 from master
2015-02-16 08:43:06 -05:00
Tim Graham ba9f602708 [1.8.x] Added new "W503 line break before binary operator" warning to flake8 ignore.
Backport of d652906aeb from master
2015-02-15 20:09:13 -05:00
Aymeric Augustin e8950668ca [1.8.x] Deprecated TEMPLATE_DEBUG setting.
Backport of 15b711b from master.
2015-02-15 20:48:48 +01:00
Tim Graham 259259a819 [1.8.x] Isolated auth_tests from contenttypes_tests; refs #11505.
Backport of e0b3926026 from master
2015-02-14 22:36:49 -05:00
Michael Angeletti e13dca859c [1.8.x] Added missing return value to DurationField.prepare_value(); refs #24339.
Backport of 49647bec6e from master
2015-02-14 18:39:17 -05:00
Aymeric Augustin 87e9cad4a4 [1.8.x] Fixed #24318 -- Set the transaction isolation level with psycopg >= 2.4.2.
Backport of 76356d96 from master
2015-02-14 18:52:28 +01:00
Michael Angeletti 2e6d8e51db [1.8.x] Fixed #24339 -- Fixed crash with empty DurationField form field.
Backport of 8a21d25033 from master
2015-02-14 07:38:20 -05:00
Aymeric Augustin 0f3eb8260b [1.8.x] Fixed #24338 -- Accepted Template wrapper in {% extends %}.
Explicitly checking for django.template.Template subclasses is
preferrable to duck-typing because both the django.template.Template and
django.template.backends.django.Template have a render() method.

Thanks spectras for the report.

Backport of 47ee7b48 from master
2015-02-14 10:36:44 +01:00
Loic Bistuer 20b621eb3c [1.8.x] Fixed #24289 -- Reversed usage of Field.many_to_one and one_to_many.
Thanks Carl Meyer and Tim Graham for the reviews and to all involved
in the discussion.

Backport of 18c0aaa912 from master
2015-02-14 02:42:06 +07:00
Andriy Sokolovskiy 136edac897 [1.8.x] Fixed #24320 - Used field.value_to_string() in serialization of foreign key.
This fixes serialization of a ForeignKey to a UUIDField as the
test indicates.

Backport of 5c995dcfc2 from master
2015-02-13 12:45:35 -05:00
Tim Graham 2347f3267f [1.8.x] Fixed #24315 -- Fixed auth.views.password_reset_confirm() with a UUID user.
Backport of 002425fe39 from master
2015-02-13 09:57:44 -05:00
Tim Graham 8fc4840289 [1.8.x] Fixed #24334 -- Allowed admin password reset to work with non-digit custom user model primary key.
Thanks Loic for help and Simon for review.

Backport of fdf20093e0 from master
2015-02-13 09:50:55 -05:00
Markus Holtermann bd80fa6b0f [1.8.x] Fixed #24184 -- Prevented automatic soft-apply of migrations
Previously Django only checked for the table name in CreateModel
operations in initial migrations and faked the migration automatically.
This led to various errors and unexpected behavior. The newly introduced
--fake-initial flag to the migrate command must be passed to get the
same behavior again. With this change Django will bail out in with a
"duplicate relation / table" error instead.

Thanks Carl Meyer and Tim Graham for the documentation update, report
and review.

Backport of f287bec583 from master
2015-02-13 15:21:10 +01:00
Markus Holtermann 4ba7d73f94 [1.8.x] Removed explicit pointers to migration modules for contrib apps in runtest
Thanks Tim Graham for the patch

Backport of b4e1090ab2 from master
2015-02-13 15:21:03 +01:00
Markus Holtermann 45d93baf51 [1.8.x] Refs #22962 -- Made test case use non-conflicting table names
Backport of b06935a486 from master
2015-02-13 14:39:50 +01:00
Tim Graham 4c948c7c9d [1.8.x] Fixed #24332 -- Fixed contrib.sites create_default_site() when 'default' DATABASES is empty.
Backport of e8cf4f8abe from master
2015-02-13 07:02:37 -05:00