test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
18,325 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

5626 Commits

Author SHA1 Message Date
Andrew Godwin 1f889800d6 [1.7.x] Fixed #22960: Bad handling of relations as PKs in autodetector 2014-07-05 16:33:34 -07:00
Claude Paroz 83a185a3f7 [1.7.x] Ensured bound field renders as unicode safe data 
Refs #22950.
Backport of 920904921 from master.
 2014-07-05 13:35:53 +02:00
Loic Bistuer b68c7a5abb [1.7.x] Fixed #22915 -- Document backward incompatible changes in the ValidationError constructor. 
This patch also fixes update_error_dict to better handle the use case described
in this ticket, previously the type of the provided container could be lost in
some conditions.

Thanks Russell Keith-Magee for the report and Tim Graham for review.

Backport of eb7df6b8d7 from master
 2014-07-04 17:19:12 +07:00
Colin Wood f5740af868 [1.7.x] Fixed #22940 -- Added missing string iterpolation parameters in migrations.writer error. 2014-07-02 12:44:10 -04:00
Tim Graham 43d7566cc9 [1.7.x] Added spaces to message from 4c39c270af. 
Backport of add78c58b5 from master
 2014-06-30 07:41:47 -04:00
Tim Graham 54fdf5901b [1.7.x] Fixed #22917 -- Fixed typo in AlterIndexTogether.describe(). 
Backport of 70576740b0 from master
 2014-06-27 10:36:05 -04:00
Tim Graham f1428dc796 [1.7.x] Fixed #22903 -- Fixed migration generation if index_together or unique_together is removed from a model. 
Backport of e0cd07ec2f from master
 2014-06-25 10:04:46 -04:00
Richard Eames 8dcc7810f0 [1.7.x] Fixed #22814 -- Allowed ISO-8601 [+-]hh timezone format in parse_datetime 
Backport of 7beaeeed from master.
 2014-06-25 10:58:23 +02:00
Andrew Godwin 48a2e027bf [1.7.x] Fixed #22708: Typo in autodetector base dependency gen 2014-06-23 20:48:59 -07:00
Andrew Godwin e4c9ccdbb5 [1.7.x] Fixed #22889: Unneeded to_field in fk.deconstruct causing swap issues 2014-06-23 20:39:57 -07:00
Andrew Godwin 0dd737a719 [1.7.x] Fixed #22487: Don't flush out data from before normal TestCases 2014-06-23 20:25:52 -07:00
Tim Graham 21c9591384 [1.7.x] Fixed test failures introduced by refs #22881. 
Backport of 908160f692 from master
 2014-06-23 10:00:54 -04:00
Claude Paroz 3619518c9b [1.7.x] Created import-time test temp dirs in known location 
Refs #17215. In the same spirit as 5de31cb8cb.
Backport of 809362518d from master.
 2014-06-23 14:57:24 +02:00
Claude Paroz 6015083e9d [1.7.x] Ensured cache tests do not leak temp dirs 
Refs #17215.
Backport of 1d9596025e from master.
 2014-06-23 14:17:32 +02:00
Chris Beaven 29582ad4a3 [1.7.x] Fixed #22881 -- Better soft_applied migration detection 2014-06-23 13:30:29 +12:00
Andrew Godwin aa0886e7ae [1.7.x] Fixed #22875: Optimizer did not take through= into account. 2014-06-22 11:24:46 -07:00
Vlastimil Zíma 6e5a736752 [1.7.x] Fixed #22514 -- Prevented indexes on virtual fields [postgres]. 
Backport of 78c32f1caa from master
 2014-06-20 12:49:56 -04:00
Huu Nguyen d9a83d597e [1.7.x] Fixed #22862 -- Added --noinput option to makemigrations. 
Thanks artortenburger for the report.

Backport of fbb684d95e from master
 2014-06-20 09:10:43 -04:00
Alex Gaynor 1d9f308fa1 [1.7.x] Fixed several flake8 errors 
Backport of d015c9d11c from master
 2014-06-18 12:05:36 -04:00
Andrew Godwin 819d5f0c89 [1.7.x] Fixed #22861: Internal migrations done first so __first__ works 
Thanks to Chris Beaven.
 2014-06-17 23:27:56 -07:00
Andrew Godwin 1122d2979a [1.7.x] Fix __latest__ to actually resolve to the latest migration 2014-06-17 22:12:53 -07:00
Andrew Godwin cd82069b97 [1.7.x] Fix broken test 2014-06-17 21:32:35 -07:00
Andrew Godwin f355d253f8 [1.7.x] Fixed #22853: Swapped models are now ignored for migration operations. 2014-06-17 17:46:52 -07:00
Andrew Godwin f16554f440 [1.7.x] Fix previous commit on python 2 2014-06-17 09:57:27 -07:00
Víðir Valberg Guðmundsson 7f0c207d1b [1.7.x] Fixed #22577: Python 3 broke on non-module migrations directory 2014-06-17 09:57:15 -07:00
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
Andrew Godwin d2e96b5792 Merge pull request #2637 from davidszotten/validator_comparisons 
[1.7.x] Fixed #22588 -- Fix RegexValidator __eq__
 2014-05-08 19:49:59 -07:00
Aymeric Augustin 7194d40236 [1.7.x] Added feature flags for introspection capabilities. 
Backport of 99d9fa32 from master
 2014-05-08 22:53:21 +02:00
Aymeric Augustin 92a1e71100 [1.7.x] Split ignores_nulls_in_unique_constraints feature. 
Oracle and SQL Server don't have exactly the same limitations. It's
worth treating them differently.

Backport of cff59bed from master
 2014-05-08 22:53:11 +02:00
Aymeric Augustin e3bc11cca9 [1.7.x] Replaced vendor checks by three feature flags. 
Backport of c70a61eb from master
 2014-05-08 22:53:00 +02:00
Aymeric Augustin 7f48d44c60 [1.7.x] Simplified indexes tests. 
Backport of 43a80f48 from master
 2014-05-08 22:52:53 +02:00
Aymeric Augustin 51fed81e33 [1.7.x] Reorganized backends tests. 
This reduces the number of explicit vendor checks.

Backport of d6672631 from master
 2014-05-08 22:52:34 +02:00
Aymeric Augustin e244e456c7 [1.7.x] Appeased flake8. 
Backport of b1432bfc from master
 2014-05-08 22:45:26 +02:00
Andrew Godwin f2bf59a5bc [1.7.x] Fixed #22476: Couldn't alter attributes on M2Ms with through= set 2014-05-08 10:34:45 -07:00
Andrew Godwin 7f63ac5a9f [1.7.x] Fixed #22496: Data migrations get transactions again! 2014-05-07 14:29:04 -07:00
Andrew Godwin d8bf415ab2 [1.7.x] Fixed #22581: Pass default values for schema through get_db_prep_save() 2014-05-07 13:47:02 -07:00
David Szotten 724a7bf222 [1.7.x] Fixed #22588 -- Fix RegexValidator __eq__ 
Compare parameters instead of re.pattern instances, and add the other
parameters to the comparison. Also add a __ne__ to make assertNotEqual
work properly.
 2014-05-07 19:28:42 +01:00
Andrew Godwin f53d1576ca [1.7.x] Fixed #22337: FileSystemStorage marked as deconstructible and tested. 2014-05-06 22:24:39 -07:00
Claude Paroz 0d138b9cf4 [1.7.x] Fixed #22564 -- Prevented unneeded bytestrings in migrations 
In some cases, this could lead to migrations written with Python 2
being incompatible with Python 3.
Thanks Tim Graham for the report and Loïc Bistuer for the advices.
Backport of da9cf53cb from master.
 2014-05-06 09:14:32 +02:00
Ben Davis 549b658241 [1.7.x] Fixed #22570 -- Made Form.__getitem__ KeyError more descriptive. 
Backport of df60db0e78 from master
 2014-05-05 20:02:14 -04:00
Anssi Kääriäinen 76979a257d [1.7.x] Fixed #22466 -- ordering by reverse foreign key 
Ordering by reverse foreign key was broken by custom lookups patch
(commit 20bab2cf9d).

Thanks to everybody who helped solving this issue. Special thanks to
Trac alias takis for reporting this.

Backport of 3b7c66a3ac from master
 2014-05-05 15:29:24 +03:00
Jakub Roztocil 4b6ba2c1d1 [1.7.x] Fixed #22489 -- missing implemenation for search lookup 
When custom lookups were added, converting the search lookup to use
the new Lookup infrastructure wasn't done.

Some changes were needed to the added test, main change done by
committer was ensuring the test works on MySQL versions prior to 5.6.

Backport of 7131e14d00 from master
 2014-05-05 14:40:06 +03:00
Anssi Kääriäinen 402fc4f6c9 [1.7.x] Fixed #22429 -- Incorrect SQL when using ~Q and F 
Backport of 5e1f4656b9 from master
 2014-05-05 13:06:51 +03:00
Tim Graham f8fa735dc2 [1.7.x] Fixed #22435 -- Prevented adding a ManyToManyField from prompting for a default. 
Thanks andrewsg for the report.

Backport of 3818d96426 from master
 2014-05-02 20:53:39 -04:00
Claude Paroz 61fd00d4fd [1.7.x] Fixed #22565 -- Prevented pgettext_lazy crash with bytestring input 
Thanks ygbo for the report.
Backport of 142c27218 from master.
 2014-05-02 19:33:58 +02:00
Chris Beaven 5ab93bbe74 [1.7.x] Fix migration autodector to work correctly with custom deconstructed values 2014-05-02 15:12:42 +12:00
Yehonatan Daniv d56267ba57 [1.7.x] Fixed #22539 -- Copied exclude argument in Model.full_clean() to prevent side effects. 
Backport of e2e4cdba11 from master
 2014-05-01 09:30:49 -04:00
Tim Graham e5941ba5f3 [1.7.x] flake8 fixes. 
Backport of 45c2d1f5d9 from master.
 2014-04-30 18:35:40 -04:00
Andrew Godwin 6ca5367869 [1.7.x] Cleanup failing test w/contenttypes and remove useless graph load 2014-04-30 15:12:18 -07:00
Andrew Godwin 35c2a14a49 [1.7.x] Fixed #22485: Include all unmigrated apps in project state by default. 2014-04-30 12:26:11 -07:00
Simon Charette a6ecd5dbb3 [1.7.x] Fixed #19195 -- Allow explicit ordering by a relation `_id` field. 
Thanks to chrisedgemon for the report and shaib, akaariai and
timgraham for the review.

Backport of 24ec9538b7 from master
 2014-04-30 14:26:39 -04:00
Claude Paroz 1084456ac2 [1.7.x] Fixed #22474 -- Made migration recorder aware of multiple databases 
Thanks Tim Graham for the review.
Backport of 7c54f8cce from master.
 2014-04-30 16:55:12 +02:00
Mike Fogel bb5c7e4e8d [1.7.x] Fixed #22537 -- Add tests and improved docs for field subclass with choices. 
Backport of 7fd1b35ed7 from master
 2014-04-30 07:57:35 -04:00
Simon Charette cda5745df0 [1.7.x] Fixed #22447 -- Make sure custom model bases can be migrated. 
Thanks to cdestigter for the report.

Backport of 390f888745 from master
 2014-04-29 10:55:45 -04:00
Tim Graham 1d20693fa6 [1.7.x] Revert "Fixed #15179 -- middlewares not applied for test client login()" 
This reverts commit 4fdd51b732.

See the ticket for concerns with this implementation; it will be revisited.

Backport of aabceadd7d from master
 2014-04-28 18:49:24 -04:00
Alex Gaynor 996564df4d [1.7.x] Fix many many typos in comments throughout the codebase 
Backport of 2bcb8bfc8d from master
 2014-04-26 14:35:57 -04:00
Aymeric Augustin 3bb0f118ca [1.7.x] Fixed #3214 -- Stopped parsing SQL with regex. 
Avoided introducing a new regex-based SQL splitter in the migrations
framework, before we're bound by backwards compatibility.

Adapted this change to the legacy "initial SQL data" feature, even
though it's already deprecated, in order to facilitate the transition
to migrations.

sqlparse becomes mandatory for RunSQL on some databases (all but
PostgreSQL). There's no API to provide a single statement and tell
Django not to attempt splitting. Since we have a more robust splitting
implementation, that seems like a good tradeoff. It's easier to add a
new keyword argument later if necessary than to remove one.

Many people contributed to both tickets, thank you all, and especially
Claude for the review.

Refs #22401.

Backport of 8b5b199 from master
 2014-04-26 17:46:57 +02:00
Tim Graham bee118a701 [1.7.x] Fixed #22499 -- Fixed a typo in an admin_views test that caused failure on Oracle. 
Backport of d238c58912 from master
 2014-04-24 07:06:57 -04:00
Malcolm Box 07235aec9d [1.7.x] Fixed #22495 -- Locmem cache.add() failed with infinite timeouts 
cache.add() incorrectly succeeded when there was an existing key
with an infinite (None) timeout.
Backport of af5f688392 from master.
 2014-04-23 14:56:54 +02:00
Tim Graham e192f13103 [1.7.x] Fixed #22486 -- Restored the ability to reverse views created using functools.partial. 
Regression in 8b93b31487.

Thanks rcoup for the report.

Backport of 3c06b2f2a3 from master
 2014-04-23 08:49:53 -04:00
Claude Paroz 1d0f1ee199 [1.7.x] Fixed table cleanup in GIS migration tests 
Backport of ab90c4707b from master.
 2014-04-22 19:52:58 +02:00
Preston Timmons 935159d951 [1.7.x] Fixed #22478 -- Regression in test label discovery. 
As part of the app-loading updates the old test runner was changed to not
require a models module. This introduced a regression in behavior so
applabel.TestCase failed for tests defined in a directory.

The fix is thanks to yakky and rtnpro.
 2014-04-22 12:48:39 -04:00
Erik Romijn 34526c2f56 [1.7.x] Fixed queries that may return unexpected results on MySQL due to typecasting. 
This is a security fix. Disclosure will follow shortly.

Backport of 75c0d4ea3a from master
 2014-04-21 18:29:39 -04:00
Aymeric Augustin 380545bf85 [1.7.x] Prevented leaking the CSRF token through caching. 
This is a security fix. Disclosure will follow shortly.

Backport of c083e3815a from master
 2014-04-21 18:29:24 -04:00
Tim Graham 546740544d [1.7.x] Fixed a remote code execution vulnerabilty in URL reversing. 
Thanks Benjamin Bach for the report and initial patch.

This is a security fix; disclosure to follow shortly.

Backport of 8b93b31487 from master
 2014-04-21 18:29:12 -04:00
Florian Apolloner d7de6ed07e [1.7.x] Fixed monkeypatching in a staticfiles test. 
Backport of a4553e0510 from master
 2014-04-21 08:58:41 -04:00
Aymeric Augustin 62eb79fc4c [1.7.x] Appeased flake8 2.1.0. 
Backport of 428c0bbe1b from master
 2014-04-21 07:50:50 -04:00
Alex Gaynor 50dddbdfc7 [1.7.x] Corrected many style guide violations that the newest version of flake8 catches 
Backport of 778ce245dd from master
 2014-04-21 07:50:43 -04:00
Aymeric Augustin 0dad0ca55e [1.7.x] Further consolidated the model_inheritance tests. 
Backport of 3f01e82 from master
 2014-04-21 11:51:21 +02:00
Aymeric Augustin ab0afef959 [1.7.x] Fixed #22402 -- Consolidated model_inheritance tests. 
The model_inheritance_same_model_name tests couldn't be run without the
model_inheritance tests. Make the problem go away by merging them.

Thanks timo for the report.

Backport of 0097d38 from master
 2014-04-21 11:43:38 +02:00
Simon Charette 33d1dc2eeb [1.7.x] Fixed flake8 warnings introduced in recent commits. 
Backport of 79f05616fb from master
 2014-04-20 13:10:52 -04:00
Tim Graham 9e86c3f0a6 [1.7.x] Fixed flake8 errors. 
Backport of 471fb04a30 from master
 2014-04-20 13:09:12 -04:00
Andrew Gorcester bc5d568e1e [1.7.x] Fixed #22397 -- Issues removing M2M field with explicit through model 
Changed the migration autodetector to remove models last so that FK
and M2M fields will not be left as dangling references. Added a check
in the migration state renderer to error out in the presence of
dangling references instead of leaving them as strings. Fixed a bug
in the sqlite backend to handle the deletion of M2M fields with
"through" models properly (i.e., do nothing successfully).

Thanks to melinath for report, loic for tests and andrewgodwin and
charettes for assistance with architecture.

Backport of 956bd64424 from master
 2014-04-18 18:34:00 -04:00
Simon Charette 24016c9b62 [1.7.x] Fixed a test failure introduced by 214d1e1b0f. 
Backport of 9bc377d7d0 from master
 2014-04-18 02:32:24 -04:00
Justin Hamade 7f8bd1a4b3 [1.7.x] Fixed #22434 -- Retain ordering on related sliced subqueries. 
Thanks maciej.pawlisz for the report, and charettes for the review.

Backport of a13df671a5 from master
 2014-04-16 18:02:25 -04:00
Motiejus Jakštys 71c8ae543f [1.7.x] Fixed #22460 -- Explicity remove constraints when dropping a related field. 
Backport of 0e45669fa9 from master
 2014-04-16 16:37:08 -04:00
Simon Charette 9fb61cb64a [1.7.x] Fixed #22350 -- Consistently serialize bytes and text in migrations. 
Thanks to @treyhunner and Loïc for their suggestions and review.

Backport of 72d3889db4 from master
 2014-04-13 19:03:20 -04:00
valtron 6b3a8d2705 [1.7.x] Fixed #21760 -- prefetch_related used an inefficient query for reverse FK. 
Regression introduced by commit 9777442. Refs #21410.

Backport of d3b71b976d from master
 2014-04-13 00:51:38 +07:00
Claude Paroz a6eda3a5fc [1.7.x] Also allowed a non-overridden setting to be deleted 
Refs #20032, #18824. Thanks ztorstri at gmail.com for the report.
Backport of 3417ba0309 from master.
 2014-04-12 15:35:11 +02:00
Claude Paroz d9f8cc12ae [1.7.x] Fixed #22102 -- Made SimpleTestCase tests run before unittest.TestCase ones 
Thanks aptiko for the report and Tim Graham for the review.
Backport of 3e3a7372f5 from master.
 2014-04-12 11:43:10 +02:00
Aymeric Augustin 2ad0bc132a [1.7.x] Fixed #21202 -- Maintained atomicity when the server disconnects. 
Thanks intgr for the report.

This commit doesn't include a test because I don't know how to emulate a
database disconnection in a cross-database compatible way.

Also simplified a 'backends' test that was constrained by this problem.

Backport of 81761508 from master
 2014-04-10 23:18:36 +02:00
Aymeric Augustin 2e42c859da [1.7.x] Fixed #21239 -- Maintained atomicity when closing the connection. 
Refs #15802 -- Reverted #7c657b24 as BaseDatabaseWrapper.close() now
has a proper "finally" clause that may need to preserve self.connection.

Backport of 25860096 from master.
 2014-04-10 23:18:35 +02:00
Aymeric Augustin 7e89434084 [1.7.x] Fixed #22291 -- Avoided shadowing deadlock exceptions on MySQL. 
Thanks err for the report.

Backport of 58161e4e from master.
 2014-04-10 23:02:54 +02:00
Tim Graham ddd25b280f [1.7.x] Fixed #22194 -- Added --list-tags option to check command. 
Thanks Elvard for the patch.

Backport of 395d75ea6b from master
 2014-04-10 09:44:43 -04:00
Shai Berger 3a9a4570ef [1.7.x] 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.

Backport of b990df1d63 from master
 2014-04-10 01:44:30 +03:00
Aymeric Augustin f6f188ffc7 [1.7.x] Fixed #21553 -- Ensured unusable database connections get closed. 
Backport of 5f2f47f from master
 2014-04-09 22:50:21 +02:00
Huu Nguyen f22177a9a3 [1.7.x] Refs #21230 -- removed direct settings manipulation from signed cookies tests 
Backport of b9bfcd82f0 from master
 2014-04-08 12:15:40 -04:00
Alejandro Gómez 5e74d6cf0a [1.7.x] Fixed #21084 -- Used proxy model's content type for admin log entries. 
Backport of 7a7f6fccae from master
 2014-04-07 08:59:27 -04:00
Simon Charette 7b3a221ad6 [1.7.x] Fixed #22363 -- Correctly serialize `django.utils.datetime_safe` objects. 
Thanks to linovia for the report.

Backport of 074d3183d9 from master
 2014-04-03 14:56:41 -04:00
Loic Bistuer 6405889a72 [1.7.x] Fixed #22360 -- Fixed two non-deterministic tests in Python 3.4. 
The order of admin's changelist filters in the querystring relied on
dict ordering.

Backport of 4d996b8e69 from master
 2014-03-31 08:24:09 -04:00
Loic Bistuer 5268d71f18 [1.7.x] Fixed #21795 -- Made add_preserved_filters account for url prefixes. 
Thanks to trac username honyczek for the report. Refs #6903.

Backport of 4339e9a92d from master
 2014-03-31 07:20:20 -04:00
Loic Bistuer 8e73d3a2c1 [1.7.x] Fixed #22319 -- Fixed migration external dependencies when there are internal dependencies. 
Backport of 0fd51cf0bd from master
 2014-03-31 06:57:44 -04:00
Loic Bistuer bdec848063 [1.7.x] Fixed #22359 -- Changing M2M field to blank=True failed on sqlite. 
Backport of a449e7feec from master
 2014-03-31 06:35:06 -04:00
Tim Graham 0f9f8738d5 [1.7.x] Fixed #22338 -- Fixed a test dependent on dictionary key iteration order. 
Backport of 69a4f383f6 from master
 2014-03-30 14:27:05 -04:00
Tim Graham c9014a95bc [1.7.x] Skipped JavascriptI18nTests if Firefox isn't properly configured. 
Code borrowed from django.contrib.admin.tests. Without this, the class can
throw an exception with something like "The browser appears to have exited
before we could connect. The output was: Error: no display specified"

Backport of e2ac0203d9 from master
 2014-03-28 07:30:35 -04:00
Tim Graham 0134d00be5 [1.7.x] Skipped a test that errors rather than marked it as an expectedFailure. 
The test throws an error which Python 3.4 doesn't seem to catch as an
expectedFailure.

refs 7476d96f83

Backport of c170c3761b from master
 2014-03-27 07:01:20 -04:00
Tim Graham 3d74f1f64a [1.7.x] Fixed a deprecation warning on Python 3. 
Backport of c19bbefca2 from master
 2014-03-27 07:01:04 -04:00
Loic Bistuer 39fc8d4b8e [1.7.x] Fixed #22331 -- Made MigrationAutodetector ignore unmanaged models. 
This commit reverts 69d4b1c and tackle the issue from a different angle.
Models remain present in the project state, but are now ignored by the
autodetector.

Backport of 42336c84a0 from master
 2014-03-25 20:04:49 -04:00
Simon Charette 78211b13a5 [1.7.x] Fixed #12030 -- Validate integer field range at the model level. 
Thanks to @timgraham for the review.

Backport of 1506c71a95 from master
 2014-03-25 14:31:54 -04:00
Tim Graham d84beb3d91 Revert "[1.7.x] Fixed #22331 -- Fixed migrations ProjectState to ignore unmanaged models." 
This reverts commit bf69375c4d.
 2014-03-25 12:07:37 -04:00
Loic Bistuer bf69375c4d [1.7.x] Fixed #22331 -- Fixed migrations ProjectState to ignore unmanaged models. 
Backport of 69d4b1c3ea from master
 2014-03-25 10:34:28 -04:00