innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity
18,141 Commits 25 Branches 361 Tags 501 MiB
Commit Graph

5569 Commits

Author SHA1 Message Date
Hiroki KIYOHARA df678b7500 [1.7.x] Fixed code to solve #23070 problem 
Added a class to wrap callable in settings:
* Not to call in the debug page (#21345).
* Not to break the debug page if the callable forbidding to set attributes (#23070).

Thanks @bmispelon for giving me some advice.

Backport of d0889863de from master.
 2014-07-26 14:53:31 +02:00
Hiroki KIYOHARA 0d8d4fe9b4 [1.7.x] Added test for the #23070 problem 
Backport of e569144910 from master.
 2014-07-26 14:48:25 +02:00
Tim Graham d1c08d4758 [1.7.x] Fixed bad usage of rstrip() that caused test failure. 
If the temporary file name contained a p or y as its last
characters, it would be stripped. refs #23083.

Backport of 57d2b3f2a7 from master
 2014-07-25 15:17:18 -04:00
Tim Graham 4f8a5bd8d0 [1.7.x] Fixed #23083 -- Fixed runserver reloading when deleting a file. 
Thanks Collin Anderson for the report and hirokiky for the fix.

Backport of b8cb5ba708 from master
 2014-07-25 13:25:16 -04:00
Andrew Godwin 919d10e619 [1.7.x] Fixed #23093: soft application detection for swapped models 2014-07-25 09:35:53 -07:00
Jeroen Dekkers 6e7e5bacd5 [1.7.x] Fixed #23071 -- Use last migration's name in dependency to other app 
Changed the autodetector to lookup the name of the other app's last
migration in the graph and use that as dependency instead of using
__latest__.
 2014-07-25 08:54:54 -07:00
Moayad Mardini ce95ab8f02 [1.7.x] Fixed #23088 -- Used `six` `range` type in `Paginator.page_range`. 
Backport of 6508db2ff9 from master
 2014-07-25 06:16:55 -04:00
Aymeric Augustin 2a97db33a7 [1.7.x] Avoided transactional DDL on castrated databases. 
Fixed a test failure that appeared after 753a22a6, although the bug
existed before that commit.

Refs #22308 and #23089.

Backport of 0757e0f30d from master
 2014-07-24 18:48:05 -04:00
Aymeric Augustin 5ca82ff71b [1.7.x] Fixed #23089 -- Fixed transaction handling in two management commands. 
Previously, when createcachetable and flush operated on non-default
databases, they weren't atomic.

Backport of 753a22a635 from master
 2014-07-24 18:13:12 -04:00
Tim Graham b918bc921c [1.7.x] Fixed #23014 -- Infinite migration regression with unique/index_together. 
Backport of 64e75c47ef from master
 2014-07-24 14:30:16 -04:00
Tim Graham 0f8e8c86dd [1.7.x] Silenced test warning for deprecated IPAddressField. 
Backport of 99cd80dc74 from master
 2014-07-24 11:40:49 -04:00
Tim Graham c86b9d1985 [1.7.x] Silenced a Python 2 ImportWarning in a migrations test. 
Backport of 66211b4b75 from master
 2014-07-24 09:29:45 -04:00
Tim Graham 7cbb4f79d1 [1.7.x] Improved patching of sys.stdout in refs #23078. 
Backport of 936fba5878 from master
 2014-07-24 08:47:24 -04:00
Nick Sandford 9638daec5c [1.7.x] Fixed #23078 -- Regression in update_contenttypes() interactivity. 
Thanks raymond at adaptiv.nl for the report.

Backport of fa3cf006b2 from master
 2014-07-23 08:49:55 -04:00
Andrew Godwin e2220c1c08 [1.7.x] Fixed #23014: Renaming not atomic with unique together 2014-07-21 11:37:10 +01:00
Andrew Godwin 88135a8cf7 [1.7.x] Fixed #23009: Shorten FK identifiers in add_field and make consistent 2014-07-21 10:50:58 +01:00
Andrew Godwin f57e84392e [1.7.x] Fixed #22975: Don't call rename SQL if not needed 2014-07-21 10:14:34 +01:00
Andrew Godwin ff8d715a0a [1.7.x] Fixed #23039: Don't try to serialize unmanaged models in tests 2014-07-21 10:09:58 +01:00
Andrew Godwin de709001c4 [1.7.x] Fixed #23041: Bad base dependencies for proxy models 2014-07-16 09:59:37 -07:00
Tim Graham 3552afa25e [1.7.x] Added Chrome/IE support for a selenium test. 
Backport of 5954aa6db0 from master
 2014-07-16 10:54:38 -04:00
Claude Paroz 15feb1d8e8 [1.7.x] Added forgotten files from commit 28efafa24c 
Backport of c5d8e4a0d1 from master.
 2014-07-16 14:30:43 +02:00
Anssi Kääriäinen f8a2a5604b [1.7.x] PEP8 cleanup 
Backport of f8df55050c from master
 2014-07-16 12:50:01 +03:00
Gavin Wahl 72419ca8da [1.7.x] Fixed #22998 -- Updated the fast_delete logic for GFKs 
Backport of 6e2b82fdf6 from master
 2014-07-16 12:43:14 +03:00
Claude Paroz d6f293ad1b [1.7.x] Ignored STATIC_ROOT and MEDIA_ROOT in makemessages 
Also alleviate issues with weird file names typically found in
MEDIA_ROOT directories (#23010).
Thanks Tim Graham for the review.
Backport of 28efafa24c from master.
 2014-07-16 09:43:50 +02:00
Tim Graham 01515ebaa4 [1.7.x] Fixed #23013 -- Fixed removing unique_together/index_together constraints in migrations. 
Thanks melinath for the report.

Backport of 0154965392 from master
 2014-07-15 15:21:44 -04:00
Tim Graham fe5f29eb1d [1.7.x] Fixed #23008 -- Fixed typo causing bad migration dependencies. 
Thanks semenov for the report and Florian for investigation.

Backport of 9a2ab62977 from master
 2014-07-15 08:51:16 -04:00
Claude Paroz f2011e21a2 [1.7.x] Fixed #22991 -- Prevented *.pyc files in autoreload monitoring 
This fixes a regression introduced in 6d302f639.
Thanks lorinkoz at gmail.com for the report, Collin Anderson
for the initial patch and Simon Charette for the review.
Backport of 4e424084e from master.
 2014-07-15 09:59:25 +02:00
Huu Nguyen 6d5238f6c8 [1.7.x] Fixed #22791 -- Invoke interactive questioner only for conflicts in specified apps. 
Thanks bendavis78 for the report and Tim Graham for the review.

Backport of f7a78f9bba from master
 2014-07-14 13:00:45 -04:00
Anssi Kääriäinen 4b53bfff37 [1.7.x] Fixed #22992 -- regression in .filter(generic_fk=...) error message 
Generic Foreign Keys can't be used as lhs in lookups for historical
reasons. Django 1.6 gave a FieldDoesNotExist exception when using GFKs
as lhs in lookups, but due to regression caused by lookup refactor patch
(20bab2cf9d) the exception type was
changed to AttributeError.

It might be a good idea to add support for gfk__exact and gfk__in lookups
later on.

Thanks to glicerinu@gmail.com for the report. The code in this commit
was written by Tim Graham.

Backport of efe87d3e48 from master
 2014-07-14 12:55:05 -04:00
Anssi Kääriäinen 572885729e [1.7.x] Fixed #22994 -- regression with generic FK + admin list_view 
The reason for the regression was that the GenericForeignKey field isn't
something meta.get_field_by_name() should return. The reason is that a
couple of places in Django expects get_field_by_name() to work this way.
It could make sense to return GFKs from get_field_by_name(), but that
should likely be done as part of meta refactoring or virtual fields
refactoring patches.

Thanks to glicerinu@gmail.com for the report and to Tim for working on
the issue.
 2014-07-14 12:51:24 -04:00
Claude Paroz be38c5bcc8 [1.7.x] Fixed #22939 -- Delayed admin_static backend detection 
Thanks generalov for the report.

Backport of 22b2fb0b from master
 2014-07-12 18:50:32 +02:00
Tim Graham 736e289445 [1.7.x] Fixed #13794 -- Fixed to_field usage in BaseInlineFormSet. 
Thanks sebastien at clarisys.fr for the report and gautier
for the patch.

Backport of 5e2c4a4bd1 from master
 2014-07-10 17:36:04 -04:00
Andrew Godwin eb7e232e7f [1.7.x] Fix comment 2014-07-10 10:01:12 -07:00
Andrew Godwin aba75e73db [1.7.x] Fixed #22970: Incorrect dependencies for existing migrated apps 2014-07-09 23:53:53 -07:00
Daniel Pyrathon 2100bcef41 [1.7.x] Added a unit test to ensure models cannot be ordered by a M2M field. 
Backport of 865bc71783 from master
 2014-07-08 09:20:15 -04:00
Tim Graham 1318254669 [1.7.x] Renamed an admin_views test to fix ordering issue. 
test_i18n_language_non_english_fallback fails if run after
test_L10N_deactivated; the tests can be run in any order after
a5f6cbce07 but this commit is not
in stable/1.7.x.
 2014-07-07 19:56:22 -04:00
Tim Graham 1326cd28d0 [1.7.x] Removed unnecessary directory in dispatch tests. 
Backport of 136a3ffe21 from master
 2014-07-07 19:22:20 -04:00
Tim Graham 0100afb013 [1.7.x] Fixed flake8 errors. 
Backport of fddd95254e from master
 2014-07-07 19:13:00 -04:00
Tim Graham 28962c57f3 [1.7.x] Fixed #22909 -- Removed camelCasing in some tests. 
Thanks brylie.

Backport of 89b9e6e5d6 from master
 2014-07-07 19:10:48 -04:00
Claude Paroz 1bb8ccdb9e [1.7.x] Fixed pyinotify performance regression in 15f82c7011 
Refs #9722. Thanks Tim Graham for the review.
Backport of 6d302f639 from master.
 2014-07-06 21:45:09 +02:00
Loic Bistuer a1ddfe4401 [1.7.x] Fixed #22906 -- Added a more helpful repr to migrations' ModelState. 
Thanks Collin Anderson for the report and original patch.

Backport of 2572c07cc6 from master
 2014-07-06 15:00:03 +07:00
Tim Graham 4b30bddb7a [1.7.x] Updated tests per previous commit. 
Backport of 86c74eacd6 from master
 2014-07-05 20:20:55 -04:00
Simon Charette 2f0cc4f5fb [1.7.x] Fixed #22943 -- Correctly serialize compiled regexes. 
Thanks to antialiasis at gmail dot com for the patch.
 2014-07-05 16:38:34 -07:00
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