mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-04-24 17:24:37 +00:00
Code Issues 32 Releases Wiki Activity
18,030 Commits 29 Branches 441 Tags
Commit Graph

10955 Commits

Author SHA1 Message Date
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
d723da383d 1.7-specific fix to help text to stop extra migration 2014-08-04 14:18:22 +10:00
Andrew Godwin
d77f92fa1e [1.7.x] Fixed #23161: Drop PostGIS geography fields correctly 2014-08-04 14:07:08 +10:00
Andrew Godwin
b2ab666aad [1.7.x] Fixed #23163: Align user help text with migrations 2014-08-04 13:57:36 +10:00
Andrew Godwin
6ebfff7f66 [1.7.x] Fixed #23153: Properly recreate spatialite triggers on alter table 2014-08-04 13:28:41 +10: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
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
Florian Apolloner
1cb919e408 [1.7.x] Ensured that Paginator.page_range works the same on Python 2 and 3. 
This somewhat fixes #23088, refs 23140.

Backport of 2d542bf60cc37c59872c5a20d6af3bf826038739 from master.
 2014-08-03 21:11:32 +02: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
Baptiste Mispelon
2c5eee9f88 [1.7.x] Removed unnecessary code in ManyToManyField.deconstruct() 
Backport of 44169a00c1fe7c130a8b9774e3b02ccce524a3eb from master.
 2014-08-03 15:27:26 +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
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
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
8e7fdfdb6f [1.7.x] Fixed #23092: Squashing handles external dependencies 2014-07-29 10:22:30 -07:00
Andrew Godwin
3deddc2fdf [1.7.x] Fixed #23090: Document and enforce not double-squashing migrations 2014-07-29 10:03:59 -07: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
9abc36b626 [1.7.x] Fix soft_applied in a way that doesn't break tests 2014-07-29 09:24:22 -07:00
Andrew Godwin
053af1422a [1.7.x] Make detect_soft_applied exit correctly on non-create migrations 2014-07-29 09:19:48 -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
James Bennett
b4c80238a2 [1.7.x] Bump version number for 1.7 RC 2. 2014-07-27 14:33:04 +02: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
Florian Apolloner
f8ec200671 [1.7.x] Only warn about initial data if fixtures have been found. 
Backport of 2ab0ed7b2842fbb8bf36ee7df9949d10546d953d from master.
 2014-07-27 13:29:36 +02: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
Federico Frenguelli
bc3d401b9f [1.7.x] Fixed #22887 -- Added comment for translators on unique_for_date error message 
Backport of 6eed751162 from master.
 2014-07-26 13:56:58 +02: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
3268711417 [1.7.x] Fixed #23085: Better error message for PostGIS 1.5/bad custom fields 2014-07-25 09:50:17 -07:00
Andrew Godwin
e01c565b47 [1.7.x] Restore support for reading __latest__ for compatability 2014-07-25 09:44:15 -07:00
Andrew Godwin
919d10e619 [1.7.x] Fixed #23093: soft application detection for swapped models 2014-07-25 09:35:53 -07:00
Andrew Godwin
2bacc9f3b7 [1.7.x] Mark initial_data as deprecated separately from syncdb. Refs #23077. 
Conflicts:
	docs/internals/deprecation.txt
 2014-07-25 09:11:01 -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
0ac986fd8c [1.7.x] Avoided transactional truncates on amateur databases. 
Fixed a test failure that appeared after 753a22a6, although the bug
existed before that commit.

Refs #22308.

Backport of 6877a9d4 from master
 2014-07-24 19:18:06 -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
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
Claude Paroz
ddb5674945 [1.7.x] Fixed #23030 -- Properly handled geometry columns metadata during migrations 
Thanks kunitoki for the report and initial patches.
Backport of 8c30df15f1 from master.
 2014-07-23 12:16:11 +02:00
Claude Paroz
86655111c9 [1.7.x] Adapted SpatialiteGeometryColumns model to spatialite >= 4 
See also:
https://www.gaia-gis.it/fossil/libspatialite/wiki?name=switching-to-4.0
Backport of 19d8f2ebf4 from master.
 2014-07-23 12:15:44 +02:00
Iain Dawson
59fec1ca9b [1.7.x] Replaced instances of 'his/her' with 'their'. 
Backport of 8fbf13a6c8 from master
 2014-07-21 19:54:22 +00:00
Claude Paroz
6e41ae1a4e [1.7.x] Fixed #23064 -- Added lib detection support for GDAL 1.10/1.11 
Note that GDAL 1.11 is not yet officially supported, until someone
has tested it and can confirm it has no issues with Django.
Backport of 3f1412ff7b from master.
 2014-07-21 19:07:48 +02: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