mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-03-14 11:20:46 +00:00
Code Issues 32 Releases Wiki Activity
17,778 Commits 29 Branches 437 Tags
Commit Graph

5431 Commits

Author SHA1 Message Date
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 e2efc8965edf684aaf48621680ef54b84e116576 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 9d1987d7679165ad3a7c2b713a8a488cc1421905.

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 cb9c9a7b5879671053c7d2ad6e79943a8814b274.

Backport of 83e7555ffee305c1ea1e0655fd1f0aa35269533f 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 ee51ab9d232e52d17cd5ad32e230fd715cffe638 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 536ebaa048f69c18aa36448074f65f2741e35df5 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 9fb0f5dddc4cf7f2d294af1bcde2c359cffd90a5 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 f01d2a8f9be8bc2005b7f1620a2ca40530fb5065 from master.
 2014-05-23 14:51:22 +02:00