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
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
Shai Berger f3c0cb0120 [1.7.x] Fixed #23061: Avoided setting a limit on a query for get with select_for_update on Oracle 
Thanks Michael Miller for reporting the issue.

Backport of 746f2a4bed from master
 2014-08-05 03:21:25 +03:00
Andrew Godwin a918c60c37 [1.7.x] Fixed #23091: CreateModel and AddField were clashing with deferred SQL 2014-08-04 11:59:48 +10:00
Simon Charette 99f3a65c73 [1.7.x] Fixed a MySQL test failure introduced by cbb29af1aa. 
Seems like unlike other backends MySQL get_constraints fails when dealing
with a non-existing table. refs #23160.

Backport of 1b00738f73 from master
 2014-08-03 17:02:49 -04:00
Simon Charette 6b2473d3e8 [1.7.x] Fixed #23160 -- Correctly rename models with self referential fields. 
Thanks to whitews AT gmail for the report.

Backport of cbb29af1aa from master
 2014-08-03 17:02:41 -04:00
Baptiste Mispelon 23b0d636d3 [1.7.x] Fixed #23156 -- Added missing BinaryField.deconstruct() method. 
Backport of 72f1eb48df from master.
 2014-08-03 15:28:14 +02:00
Baptiste Mispelon 0b1d0afc92 [1.7.x] Added missing logic to TimeField.deconstruct(). 
If auto_now or auto_now_add was used then the serialized
field in the migration contained unnecessary `editable` and
`blank` arguments.

Backport of 7432533932 from master.
 2014-08-03 15:27:57 +02:00
Tim Graham ee0208108b Revert "[1.7.x] Fixed #23088 -- Used `six` `range` type in `Paginator.page_range`." 
This reverts commit ce95ab8f02.

It caused some backwards compatibility concerns (refs #23140).
 2014-08-01 10:14:28 -04:00
Tim Graham 063e7e56bc [1.7.x] Fixed flake8 warnings. 
Backport of 9a922dcad1 from master
 2014-07-31 09:25:23 -04:00
Florian Apolloner 567ae0d529 [1.7.x] Fixed the previous commit for Python3. 
Backport of 4453c80634 from master.
 2014-07-30 22:22:56 +02:00
areski e22ad1c325 [1.7.x] Fixed #23112 -- Field.get_choices tries to index an iterable 
Backport of 97a38de230 from master.
 2014-07-30 21:36:01 +02:00
Tim Graham 5736631233 [1.7.x] Fixed test failure on Windows. 
os.close(fd) is needed to avoid "The process cannot access the file
because it is being used by another process"

Backport of c2ab501bab from master
 2014-07-30 14:33:58 -04:00
Tim Graham 82695c3f2b [1.7.x] Fixed flake8 errors. 
Backport of 34c60c42b6 from master
 2014-07-30 12:59:46 -04:00
areski 7cb4a82eaf [1.7.x] Fixed #23107 -- Made runserver output respect --no-color. 
Backport of 67d7da5fb9 from master
 2014-07-30 12:59:39 -04:00
Andrew Godwin 0a4fbf4e13 [1.7.x] Fixed #23101: Prefer doing deletes before creates in autodetector. 
Makes declined or missed renames still work (but drop data).
 2014-07-29 09:39:01 -07:00
Andrew Godwin 394053ce60 [1.7.x] Fixed #23121: AlterModelOptions operation not changing state right 2014-07-28 10:47:55 -07:00
Andrew Godwin d84b881600 [1.7.x] Fixed #23100: Individual FK creation missing dependencies 2014-07-28 10:33:28 -07:00
Florian Apolloner 99c2c917c3 [1.7.x] Fixed #23098 -- Checked that lazy choices are not evaluated too soon 
Thanks Matthieu Agopian for the report.

Backport of 2f73b527dd from master.
 2014-07-27 13:32:07 +02:00
Tushar Bhatia df0d5ea7bc [1.7.x] Fixed #22979 -- Moved bug* tests 
Backport of 11181a64f from master.
 2014-07-26 21:10:03 -04:00
Abraham Martin 999758fc7a Fixed #23101 db_table wasn't copied in deconstruct 2014-07-26 18:48:36 +02:00
Andrew Godwin 7e708a2536 [1.7.x] Fixed #22944: Bad dependency on FK alteration in autodetector 2014-07-26 09:22:31 -07:00
qingfeng 3a2badcbb7 [1.7.x] Fixed #23060 -- Prevented UnicodeDecodeError in debug templatetag 
Backport of 08451f17d0 from master.
 2014-07-26 18:04:01 +02:00