Commit Graph

5501 Commits

Author SHA1 Message Date
Tim Graham aa10f57d94 [1.7.x] Fixed #22819 -- Renamed output_type -> output_field in query expression API.
Thanks jorgecarleitao for the suggestion.

Backport of 95cc0e15b4 from master
2014-06-17 12:06:12 -04:00
Andrew Godwin 57a770b8e5 [1.7.x] Fix test breakage on MySQL 2014-06-17 00:36:41 -07:00
Andrew Godwin 6e7da2bfaf [1.7.x] Fixed #22851: BinaryView wasn't getting a binary default 2014-06-16 18:44:22 -07:00
Tim Graham dc7d0f50e2 [1.7.x] Renamed DatabaseFeature.supports_check_constraints to supports_column_check_constraints.
Thanks maxi for the suggestion.

Backport of 82c935d44c from master
2014-06-16 19:25:58 -04:00
Tim Graham 7f095ea744 [1.7.x] Removed some u'' prefixes to fix Python 3.2.
Backport of 317c480c04 from master
2014-06-16 18:50:07 -04:00
Vincent-Vega 6e248d8f8c [1.7.x] Fixed #22845 -- Correctly handled memcached default timeout value.
Backport of 4529af9ecf from master
2014-06-16 16:35:24 -04:00
Tim Graham d36b54d753 [1.7.x] Added database migration for contrib.auth.
refs #22170.

Backport of b341f33697 from master
2014-06-16 16:23:28 -04:00
Tim Graham a0bf14a2ac [1.7.x] Added database migration for contrib.contenttypes.
Moved contenttypes tests to allow them to run correctly in the presence of
migrations. refs #22170.

Backport of eb8600a656 from master
2014-06-16 15:03:27 -04:00
Andrew Godwin d9a7663b11 [1.7.x] Fixed #22783: Make sure swappable models come first in creation 2014-06-16 10:20:52 -07:00
Matthew Schinckel 2dba6ab767 [1.7.x] Fixed #22788 -- Ensured custom migration operations can be written.
This inspects the migration operation, and if it is not in the
django.db.migrations module, it adds the relevant imports to the
migration writer and uses the correct class name.

Backport of bb39037fcb from master
2014-06-16 12:39:05 -04:00
Tim Graham f7709b3ce4 [1.7.x] Removed usaged of contrib.sessions as a placeholder in migration tests.
Without this, we're unable to add actual migrations for the app.

Backport of 808388c28c from master
2014-06-16 11:52:33 -04:00
Xavier Fernandez 183e9d2029 [1.7.x] Fixed #22771 -- Fixed test.Client.logout when using custom auth backend.
Backport of 50b9313e0a from master
2014-06-16 08:29:52 -04:00
Andrew Godwin d4305a15c1 [1.7.x] Fixed #22844: Duplicate SQL for SQLite FKs 2014-06-16 00:27:46 -07:00
Alex Gaynor 39e2ad4532 [1.7.x] Fixed several flake8 errors
Backport of d17a4cb037 from master
2014-06-15 21:07:28 -04:00
Andrew Godwin a81282a512 [1.7.x] Fixed #22568: Better proxy model support in migrations 2014-06-15 16:02:24 -07:00
Andrew Godwin e5cde2062c [1.7.x] Fixed #22470: Full migration support for order_with_respect_to 2014-06-15 14:57:00 -07:00
Andrew Godwin 3ef87f664b [1.7.x] Persist non-schema-relevant Meta changes in migrations 2014-06-15 12:34:34 -07:00
Andrew Godwin 13aa079941 [1.7.x] Fixed #22833: Autodetector not doing through mapping correctly 2014-06-15 12:07:27 -07:00
Shai Berger 4b922b8094 [1.7.x] Fixed #22816 -- Corrected Oracle feature flag and fixed introspection test
Backport of 6122904 from master
2014-06-14 00:53:27 +03:00
mlavin d94de802d3 [1.7.x] Fixed #22477 -- Removed contrib middleware from the global settings defaults.
Also added a compatibility check for changed middleware defaults.
2014-06-13 12:40:42 -04:00
Tim Graham 83e96ee99b [1.7.x] Fixed a staticfiles test on Windows.
Backport of 9980f67154 from master
2014-06-12 13:29:04 -04:00
Tim Graham e51662e7bc [1.7.x] Fixed #22811 -- Allowed setting both the old and new TEST database settings.
An ImproperlyConfigured exception will be raised they mismatch.

Backport of 1c58cabad7 and a2cd0e12c9 from master
2014-06-12 13:28:16 -04:00
Andrew Godwin 961c9d6c6b [1.7.x] Fixed #22823 (and partly #22563) - FKs from unmigrated apps breaking state.
Thanks to bendavis78 for the test and diagnostic work.
2014-06-12 10:22:57 -07:00
Shai Berger fa42cf77b2 [1.7.x] Fixed #22487: Separated schema migration from data migration in test
The data migration failed on Oracle, killing the entire test suite.

Thanks timo for reporting the Oracle breakage,
and andrewgodwin for suggesting the solution.

Backport of 64d94cf from master
2014-06-11 20:28:21 +03:00
Tim Graham 45e47f7b95 [1.7.x] Fixed #22653 -- Added some database feature flags to tests.
Thanks Rahul Priyadarshi.

Backport of 99f5ea9cc8 from master
2014-06-11 11:48:57 -04:00
Moayad Mardini 7bd2ad1dd9 [1.7.x] Created a new tests folder (`model_options`).
And moved `tablespaces` option tests to it.
The new folder can be used to test models/options, like the new option
added in refs #22778.

Backport of 5a3ae7e260 from master
2014-06-11 11:40:08 -04:00
Florian Apolloner 1ff11304dc [1.7.x] Fixed #22680 -- I/O operation on closed file.
This patch is two-fold; first it ensure that Django does close everything in
request.FILES at the end of the request and secondly the storage system should
no longer close any files during save, it's up to the caller to handle that --
or let Django close the files at the end of the request.

Backport of e2efc8965e from master.
2014-06-11 09:03:11 +02:00
Greg Chapple d232a5f93f [1.7.x] Fixed #22792 -- Updated checks for list_display_links in model admin
Backport of d8f19bb3b6 from master
2014-06-10 09:43:24 -04:00
Tim Graham eeea583061 [1.7.x] Removed unused import.
Backport of fea8ccdcc4 from master
2014-06-09 18:42:32 -04:00
Aymeric Augustin 5cde9a7018 [1.7.x] Fixed #20420 -- Normalized query counts on Oracle.
This is achieved by inserting a fake entry in connection.queries when
not releasing a savepoint (since Oracle doesn't support that operation.)

Also removed the can_release_savepoints feature that was recently added,
but is superseded by this solution.

Backport of 40bfd856 from master.
2014-06-09 22:08:20 +02:00
Andrew Godwin 7406feae33 [1.7.x] Remove overzealous migration flushes from migration test suite 2014-06-09 09:52:35 -07:00
Andrew Godwin b78710ec02 [1.7.x] Fix broken alias testing test
Conflicts:
	tests/test_runner/tests.py
2014-06-08 20:08:34 -07:00
Andrew Godwin 08218252d8 [1.7.x] Fixed #22487: Optional rollback emulation for migrated apps
Conflicts:
	django/db/backends/creation.py
	django/test/runner.py
	docs/ref/settings.txt
	docs/topics/testing/advanced.txt
2014-06-08 19:33:52 -07:00
Andrew Godwin bf019c9770 [1.7.x] Fix router_honored test to not close connection 2014-06-08 18:58:15 -07:00
Andrew Godwin 55fa4c2d34 [1.7.x] Fixed #22777: Add dependency on through for autodetected M2M adds 2014-06-08 17:13:11 -07:00
Andrew Godwin b568bdf8da [1.7.x] Fixed #22750, #22248: Model renaming now also alters field FKs 2014-06-07 18:18:18 -07:00
Víðir Valberg Guðmundsson 3fc4f03895 [1.7.x] Fixed #22749: Making SQL management commands migration aware. 2014-06-07 17:18:43 -07:00
Andrew Godwin 98949e3b10 [1.7.x] Fixed #22436: More careful checking on method ref'ce serialization 2014-06-07 17:06:06 -07:00
Claude Paroz b236a55818 [1.7.x] Fixed #22773 -- Forced templatize() to return unicode
Backport of daaeb84158 from master.
2014-06-06 08:43:24 +02:00
Chris Beaven 9f1c4e4d3f [1.7.x] Implement Migration.run_before
This attribute (used for reverse dependencies) was previously declared
and mentioned in the code, but never actually used.
2014-06-05 23:28:17 -07:00
Andrew Godwin 31fc34e447 [1.7.x] Rewrote migration autodetector to involve actual computer science.
Fixes #22605, #22735; also lays the ground for some other fixes.

Conflicts:
	django/db/migrations/autodetector.py
2014-06-05 23:27:21 -07:00
Aymeric Augustin c9aedce01a Replaced an explicit vendor check by a feature flag. 2014-06-06 00:31:22 +02:00
Aymeric Augustin 1238f92c64 Checked can_introspect_null feature in a test. 2014-06-06 00:26:40 +02:00
Aymeric Augustin 342b25449d [1.7.x] Added a flag for the ability to introspect nullable fields.
Previously this was conflated with another Oracle-specific behavior.

Backport of a03d38d from master.
2014-06-05 17:57:48 +02:00
Aymeric Augustin 2e4bcb9b02 Avoided using BinaryField unecessarily in tests.
Several database backends struggle with binary data. This change
minimizes the risk of unrelated tests failures when binary fields
trigger errors.
2014-06-05 17:10:42 +02:00
Aymeric Augustin 4fb50a9a82 Reordered setUp code in prefetch_related tests.
This allows these tests to run on databases that reject duplicate NULL
values in unique fields e.g. SQL Server.
2014-06-05 16:30:43 +02:00
Alexandr Shurigin 8d6e0d4588 [1.7.x] Fixed #22681 -- Made TarArchive recognize leading directories properly.
Backport of 083d285b82 from master
2014-06-03 15:03:32 -04:00
Craig de Stigter 724e600872 [1.7.x] Fixed #22690 -- Added a check for proxy models containing fields.
Removed the FieldError raised by ModelBase.__new__ in this case.

Backport of ce993efda8 from master
2014-06-02 09:34:31 -04:00
Alex Gaynor 160fd6c7c1 [1.7.x] Removed an unused import
Backport of a31d7c48b0 from master
2014-06-02 07:14:02 -04:00
Tim Graham f8dd382a48 [1.7.x] Revert "Fixed #19303 -- Fixed ModelAdmin.formfield_overrides on fields with choices"
This reverts commit 9d1987d767.

Backport of 5046c110cf from master
2014-06-02 07:13:03 -04:00
Vincent-Vega d773a08b27 [1.7.x] Fixed #22711 -- Adjusted ordering checks to allow implicit relation fields.
refs #19195.

Backport of d04e730224 from master
2014-06-01 15:37:57 -04:00
Simon Charette 33511662dd [1.7.x] Fixed #22659 -- Prevent model states from sharing field instances.
Thanks to Trac alias tbartelmess for the report and the test project.

Backport of 7a38f88922 from master
2014-06-01 15:12:23 -04:00
Florian Apolloner ba31e45f08 [1.7.x] Revert "Making SQL management commands migration aware."
This reverts commit cb9c9a7b58.

Backport of 83e7555ffe from master.
2014-06-01 12:01:29 +02:00
Moayad Mardini 08a2b3b9cf [1.7.x] Improved the test for refs #22682.
Thanks apollo13 for the review.

Backport of 6f4d7f41b1 from master
2014-05-30 11:01:42 -04:00
Andrew Godwin 16d037c4f0 [1.7.x] Fix additional test failures caused by migration pollution 2014-05-29 16:44:29 -07:00
Moayad Mardini e4eae5df0e [1.7.x] Fixed #22682 -- `makemigrations` will create `MIGRATION_MODULES` package
`makemigrations` will automatically create the package specified
in `MIGRATION_MODULES` if it doesn't already exist.

Thanks ovidiuc4 for the report.
2014-05-29 15:39:02 -07:00
Víðir Valberg Guðmundsson b6a960cd1d [1.7.x] Making SQL management commands migration aware. 2014-05-29 15:36:30 -07:00
Tim Graham c5afdc3d73 [1.7.x] Removed unused import. 2014-05-29 09:28:58 -04:00
Alex Gaynor d192e02b27 [1.7.x] Fixed a typo that Tim Graham noticed
Backport of d240b29c08 from master
2014-05-29 07:53:08 -04:00
Alex Gaynor 3d98941d5c [1.7.x] Fixed several typos in Django
Backport of 1dcc603eff from master
2014-05-29 07:53:02 -04:00
Víðir Valberg Guðmundsson ce1dd6a730 [1.7.x] Adding test to fix of duplicate _order fields (#22720)
Backport of bf9953cfb8 from master
2014-05-29 07:52:48 -04:00
Shai Berger b8b1fbd4c1 [1.7.x] Set straight the sense of 'uppercases_column_names' feature flag 2014-05-28 21:26:08 +03:00
Aymeric Augustin 430faebe3b [1.7.x] Fixed #22699 -- Configure default settings in some management commands.
This makes it possible to run django.setup() in management commands that
don't need a settings module. In addition it simplifies error handling.

Thanks Claude for the review.

Backport of 4865326f from master.
2014-05-27 21:46:30 +02:00
Moayad Mardini c0a56001e0 [1.7.x] Fixed #22675 -- makemigrations --dry-run to output migrations to stdout.
`makemigrations --dry-run` will output the complete migrations file
that would be written if it's used along with `--verbosity 3`.

Backport of 2e613ea5c5 from master
2014-05-26 20:03:41 -04:00
Florian Apolloner 47d345fe6d [1.7.x] Restored Python 2 compatibility.
Backport of ee51ab9d23 from master.
2014-05-26 00:07:57 +02:00
Florian Apolloner 1992d55eb3 [1.7.x] Fixed a few warnings in the testsuite.
Backport of 536ebaa048 from master.
2014-05-25 23:15:31 +02:00
Moayad Mardini a59870e217 [1.7.x] Fixed #22676 -- makemigrations --dry-run should not ask for defaults
Made the fix in InteractiveMigrationQuestioner class code, rather than
MigrationAutodetector, because --dry-run shouldn't affect whether
MigrationAutodetector will detect non-nullable fields, but the
questioner should skip the question and returns a None for default
(since that won't be used anyway) if --dry-run is used.

Backport of ee14961a2a from master
2014-05-24 09:56:43 -04:00
Marc Tamlyn be733bf672 [1.7.x] Fixed #22510 -- Harden field removal to only None.
Refs #8620.

If we allow any value to remove form fields then we get name clashes
with method names, media classes etc. There was a backwards
incompatibility introduced meaning ModelForm subclasses with declared
fields called media or clean would lose those fields.

Field removal is now only permitted by using the sentinel value None.
The docs have been slightly reworded to refer to removal of fields
rather than shadowing.

Thanks to gcbirzan for the report and initial patch, and several of the
core team for opinions.

Backport of 9fb0f5dddc from master
2014-05-24 13:11:50 +01:00
Claude Paroz 8dad90911a [1.7.x] Made runtests.py use 'set_installed_apps' API
This will also trigger the ready method of any tested application,
which was not run before.
Backport of 19b4908206 from master.
2014-05-24 11:03:45 +02:00
Baptiste Mispelon 8f87b679ed [1.7.x] Fixed tuple serialization test.
Thanks to rockallite for the report.

Backport of f01d2a8f9b from master.
2014-05-23 14:51:22 +02:00
Huu Nguyen 8462883f9b [1.7.x] Fixed #22602 -- Improved code coverage of makemigrations command tests.
Backport of f851a954ac from master
2014-05-23 08:07:58 -04:00
Moayad Mardini 7d4a51e239 [1.7.x] Fixed #22679 -- Fixed empty tuple serialization in MigrationWriter.
Thanks rockallite.wulf for the report.

Backport of ad994a3c5b from master.
2014-05-22 16:20:21 +02:00
Ramiro Morales fb45e666c2 [1.7.x] Fixed #22421 -- Regression in fixtures loading.
Loading fixtures were failing since the refactoring in 244e2b71f5 for
inheritance setups where the chain contains abstract models and the
root ancestor contains a M2M relation.

Thanks Stanislas Guerra for the report.

Refs #20946.

Backport of 862e1ff234 from master
2014-05-22 07:38:39 -04:00
Tim Graham f25c5de4ce [1.7.x] Skipped a migrations test that's not supported on MySQL + Python 3.
Backport of dfeef8e147 from master
2014-05-21 07:04:46 -04:00
Andrew Godwin fd62bc165c [1.7.x] Fixed #22432: SQLite M2M repointing now works. Thanks to xelnor.
Backport of 03900a02d5 from master
2014-05-21 07:04:46 -04:00
Loic Bistuer c60240e712 [1.7.x] Failing testcases for #22649.
Backport of 5789ff7330 from master
2014-05-21 07:04:46 -04:00
Loic Bistuer d61b6224b0 [1.7.x] Fixed #22424 -- Fixed handling of default values for TextField/BinaryField on MySQL.
Thanks syphar for the review and suggestions.

Backport of 1d3d01b4f7 from master
2014-05-21 07:04:38 -04:00
Huu Nguyen f7270dcd9d [1.7.x] Fixed #22661 -- Move makemigrations tests to the proper class
Backport of 44304cf04e from master
2014-05-21 06:56:23 -04:00
Loic Bistuer 0fa1aeb8d8 [1.7.x] Fixed the ordering of prefetch lookups so that latter lookups can refer to former lookups.
Thanks Anssi Kääriäinen and Tim Graham for the reviews. Refs #17001 and #22650.

Backport of 870b0a1f86 from master
2014-05-21 10:37:41 +07:00
Loic Bistuer 24a41ecc35 [1.7.x] Fixed #22650 -- Fixed regression on prefetch_related.
Regression from f51c1f59 when using select_related then prefetch_related
on the reverse side of an O2O:

Author.objects.select_related('bio').prefetch_related('bio__books')

Thanks Aymeric Augustin for the report and tests. Refs #17001.

Backport of bdf3473e64 from master
2014-05-21 10:37:00 +07:00
Denis Cornehl 0007a43198 [1.7.X] Fixed #22557 -- ManifestStaticFilesStorage did not cleanup deleted files.
When using ManifestStaticFilesStorage, deleted static files would be
correctly cleaned up by "collectstatic --clear", but the manifest file
would still contain the stale entries.

Thanks to tedtieken for the report

Backport of 3bec38888f from master.
2014-05-20 18:19:40 +02:00
Marc Tamlyn 157575c7c8 [1.7.x] Fix a2dd618 for mysql.
Backport of 3b76502 from master
2014-05-19 15:05:23 +01:00
Marc Tamlyn c38925a601 [1.7.x] Fixed #22648 -- Transform.output_type should respect overridden custom_lookup and custom_transform.
Previously, class lookups from the output_type would be used, but any
changes to custom_lookup or custom_transform would be ignored.

Backport of a2dd618 from master
2014-05-19 15:05:23 +01:00
Alex Gaynor 8b87473008 [1.7.x] Fixed several flake8 errors, including one where a test wouldn't be run
Backport of b6b873d2ad from master
2014-05-17 13:31:09 -04:00
Shai Berger b7a67b788c [1.7.x] Fixed storing of binary fields and unicode textfields for Oracle/Python3
Backport of 6bb6df2943 from master
2014-05-17 01:16:06 +03:00
Aymeric Augustin 62de03ee33 [1.7.x] Optimized make_aware/naive by removing redundant checks. Refs #22625.
Also added tests with pytz and removed misplaced tests.

Backport of 1109ebd from master
2014-05-16 23:14:13 +02:00
Aymeric Augustin 6f8301d6cd [1.7.x] Fixed #22625 -- Normalized make_aware/naive errors.
Also added tests for is/make_aware/naive.

Thanks Tom Michaelis for the report.

Backport of fa89acf from master
2014-05-16 22:54:21 +02:00
Stas Rudakou 75d2da797e [1.7.x] Fixed #22266 - quote PK before redirecting away from add_view (django.contrib.admin)
Backport of ebd70d4d00 from master.
2014-05-16 18:38:26 +02:00
Erik Romijn 2a66d12e77 [1.7.x] Fixed #22579 -- Corrected validation for email to reject trailing slash
Backport of 424fe76349 from master.
2014-05-16 15:19:21 +02:00
Stephen Burrows 79f15ab1ef [1.7.x] Fixed #22628 -- Took initial forms into account when combining FormSet.min_num and FormSet.extra. 2014-05-16 06:37:05 -04:00
Claude Paroz e8a7436941 [1.7.x] Harmonized some PEP 0263 coding preambles
Backport of e520a73ee from master.
2014-05-15 20:01:31 +02:00
Anders Steinlein 2914f66983 [1.7.x] Fixed #17642 -- Added min_num support to modelformsets, inlines, and the admin.
Thanks Stephen Burrows for work on the patch as well.
2014-05-15 07:02:06 -04:00
Erik Romijn e7b0cace45 [1.7.x] Added additional checks in is_safe_url to account for flexible parsing.
This is a security fix. Disclosure following shortly.
2014-05-14 10:18:27 +02:00
Aymeric Augustin 7fef18ba9e [1.7.x] Dropped fix_IE_for_vary/attach.
This is a security fix. Disclosure following shortly.
2014-05-14 10:18:26 +02:00
Claude Paroz 9d0ebceb32 [1.7.x] Fixed #21685 -- Displayed app verbose name in admindocs model index
Backport of 4cf82e5bcf from master.
2014-05-10 18:10:05 +02:00
Aymeric Augustin e9d0ef19bc [1.7.x] Fixed #22508 -- Avoided overwriting select_related.
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.

Backport of f574220f from master
2014-05-10 17:03:42 +02:00
Aymeric Augustin c54fb3d922 [1.7.x] Adjusted refactoring of vendor checks.
Thanks Shai for the thorough review.

Backport of fb90b7c from master
2014-05-10 14:55:22 +02:00
Stephen Burrows 0c198035e9 [1.7.x] Fixed #22502 -- Fixed microseconds/default/form interaction
Made explicit lack of microsecond handling by built-in datetime form
fields. Used that explicitness to appropriately nix microsecond
values in bound fields. Thanks Claude Paroz for the review.
Backport of a5de0df58 from master.
2014-05-10 10:58:51 +02:00
Malcolm Box 8a090c21f1 [1.7.x] Fixed #22606 -- Locmemcache has_key() failed for infinite cache expiry
Refactored cache expiry logic for Locmemcache to make consistent across
all places where accessed, and correctly handle None as expiry time.
Backport of 66880e4cd from master.
2014-05-09 19:47:43 +02:00
Andrew Godwin 31eac71a76 [1.7.x] Tests for #22325 2014-05-08 21:49:09 -07:00