mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-01-27 18:49:23 +00:00
Code Issues 32 Releases Wiki Activity
20,293 Commits 29 Branches 430 Tags
Commit Graph

6560 Commits

Author SHA1 Message Date
Mark Lavin
0cfb7ed5c5 [1.8.x] Fixed #24924 -- Join promotion for multiple Case expressions 
Backport of 541f4ea546ad3065852db816769ba6b584e3f373 from master
 2015-06-05 12:23:08 -04:00
Andriy Sokolovskiy
469f1e362b [1.8.x] Fixed #24833 -- Fixed Case expressions with exclude(). 2015-06-05 11:03:41 -04:00
Carl Meyer
2358c1e5d7 [1.8.x] Cleaned up docstring style, per Tim Graham review. 
Backport of 57dbc87ade5533d78089690ec7795034ff69177a from master.
 2015-06-03 19:21:23 -06:00
Carl Meyer
feed5ad2a0 [1.8.x] Refs #24628 -- Added a second test and a docstring comment to avoid regression. 
Backport of 5c085ea7b3f3ff10389aeed327e018581791876a from master.
 2015-06-03 15:48:53 -06:00
Tim Graham
f082813d67 [1.8.x] Fixed typo in runtests.py vendor check. 2015-06-03 12:22:39 -04:00
Tim Graham
2009525c8b [1.8.x] Applied db_table conversion to fix schema tests on Oracle. 
Backport of 7c637a3aaec311269bf863c220bf894eebbe7c7c from master
 2015-06-02 19:45:24 -04:00
Carl Meyer
efdcd13c34 [1.8.x] Fixed #24628 -- Fixed applied status for squashed migrations. 
Backport of 492537ac18df56c36f8a2335d773aa0fa01a61a3 from master.
 2015-06-02 16:21:58 -06:00
Carl Meyer
c37c6dc410 [1.8.x] Improved isolation of applied-migrations table in migration tests. 
Backport of 335fc44f6872f4678e48f65e91961ef19d6439b4 from master.
 2015-06-02 16:21:03 -06:00
Carl Meyer
98b40ffe61 [1.8.x] Fixed #24895 -- Fixed loading a pair of squashed migrations with a dependency. 
Backport of 84522c0d165076d01cd034d7c381b75044daec8d from master.
 2015-06-02 12:10:04 -06:00
zauddelig
7f92b6e576 [1.8.x] Fixed #24897 -- Allowed using choices longer than 1 day with DurationField 
Backport of 262d4db8c4c849b0fdd84550fb96472446cf90df from master
 2015-06-02 12:42:31 -04:00
Andriy Sokolovskiy
9d83de8ff3 [1.8.x] Fixed #24831 -- Fixed pickling queryset with prefetch_related() after deleting objects. 
Backport of 2913d6b77d8b2082dc79df5503b7dd3ddd05fcc1 from master
 2015-06-02 10:07:45 -04:00
Tim Graham
1c57d7e7fa [1.8.x] Fixed #24893 -- Fixed lack of unique constraint when changing a field from primary_key=True to unique=True 
Backport of e1e6399c2ce39a3656155c4d704340eac83926a7 from master
 2015-06-02 09:32:22 -04:00
Tim Graham
8911d2e20f [1.8.x] Fixed #24892 -- Fixed quoting of SQL when renaming a field to AutoField in PostgreSQL 
Backport of 5ab86809832726957dd6f0eb8e17a461f0a9be84 from master
 2015-06-02 09:15:08 -04:00
Tim Graham
2456276b02 [1.8.x] Fixed #24851 -- Fixed crash with reverse one-to-one relation in ModelAdmin.list_display 2015-05-28 10:37:31 -04:00
Andriy Sokolovskiy
f65d4db8a8 [1.8.x] Fixed #24817 -- Prevented loss of null info in MySQL field renaming. 
Backport of 80ad5472ce4b6ba6e94227422d0727371e97cdf0 from master
 2015-05-28 10:08:14 -04:00
Paweł Marczewski
7ee6043dba Fixed #24847 -- Prevented items set on a RequestContext from being lost. 
Backport of 300e8baf9429dbf1c5dff478558d793638dc2f54 from master
 2015-05-27 10:08:31 -04:00
Tim Graham
b16f84f15b [1.8.x] Refs #24836 -- Reverted "Simplified the lazy CSRF token implementation in csrf context processor." 
This reverts commit 8099d33b6553c9ee7de779ae9d191a1bf22adbda as it caused
a regression that cannot be solved without changing force_text() which has
a small risk of introducing regressions. This change will remain in master
along with an update to force_text().
 2015-05-27 09:29:45 -04:00
Andrea Grandi
62c19a21b6 Fixed #24844 -- Corrected has_changed implementation for HStoreField. 
Backport of 43b2d88a5b9cfb151ccf7ac861f2750e70c0e2c4 from master
 2015-05-25 21:10:07 -04:00
Paweł Marczewski
2aa2b9f291 [1.8.x] Fixed #24835 -- Fixed QuerySet.exists() after an annotation with Count() 
QuerySet.exists() incorrectly handled query.group_by = True
case (grouping by all select fields), causing GROUP BY
expressions to be wiped along with select fields.

Backport of 801a84ae329a24d9adf01b700429fe8f1285b2b8 from master
 2015-05-25 20:47:28 -04:00
Marten Kenbeek
1ac4c7d415 [1.8.x] Fixed #24848 -- Fixed ValueError for faulty migrations module. 
Added apps to unmigrated apps if the migrations module is a file
or a folder missing __init__.py.

Thanks to Ernest0x for the bug report.

Backport of d73176a84273c06fa11075c65293ec28497a8423 from master
 2015-05-25 13:56:37 -04:00
Villiers Strauss
4311fd2c0a [1.8.x] Fixed #24841 -- Made BaseRangeField.prepare_value() call base_field's prepare_value() 
Backport of 614bec41b5306b32b8de20d66f047ff8d6f35256 from master
 2015-05-25 12:07:25 -04:00
Claude Paroz
0bfe322bac [1.8.x] Fixed #24826 -- Accounted for filesystem-dependent filename max length 
Thanks Raphaël Hertzog for the report and help on the patch, and Tim Graham
for the review.

Backport of 170f7115bbae45f26ca8078e749dfe67445a57ea from master
 2015-05-23 14:58:03 -04:00
Tim Graham
31cb25adec [1.8.x] Fixed incorrect session.flush() in cached_db session backend. 
This is a security fix; disclosure to follow shortly.

Thanks Sam Cooke for the report and draft patch.
 2015-05-20 13:49:07 -04:00
Simon Charette
2b2a2157d0 [1.8.x] Refs #24652 -- Made sure template backend tests call their super setUpClass. 
Backport of ead36e8a471389a6032d825c8245245ebb89ea5d from master
 2015-05-20 13:32:36 -04:00
Simon Charette
3ab3be4b5d [1.8.x] Refs #24652 -- Converted a template test to avoid executing queries. 
Backport of 8bf1449edb4139451643e3823b194b4c02ca7633 from master
 2015-05-20 13:32:35 -04:00
Simon Charette
e846ea0649 [1.8.x] Refs #24652 -- Enforced test isolation in file_storage tests. 
Backport of 3db21c351b9b1108954c388799d35c8dad7dfc19 from master
 2015-05-20 13:32:35 -04:00
Tim Graham
525fd2f405 [1.8.x] Fixed typo in file_storage tests. 
Backport of e2b77aceddbda9071fcfc38f90fb50d091d0b5fc from master
 2015-05-20 13:06:10 -04:00
Anssi Kääriäinen
db65660928 [1.8.x] Fixed #24705 -- Fixed negated Q objects in expressions. 
Avoided split_exclude() for Q when used as an expression.

Backport of bc87061a3c7c8d6b4d2469f35cc78683c6cff647 from master
 2015-05-20 09:41:42 -04:00
Tim Graham
3c0e03ef42 [1.8.x] Fixed #24812 -- Fixed app registry RuntimeWarnings in schema and migrations tests. 
Backport of f5da4380723c93998a4f5a845b6f26fa51a2cfe1 from master
 2015-05-18 10:14:57 -04:00
Claude Paroz
cdf7f90f95 [1.8.x] Fixed #24791 -- Added fallback when 'postgres' database isn't available 
Thanks Carl Meyer and Tim Graham for the reviews.
Backport of 322605035 from master.
 2015-05-15 18:46:05 +02:00
Bo Lopker
3c659856eb [1.8.x] Fixed #24799 -- Fixed session cookie deletion when using SESSION_COOKIE_DOMAIN 
Backport of 2dee853ed4def42b7ef1b3b472b395055543cc00 from master
 2015-05-15 11:24:18 -04:00
Claude Paroz
6a0d9f068f [1.8.x] Fixed #24757 -- Recreated MySQL index when needed during combined index removal 
Thanks Thomas Recouvreux for the report and Tim Graham for the tests and
review.
Backport of ae635cc36 from master.
 2015-05-15 17:08:49 +02:00
Tim Graham
30e5703844 [1.8.x] Fixed #24802 -- Delayed GDAL check for OSMGeoAdmin 
Backport of a37dcfd0a38cff24eb4fb5e3858791aa5428c853 from master
 2015-05-15 09:20:04 -04:00
Tim Graham
df0674eabb [1.8.x] Fixed #24751 -- Fixed HStoreField isnull lookup. 
Backport of 3c8fe5dddf34533a419d2deed5208a28de32cb4a from master
 2015-05-13 10:34:15 -04:00
Abhaya Agarwal
290c9d6654 [1.8.x] Fixed #24698, #24712 -- Added ForeignKey.get_db_prep_value() 
Fixed crashes with ForeignKey to UUIDField and inheritance with UUIDField
primary keys.
 2015-05-12 19:37:37 -04:00
Anssi Kääriäinen
d5ce2dd7bc [1.8.x] Fixed #24748 -- Fixed incorrect GROUP BY on MySQL in some queries 
When the query's model had a self-referential foreign key, the
compiler.get_group_by() code incorrectly used the self-referential
foreign key's column (for example parent_id) as GROUP BY clause
when it should have used the model's primary key column (id).

Backport of adc57632bc26cc8fe42bdb6aff463f883214980a from master
 2015-05-11 11:52:14 -04:00
Anssi Kääriäinen
056a91dbfa [1.8.x] Fixed #24766 -- Added join promotion for Case expressions 
Backport of be9d645346a20a6c394bf70d47b1b1d5c81ff530 from master
 2015-05-11 11:17:37 -04:00
Anssi Kääriäinen
5b5858575c [1.8.x] Fixed #24752 -- query crash when reusing Case expressions 
Case expressions weren't copied deep enough (self.cases list was
reused resulting in an error).

Backport of 7b05d2fdaed582662d8f79130932f600f4f966a0 from master
 2015-05-05 11:38:48 -04:00
Aymeric Augustin
1f0a6082ec [1.8.x] Fixed #24685 -- Fixed check for template name unicity. 
Thanks Preston Timmons for the report.

Backport of 1563b89 from master
 2015-05-04 07:39:28 +02:00
Tim Graham
556b1c8ad3 [1.8.x] Fixed model_regress test failure on non-ASCII path; refs #24717. 
Backport of 29e90f3ae0b0b72bbdf342e0136414bff917c6a6 from master
 2015-04-30 08:13:30 -04:00
Markus Holtermann
bf4dc5733f [1.8.x] Fixed #24725 -- Allowed renaming of target models in ManyToMany relations 
This is a regression caused by introducing rendered migration states in
1aa3e09c2043 and the _meta refactoring in fb48eb05816b.

Thanks to Danilo Bargen for reporting the issue and Marten Kenbeek and
Tim Graham for triaging the bug and providing the initial test case.

Backport of 63f9b633f9cb620a4c4764b47dca127706a8d7b4 from master
 2015-04-30 13:46:24 +02:00
David D. Riddle
8c58caaf9d [1.8.x] Fixed #24717 -- Fixed model_regress test failure on RHEL6 SCL 
The test failed on RHEL6 systems running python 2.7 from a RedHat
Software Collection (SCL) because this test runs an external python
script with a stripped system environment. RedHat SCLs work by setting
a number of system environment variables when these are stripped out by
this test the python 2.7 interpreter is no longer able to function
properly because it can not find the system libraries needed.

Now we use use mock to modify the system environment directly.

Backport of 31e6c9c8e310e68a96c1f76b9657242c6cecaa4d from master
 2015-04-29 12:28:39 -04:00
Aric Coady
b67bd1b483 [1.8.x] Fixed #24719 -- Restored the ability to use interators as queryset related object filters. 
Backport of 9c2d8cde77ee6edd407e92f93eacd4624290394f from master
 2015-04-28 11:00:58 -04:00
Alasdair Nicol
c37eb3c870 [1.8.x] Fixed #24714 -- Used more specific assertions than assertEqual in tests. 
Backport of eaeea6f94701547ce1b50dbcf5cf71460e9e4c91 from master
 2015-04-28 09:31:35 -04:00
Alasdair Nicol
5105c1628d [1.8.x] Used assertIsInstance in tests. 
Backport of d91321e8be0d8e52546026d461b14157d565870c from master
 2015-04-27 08:42:52 -04:00
Markus Holtermann
419f296259 [1.8.x] Fixed #24701 -- Converted model manager names to unicode in migrations 
Thanks to Reto Aebersold for reporting the issue and Tim Graham and
Claude Paroz for the review.

Backport of faad6070ee2eeea270c76381f9ca5999bf1ac15f from master
 2015-04-25 18:18:40 +02:00
Markus Holtermann
0cacb8f8ba [1.8.x] Fixed #24573 -- Considered new related models for reloading 
Thanks tttomekkk for the report.

Backport of b93690c4652a108b4305c0df34509bfc267fd927 from master
 2015-04-21 12:06:11 +02:00
Yoong Kang Lim
b8f203b3f2 [1.8.x] Fixed #24667 --- Repaired model_fields cardinality test 
Backport of 36eab95e7fde7fad4368192ddbef4e2dbb32dc91 from master
 2015-04-20 09:41:38 -04:00
Claude Paroz
ff6e8681a3 [1.8.x] Fixed #24658 -- Added missing Meta attribute in schema tests 
Without that, the Note model would be initially created and then
the tests using that model failed when run in isolation.
Backport of f54c0ec06e from master.
 2015-04-19 00:08:21 +02:00
Shai Berger
8363f217f2 [1.8.x] Fixed #24595 Oracle test failure 
The only problem for Oracle was the test, which tested nullity on
text/char fields -- but Oracle interprets_empty_strings_as_null.

Backport of d5a0acc from master
 2015-04-18 18:55:54 +03:00