2787de652a
Fix location of tablespace clauses in schema backend column SQL
2013-08-23 14:38:55 +01:00
5569b0b92f
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
django/db/backends/oracle/base.py
django/db/backends/postgresql_psycopg2/base.py
django/db/models/signals.py
tests/queries/tests.py
2013-08-23 12:36:53 +01:00
9cc6cfc405
Fix Oracle's default handling and schema-prepared-statement issue
2013-08-23 12:07:55 +01:00
b0ce6fe656
Fixed #20922 -- Allowed customizing the serializer used by contrib.sessions
...
Added settings.SESSION_SERIALIZER which is the import path of a serializer
to use for sessions.
Thanks apollo13, carljm, shaib, akaariai, charettes, and dstufft for reviews.
2013-08-22 13:58:26 -04:00
9d1987d767
Fixed #19303 -- Fixed ModelAdmin.formfield_overrides on fields with choices
2013-08-22 11:50:52 -04:00
65cf82bd08
Fixed #20934 -- Avoided NoReverseMatch in ModelAdmin.changelist_view
...
The view tried to display links to a ModelAdmin's change_view, which
resulted in NoReverseMatches if get_urls was overridden to remove the
corresponding url.
2013-08-22 10:08:54 -04:00
6af05e7a0f
Fixed model.__eq__ and __hash__ for no pk value cases
...
The __eq__ method now considers two instances without primary key value
equal only when they have same id(). The __hash__ method raises
TypeError for no primary key case.
Fixed #18864 , fixed #18250
Thanks to Tim Graham for docs review.
2013-08-22 17:24:07 +03:00
768bbf3efe
Revert "Fixed #20956 -- Removed useless check in django.db.utils"
...
This reverts commit ce0e86cf76
2013-08-22 09:47:17 -04:00
ce0e86cf76
Fixed #20956 -- Removed useless check in django.db.utils
2013-08-22 08:53:14 -04:00
8cd8742981
Moved translator comment just above the target string
2013-08-22 09:52:54 +02:00
8d65b6082c
Fixed #20955 -- select_related regression
...
In cases where the same connection (from model A to model B along the
same field) was needed multiple times in a select_related query, the
join setup code mistakenly reused an existing join.
2013-08-22 10:51:07 +03:00
beefac8aae
Only create the migration directory once per app
2013-08-21 22:32:05 +01:00
2d903929a7
Fixed #20949 -- Typo #2 in docstring
2013-08-21 22:32:05 +01:00
cb5c0bec14
Fixed docstring typo, thanks minddust.
2013-08-21 22:32:04 +01:00
3f416f6379
Fixed a regression with get_or_create and virtual fields.
...
refs #20429
Thanks Simon Charette for the report and review.
2013-08-21 22:32:04 +01:00
8e571e5f8f
Fixed #12422 -- Don't override global email charset behavior for utf-8.
...
Thanks simonb for the report, Claude Paroz and Susan Tan for their work
on a fix.
2013-08-21 22:32:04 +01:00
244e2b71f5
Fixed #20946 -- model inheritance + m2m failure
...
Cleaned up the internal implementation of m2m fields by removing
related.py _get_fk_val(). The _get_fk_val() was doing the wrong thing
if asked for the foreign key value on foreign key to parent model's
primary key when child model had different primary key field.
2013-08-21 22:32:04 +01:00
c5fbd16362
Import test case classes from their public API module.
2013-08-21 22:32:04 +01:00
01223840f3
Fixed #18967 -- Don't base64-encode message/rfc822 attachments.
...
Thanks Michael Farrell for the report and his work on the fix.
2013-08-21 22:32:04 +01:00
839940f27f
Fixed #20933 -- Allowed loaddata to load fixtures from relative paths.
2013-08-21 22:32:04 +01:00
1db5fce1ee
Oracle also treats NULLs as largests values when ordering.
2013-08-21 22:32:03 +01:00
f5552571dc
Fixed #20820 -- Model inheritance + m2m fixture loading regression
...
Tests by Tim Graham, report from jeroen.pulles@redslider.net .
2013-08-21 22:31:50 +01:00
ced3e6b17d
Fixed test failure caused by different NULL ordering between backends
2013-08-21 22:31:50 +01:00
cea7204504
Fixed #14056 -- Made sure LEFT JOIN aren't trimmed in ORDER BY
...
If LEFT JOINs are required for correct results, then trimming the join
can lead to incorrect results. Consider case:
TBL A: ID | TBL B: ID A_ID
1 1 1
2
Now A.order_by('b__a') did use a join to B, and B's a_id column. This
was seen to contain the same value as A's id, and so the join was
trimmed. But this wasn't correct as the join is LEFT JOIN, and for row
A.id = 2 the B.a_id column is NULL.
2013-08-21 22:30:46 +01:00
63378163f9
Fixed #20943 -- Weakly reference senders when caching their associated receivers
2013-08-21 22:30:45 +01:00
eadecf0cdb
Avoid importing the deprecated `django.utils.importlib` package.
2013-08-21 22:30:02 +01:00
e9b703f5a5
Correctly format missing Pillow/PIL exceptions messages. refs #19934
2013-08-21 22:30:02 +01:00
2e7f45a372
Change autodetector changes API to be just one method
2013-08-21 22:25:15 +01:00
0073f1d94f
Fixed #20949 -- Typo #2 in docstring
2013-08-21 10:50:08 -04:00
d3ed15b79d
Fixed docstring typo, thanks minddust.
2013-08-21 09:01:52 -04:00
f7290581fe
Fixed a regression with get_or_create and virtual fields.
...
refs #20429
Thanks Simon Charette for the report and review.
2013-08-21 08:30:21 -04:00
ececbe77ff
Fixed #12422 -- Don't override global email charset behavior for utf-8.
...
Thanks simonb for the report, Claude Paroz and Susan Tan for their work
on a fix.
2013-08-21 07:44:20 -03:00
b065aeb17f
Fixed #20946 -- model inheritance + m2m failure
...
Cleaned up the internal implementation of m2m fields by removing
related.py _get_fk_val(). The _get_fk_val() was doing the wrong thing
if asked for the foreign key value on foreign key to parent model's
primary key when child model had different primary key field.
2013-08-21 08:32:19 +03:00
deebb1a977
Import test case classes from their public API module.
2013-08-20 22:23:41 -03:00
f9d1d5dc13
Fixed #18967 -- Don't base64-encode message/rfc822 attachments.
...
Thanks Michael Farrell for the report and his work on the fix.
2013-08-20 22:17:26 -03:00
96346ed5ad
Fixed #20933 -- Allowed loaddata to load fixtures from relative paths.
2013-08-20 21:25:57 +02:00
859e678b3d
Oracle also treats NULLs as largests values when ordering.
2013-08-20 12:28:59 -04:00
1ed77e7782
Fixed #20820 -- Model inheritance + m2m fixture loading regression
...
Tests by Tim Graham, report from jeroen.pulles@redslider.net .
2013-08-20 16:54:05 +03:00
8dc76c4b91
Fixed test failure caused by different NULL ordering between backends
2013-08-20 11:33:44 +03:00
905409855c
Fixed #14056 -- Made sure LEFT JOIN aren't trimmed in ORDER BY
...
If LEFT JOINs are required for correct results, then trimming the join
can lead to incorrect results. Consider case:
TBL A: ID | TBL B: ID A_ID
1 1 1
2
Now A.order_by('b__a') did use a join to B, and B's a_id column. This
was seen to contain the same value as A's id, and so the join was
trimmed. But this wasn't correct as the join is LEFT JOIN, and for row
A.id = 2 the B.a_id column is NULL.
2013-08-20 10:55:00 +03:00
e55ca60903
Fixed #20943 -- Weakly reference senders when caching their associated receivers
2013-08-20 01:53:58 -04:00
ac0e41e2c4
Avoid importing the deprecated `django.utils.importlib` package.
2013-08-19 19:42:53 -04:00
b9590a6935
Correctly format missing Pillow/PIL exceptions messages. refs #19934
2013-08-19 18:42:48 -04:00
b6a957f0ba
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
docs/ref/django-admin.txt
2013-08-19 18:30:48 +01:00
3c03004050
Fixed #20640 -- Avoided NoReverseMatch in get_deleted_objects
...
The default delete action resulted in a NoReverseMatch if it were to
list any Model with a ModelAdmin with `get_urls` overridden to remove
the change url. Catching the error and not displaying the link in that
case, as was already done for models with no registered admins.
Thanks Keryn Knight for the report.
2013-08-19 12:01:33 -04:00
ddeb20e31b
Fixed GIS regression caused by force_subq
...
Caused by commit 7737305a4f
2013-08-19 16:35:11 +03:00
7bc57a6d71
Fixed #11881 -- removed junk from aggregation subqueries
...
There were clauses that weren't needed in the subqueries. These were
ORDER BY, SELECT FOR UPDATE and related selections.
2013-08-19 16:15:09 +03:00
7737305a4f
Fixed #12886 -- aggregation over sliced queryset
2013-08-19 16:00:17 +03:00
52edc16086
Add more stringent M2M tests and fix the bug they exposed
2013-08-19 13:50:26 +01:00
5b522cd85a
Minor oracle fixes
2013-08-19 13:12:48 +01:00
3844089edc
Fixed #20777 -- Admin proxy model deletion regression
...
Added proxy_models tests by Harm Geerts <github@geertswei.nl>.
2013-08-19 09:51:41 +03:00
4668c142dc
Made Model.__eq__ consider proxy models equivalent
...
Fixed #11892 , fixed #16458 , fixed #14492 .
2013-08-19 09:51:28 +03:00
4090982617
Some code simplification
2013-08-18 09:43:41 -07:00
aa01c99f55
Merge pull request #1479 from nickbruun/ticket_20924
...
Proxy __len__ and __contains__ for LazyObject
2013-08-18 09:41:43 -07:00
7a698c05b5
Update LazyObject method proxy declarations to simpler form.
2013-08-18 15:58:55 +02:00
240886183b
Fixed #20829 -- Skip postgis metadata tables with introspection
2013-08-16 21:14:29 +02:00
165f44aaaa
Combine consecutive with statements
...
Python 2.7 allows to combine several 'with' instructions.
2013-08-16 20:12:10 +02:00
22c6497f99
Fixed #20895 -- Made check management command warn if a BooleanField does not have a default value
...
Thanks to Collin Anderson for the suggestion and Tim Graham for
reviewing the patch.
2013-08-15 19:47:26 -04:00
b9ef96e73c
Regression test and patch for ticket #20924 .
2013-08-15 20:59:58 +02:00
ff410565bf
Fixed #20709 -- Allowed {% widthratio %} to accept an "as" parameter.
...
Thanks clay.evil@ for the suggestion.
2013-08-14 12:40:19 -04:00
71c491972e
Fixed #11400 -- Passed kwargs from AbstractUser.email_user() to send_mail()
...
Thanks Jug_ for suggestion, john_scott for the initial patch,
and Tim Graham for code review.
2013-08-14 07:46:11 -04:00
4eeb8ec147
Fixed #20864 -- Made the test client use common method for performing requests.
2013-08-13 19:08:13 -04:00
157604a87f
Oracle schema backend, passes most tests and is pretty complete.
2013-08-13 20:54:57 +01:00
907ef9d0d1
Fixed #20555 -- Make subwidget id attribute available
...
In `BoundField.__iter__`, the widget's id attribute is now passed to
each subwidget. A new id_for_label property was added to ChoiceInput.
2013-08-13 13:23:05 -04:00
cbe6d5568f
Apply autoescaping to AdminURLFieldWidget.
...
This is a security fix; disclosure to follow shortly.
2013-08-13 11:06:41 -05:00
ae3535169a
Fixed is_safe_url() to reject URLs that use a scheme other than HTTP/S.
...
This is a security fix; disclosure to follow shortly.
2013-08-13 11:06:22 -05:00
737b53ab9a
Merge pull request #1470 from loic/admin.actionlist
...
Fixed overflow for the "Recent Actions" widget on the admin index.
2013-08-13 05:11:39 -07:00
163a34ce4b
Fixed #20883 -- Made model inheritance find parent links in abstract parents
2013-08-13 15:14:11 +03:00
33fc083b0d
Fixed overflow for the "Recent Actions" widget on the admin index.
...
Previously the CSS targeted "li.changelink" and therefore didn't
work for the "add" and "delete" actions.
Refs #14868 .
2013-08-13 18:20:12 +07:00
dcdc579d16
Fixed #20874 -- bump_prefix() in nested subqueries
...
Also made some cleanup to build_filter() code by introducing submethods
solve_lookup_type() and prepare_lookup_value().
2013-08-13 14:11:52 +03:00
6c12cd15e9
Unlocalize line numbers and ids in debug 500 view.
...
While using USE_L10N, line numbers and IDs were printed as comma (or
locale equivalent) separated values.
Thanks Kronuz for the report and intial patch.
Fixes #20861 .
2013-08-12 21:59:27 -03:00
44f907dd98
Start of getting Oracle to do schema stuff
2013-08-12 20:05:20 +01:00
71b5617c24
Fixed #17778 -- Prevented class attributes on context from resolving as template variables.
...
Thanks KyleMac for the report, regebro for the patch, and Aymeric for the test.
2013-08-12 12:41:39 -04:00
841b7af812
Use DEFAULT_DB_ALIAS
2013-08-12 16:40:41 +01:00
6bdb3b1135
Fixed #13518 -- Added FILE_UPLOAD_DIRECTORY_PERMISSIONS setting
...
This setting does for new directories what FILE_UPLOAD_PERMISSIONS
does for new files.
Thanks jacob@ for the suggestion.
2013-08-12 07:15:59 -04:00
b61b634628
Fix weird planning issues when already fully migrated.
2013-08-11 15:28:51 +01:00
b4c493ecd3
Remove keep_default from add_field
2013-08-11 14:28:55 +01:00
d985fd7a18
Fix tablespace command
2013-08-11 14:27:42 +01:00
ae19315b4d
Support index_together during model creation
2013-08-11 14:23:31 +01:00
21be9fef7b
Stop being overcautious about Field.rel
2013-08-11 00:01:30 +01:00
7702819441
Update get_constraints with better comments
2013-08-10 23:58:12 +01:00
d5a7a3d6a8
Add clarifying comment
2013-08-10 21:04:59 +01:00
3f1f91f155
Print all bad apps passed to makemigrations, not just the first one.
2013-08-10 20:02:55 +01:00
7970d97a70
Docs tweaks (thanks timgraham)
2013-08-10 20:00:12 +01:00
3c3d308ea3
Back SortedSet onto OrderedDict, rename it, and a few typo fixes
2013-08-10 19:50:06 +01:00
00d23a13eb
Fixed #20828 -- Allowed @permission_required to take a list of permissions
...
Thanks Giggaflop for the suggestion.
2013-08-10 10:10:18 -04:00
db0779dbe1
Merge pull request #1447 from evansd/patch-1
...
Use `usegmt` flag in formatdate
2013-08-09 12:18:56 -07:00
f093646bfc
Remove pointless comment.
2013-08-09 17:47:13 +01:00
9b4a789eef
Add [y/n] to autodetector questions and allow for default value
2013-08-09 17:45:19 +01:00
ae96ad872f
Remove pointless fetch_results param
2013-08-09 17:42:56 +01:00
fb16ee5a31
Remove commented-out print
2013-08-09 17:41:39 +01:00
b3cec920a2
Remove other color_style override
2013-08-09 17:39:07 +01:00
9f73629420
utils.importlib is deprecated
2013-08-09 17:36:16 +01:00
679627660f
Remove useless override of self.style
2013-08-09 17:34:35 +01:00
0cac4fbf69
Fixed #18356 -- Gave the test client signals.template_rendered call a unique dispatch_uid
...
This prevents the test client context from being lost when the client
is used in a nested fashion.
2013-08-09 12:22:42 -04:00
453915bb12
SQLite test fix -- refs #9057
2013-08-09 10:57:25 -04:00
588b523233
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
django/db/models/options.py
2013-08-09 14:37:37 +01:00
ddae74b64c
Fixed #9057 -- Added default_permissions model meta option.
...
Thanks hvendelbo for the suggestion and koenb for the draft patch.
2013-08-09 09:19:52 -04:00
de64c4d6e9
Merge remote-tracking branch 'core/master' into schema-alteration
...
Conflicts:
django/core/management/commands/flush.py
django/core/management/commands/syncdb.py
django/db/models/loading.py
docs/internals/deprecation.txt
docs/ref/django-admin.txt
docs/releases/1.7.txt
2013-08-09 14:17:30 +01:00
9c711ee3a6
Fixed test failures on Python 3 - refs #12288
2013-08-09 09:12:15 -04:00
Andrew Godwin
Tim Graham
Lukasz Balcerzak
Rainer Koirikivi
Anssi Kääriäinen
Dima Kurguzov
Claude Paroz
Ramiro Morales
Florian Apolloner
Simon Charette
Alex Gaynor
Nick Bruun
Harm Geerts
Alasdair Nicol
Jonathan Slenders
SusanTan
Krzysztof Jurewicz
Matt Johnson
Jacob Kaplan-Moss
Loic Bistuer
Mel Collins
ersran9
Bojan Mihelac