p31829507
/
django
mirror of https://github.com/django/django.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
17,732 Commits 28 Branches 411 Tags 641 MiB
Commit Graph

5409 Commits

Author SHA1 Message Date
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