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

5590 Commits

Author SHA1 Message Date
Sergey Fedoseev 58d7b84d53 [1.7.x] Fixed #23065 -- Quoted constraint names in SQL generated by migrations. 
Backport of 83cd18633f from master
 2014-09-23 10:11:58 -04:00
Tim Graham 0f52bf7c96 [1.7.x] Fixed some flake8 errors. 
Backport of 9d30412a5a from master
 2014-09-19 12:33:44 -04:00
Baptiste Mispelon 04e7c7d51f [1.7.x] Fixed #23492 -- Restored F.__deepcopy__. 
This reverts commit 3a66035107.
A regression test was also added.

Backport of d63ac5b595 from master.
 2014-09-16 12:24:01 +02:00
valtron 563eaf0499 [1.7.x] Fixed #23474 -- Prevented migrating backwards from unapplying the wrong migrations. 
Backport of abcf28a076 from master
 2014-09-15 15:06:21 -04:00
Carl Meyer ac1adfbe4a [1.7.x] Fixed #23483 -- Prevented ImproperlyConfigured with dotted app names 
Made sure the app labels stay unique for the AppConfigStubs, so
migrations wouldn't fail if two dotted app names has the same last part
(e.g. django.contrib.auth and vendor.auth)

Backport of 5e32605ce9 from master.
 2014-09-12 15:34:42 -06:00
Markus Bertheau 35cd0854f9 [1.7.x] Corrected grammar in migrations error message. 
Backport of 61f56e239f from master
 2014-09-10 10:34:32 -04:00
Markus Holtermann 67872bfff1 [1.7.x] Fixed #23452 -- Prevented infinite migrations for empty unique/index_together. 
Thanks fwkroon for the report.

Backport of 6d5958c7a3 from master
 2014-09-10 07:57:31 -04:00
Aymeric Augustin c981d9140d [1.7.x] Fixed #22920 -- Avoid masking some exceptions. 
If loading an application trigger an ImportError, the details of that
error were lost in some cases. Thanks Ben Davis for the report.

Backport of b161c01 from master
 2014-09-09 20:54:07 +02:00
Tim Graham a8ded528b3 [1.7.x] Fixed #11775 -- Made ABSOLUTE_URL_OVERRIDES work with models that don't define get_absolute_url(). 
Thanks jukvalim for the report and initial patch,
and Preston Timmons for review.

Backport of c32bc1a7a7 from master
 2014-09-09 11:07:41 -04:00
Petras Zdanavičius a3e9e9e6c6 [1.7.x] Fixed #23451 -- Fixed typo in inlineformset_factory() error message. 
Backport of f7eee04ebe from master
 2014-09-08 17:22:49 -04:00
Markus Holtermann 1f1a329288 [1.7.x] Fixed broken test from da160d440f; refs #23418. 
Backport of 16548cfc7c from master
 2014-09-08 16:51:34 -04:00
Markus Holtermann b0def3bcac [1.7.x] Fixed #23418 -- Fail when migration deconstruct produces invalid import 
Backport of d28b5f13b3 from master
 2014-09-08 15:41:14 -04:00
Simon Charette 9c4fb019cb [1.7.x] Fixed #23431 -- Allowed inline and hidden references to admin fields. 
This fixes a regression introduced by the 53ff096982 security fix.

Thanks to @a1tus for the report and Tim for the review.

refs #23329.

Backport of 342ccbddc1 from master
 2014-09-08 13:54:21 -04:00
Andrew Pinkham 27e7972e63 [1.7.x] Fixed #22951 -- Checked for types during deep_deconstruct migration serializ 
Thanks Sam Hartsfield for the report.

Backport of 4680d25df2 from master
 2014-09-08 07:58:06 -04:00
Marc Tamlyn 48e1071007 [1.7.x] Fixed #23416 -- Make sure DatabaseCreation respects checks. 
Migrations respected Field.db_parameters()['check'], but
DatabaseCreation was still using just Field.db_type().

Backport of 14c8456 from master
 2014-09-06 19:02:28 +01:00
Andrew Godwin de3a3096d8 [1.7.x] Fix Python 3 incompatability 2014-09-05 15:48:20 -07:00
Ben Reilly 4ca44d5e10 [1.7.x] switch out recursive dfs for stack based approach, to avoid possibly hitting the recursion limit 2014-09-05 15:39:47 -07:00
Nikolaus Schlemm d0c6016367 [1.7.x] cater for running tests from another directory than tests - applying existing pattern to newly added test_testcase_ordering as well 
Backport of d11e836203 from master
 2014-09-05 14:35:00 -04:00
Dave Hall 7eabd22217 [1.7.x] Fixed #22918 -- Fixed SeparateDatabaseAndState crash 
Backport of e03b7940e5 from master
 2014-09-02 08:11:45 -04:00
Alex Gaynor f4da04a771 [1.7.x] Added a missing word in a skip message 
Backport of 8b6cb9d0dd from master
 2014-08-30 21:37:15 -04:00
Claude Paroz d839c75664 [1.7.x] Fixed #22820 -- Treated int and long types alike in lazy_number 
Thanks kwist for the report and the initial patch.
Backport of 5021421799 from master.
 2014-08-30 18:51:52 +02:00
Akis Kesoglou 3297f9e1ad [1.7.x] Fixed #23370 -- defer() + select_related() crashed with inherited models. 
Backport of 6613ea6e3f from master
 2014-08-30 07:16:42 -04:00
Simon Charette f201cfae12 [1.7.x] Fixed an Oracle test failure introduced by 1e404180c1. 
Backport of e98c5513cb from master
 2014-08-28 19:37:21 -04:00
Simon Charette c32c220881 [1.7.x] Fixed #23379 -- Corrected a referencing issue in sql_create. 
Thanks to Trac alias flakfizer for the report.

Backport of 1e404180c1 from master
 2014-08-28 15:23:46 -04:00
Claude Paroz 9ac713645b [1.7.x] Fixed #23374 -- Renamed StaticLiveServerCase to StaticLiveServerTestCase 
Refs #20739. Thanks Raphaël Hertzog for the report and the initial
patch.
Backport of 3a44e2000 from master.
 2014-08-28 08:46:54 +02:00
Simon Charette 4883516bea [1.7.x] Fixed #23329 -- Allowed inherited and m2m fields to be referenced in the admin. 
Thanks to Trac alias Markush2010 and ross for the detailed reports.

Backport of 3cbb7590cb from master
 2014-08-27 21:27:48 -04:00
Tim Graham 187ee0a4ac [1.7.x] Removed unnecessary absolute_imports. 
Backport of e0cf030194 from master
 2014-08-25 13:13:58 -04:00
Raffaele Salmaso 1a918806ca [1.7.x] Fixed #23341 -- Added migration name to nonexistent migration error in makemigrations. 
Backport of abd640fbdf from master
 2014-08-23 19:19:58 -04:00
Raffaele Salmaso 4ae75cf051 [1.7.x] Fixed #23352 -- Added tests for MigrationGraph.{forwards,backwards}_plan 
Backport of be4baaefe2 from master
 2014-08-23 21:36:08 +00:00
Shai Berger 588f66d182 [1.7.x] Fixed schema test for Oracle 11.2.0.1 which is used in Django Project's CI. 
Refs #23073 Workaround.

Refs #22738 Repeats the mysql "offense". When the issue is solved, the
Oracle special case should be made to play with the solution (that is,
Oracle should be fixed the same way that mysql and the 3rd-party backneds
are).

Backport of 56252e7 from master
 2014-08-22 05:34:20 +03:00
Markus Holtermann 2da20379c0 [1.7.x] Fixed #23322 -- Use resolved swappable model for dependency resolution during makemigrations 
Backport of 144cff3f51 from master
 2014-08-20 16:08:49 -04:00
Simon Charette 2b31342cdf [1.7.x] Prevented data leakage in contrib.admin via query string manipulation. 
This is a security fix. Disclosure following shortly.
 2014-08-20 14:42:48 -04:00
Tim Graham 3123f8452c [1.7.x] Fixed #23157 -- Removed O(n) algorithm when uploading duplicate file names. 
This is a security fix. Disclosure following shortly.
 2014-08-20 14:42:48 -04:00
Florian Apolloner bf650a2ee7 [1.7.x] Prevented reverse() from generating URLs pointing to other hosts. 
This is a security fix. Disclosure following shortly.
 2014-08-20 14:42:48 -04:00
Tim Graham 2981485280 [1.7.x] Fixed flake8 warnings. 
Backport of 6f59d29158 from master
 2014-08-20 14:38:43 -04:00
Tim Graham 6981eced83 [1.7.x] Fixed migrations tests added in refs #23315. 
Backport of d1299fce0e from master
 2014-08-20 14:01:50 -04:00
Andrew Godwin 824e02bf83 [1.7.x] Fixed #23315: Operational dependency fail with mixed create/add 2014-08-19 19:51:23 -07:00
Claude Paroz 72ad014b6a [1.7.x] Fixed #22996 -- Prevented crash with unencoded query string 
Thanks Jorge Carleitao for the report and Aymeric Augustin, Tim Graham
for the reviews.
Backport of fa02120d36 from master.
 2014-08-19 22:30:22 +02:00
Lee Sanghyuck 6e5e2b0e28 [1.7.x] Fixed #23316 -- Added datetime.time serialization in migrations. 
Backport of 11d9cbe2f4 from master
 2014-08-19 13:32:05 -04:00
Baptiste Mispelon 24d9aee188 [1.7.x] Fixed broken tests on Oracle after 5853c87a45. 
Oracle doesn't have a `BEGIN` statement so the test would
fail.

Refs #23303

Backport of 54164b814c from master.
 2014-08-19 18:00:39 +02:00
Baptiste Mispelon 3a80189479 [1.7.x] Fixed #23303 -- Added BEGIN and COMMIT statements to the output of sqlmigrate. 
Backport of 5853c87a45 from master.

Conflicts:
	django/core/management/commands/sqlmigrate.py
	tests/user_commands/tests.py
 2014-08-18 19:36:34 +02:00
Tim Graham 6011f24503 [1.7.x] Fixed typo in tests/migrations/test_operations.py 
Backport of 0ad4672c0f from master
 2014-08-15 11:02:18 -04:00
Andrew Godwin b5784048e0 [1.7.x] Fixed #23288: deconstruct() ignoring related_name 2014-08-14 19:47:34 -07:00
Andrew Godwin 72fdd62e93 [1.7.x] Fixed #23275: Unmanaged models kept by autodetector, ignored by ops 2014-08-12 12:51:11 -07:00
Rajiv Makhijani 4ce5ced230 [1.7.x] Fixed #23259 -- Corrected insertion order of extra() select_params 
A regression caused queries to produce incorrect results for cases where
extra(select) is excluded by values() but included by extra(order_by)

The regression was caused by 2f35c6f10f.

Backport of f0b358880a from master
 2014-08-11 09:35:37 +03:00
Andrew Godwin ee74f9fe3b [1.7.x] Fixed #23264: Schema backends honour db_constraint 2014-08-09 17:51:06 +10:00
Justin Hamade 98d6f128d0 [1.7.x] Fixed #22336 -- Added path matching for makemessages ignore option 
This fixes a regression introduced by 9012a9e200.
Backport of 8fe406864c from master.
 2014-08-08 22:55:45 +02:00
Jacob Haslehurst 29585e9b6a [1.7.x] Fixed #22982 -- Added GenericRelatedObjectManager.__str__. to prevent crash. 
Thanks bendavis78 for the report.
 2014-08-07 14:41:28 -04:00
Tim Graham 796030590a [1.7.x] Added a missing unicode_literals that caused a test failure after refs #23226. 
Backport of 57b60f9f93 from master
 2014-08-07 08:32:12 -04:00
Andrew Godwin 0e69af51b1 [1.7.x] Fixed #23244: Error altering FK to non-FK in migrations 2014-08-07 11:52:49 +10:00