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
18,086 Commits 29 Branches 437 Tags
Commit Graph

5550 Commits

Author SHA1 Message Date
Baptiste Mispelon
3a80189479 [1.7.x] Fixed #23303 -- Added BEGIN and COMMIT statements to the output of sqlmigrate. 
Backport of 5853c87a458f62ebd62d7809168355610de2570c 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 2f35c6f10fcbae541691207fb0c0560a13b754fc.

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 72f1eb48df335c110f39d56f7978d95896a56bb8 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 74325339327e5b8a2480aee7f482bc71f73c71f9 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 ce95ab8f025cc9f35990f0c2d9a290eec1ece753.

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 4453c80634fb72b60e849480e52c06b570c696d5 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 97a38de230371c0b6ad8a86abba8425186c147c7 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 2f73b527dda6683868fac2791f7f07ccb01ea0d9 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
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 d0889863de50d65659f56f0b9ea0672a8b6482a1 from master.
 2014-07-26 14:53:31 +02:00
Hiroki KIYOHARA
0d8d4fe9b4 [1.7.x] Added test for the #23070 problem 
Backport of e569144910e336d2f76a3a31998ec672377d31cc 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