1
0
mirror of https://github.com/django/django.git synced 2024-12-27 19:46:22 +00:00
Commit Graph

10783 Commits

Author SHA1 Message Date
Malcolm Tredinnick
c3a0dcf6e9 Added convenience method for viewing Query SQL without params.
This is the old Query.as_sql() method revived: it's like Query.__str__,
but the parameters aren't substituted into the placeholders. Thus, it's
a more accurate representation of the SQL the (default) backend will
see. Entirely internal.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 03:38:28 +00:00
Malcolm Tredinnick
0686c6b0ee Add the ability to do unordered comparisons in assertQuerysetEqual.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16654 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 03:38:18 +00:00
Russell Keith-Magee
2664fa1896 Fixed #15838 -- Promoted assertFieldOutput to a general test utility. Thanks to Ramiro Morales for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16653 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 02:32:37 +00:00
Julien Phalip
46ef2983ba Added myself to the list of committers.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16652 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 01:41:47 +00:00
Russell Keith-Magee
d310f91ee7 Fixed #10571 -- Factored out the payload encoding code to make sure it is used for PUT requests. Thanks to kennu for the report, pterk for the patch, and wildfire for the review comments.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16651 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 00:52:45 +00:00
Russell Keith-Magee
0f767f9a99 Fixed #16672 -- Ensure that test classes decorated with @override_setings gets the right name when running the tests. Thanks to Julien Phalip for the report and initial patch
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16650 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-23 00:32:35 +00:00
Malcolm Tredinnick
b9244cfb89 Silenced a "classic division" warning in floatformat template filter.
Fixes #16514. Thanks, Mike Blume.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16649 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 08:06:52 +00:00
Russell Keith-Magee
3afe409d0e Fixed #14876 -- Ensure that join promotion works correctly when there are nullable related fields. Thanks to simonpercivall for the report, oinopion and Aleksandra Sendecka for the original patch, and to Malcolm for helping me wrestle the edge cases to the ground.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16648 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 07:40:12 +00:00
Malcolm Tredinnick
5edf1aabc2 Minor Debian/Ubuntu install instruction update.
This is all a bit of a mess (and fragile and mostly their own fault),
but this at least gives people a clue. Fixes #16287. Patch from
bpeschier.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16647 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 07:36:42 +00:00
Malcolm Tredinnick
f77666a4af Documented some Oracle-specific test settings.
Patch from aaugustin that should help people with specific testing
requirements for Oracle set things up in their preferred way. The
settings have always existed, but now they are documented.

Fixes #16478.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16646 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 06:35:52 +00:00
Malcolm Tredinnick
5994a7442d Trivial documentation typo fix.
Fixed #16545. Thanks, Audrey Roy.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16645 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 06:30:42 +00:00
Malcolm Tredinnick
549faf19bf Improved documentation around HTTP server meta variables.
Fixed #16581, with thanks to Bernhard Essl.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16644 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 04:27:36 +00:00
Paul McMillan
11cc26681b Added myself to the committers list
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16643 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 03:37:37 +00:00
Malcolm Tredinnick
a524114883 Removed unused admin Javascript functions from source.
Fixed #16204. Thanks, melinath.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16642 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 02:52:20 +00:00
Malcolm Tredinnick
8560a2c080 Teach inspectdb to handle SQL column names that are digits.
There's no accounting for taste in the way some people name columns,
apparently. Create a column with a name of "1" and inspectdb will still
produce valid Python code now. Fixed #16536. Thanks tereaom and
danodonovan.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16641 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 02:46:59 +00:00
Malcolm Tredinnick
e3cd0e6710 Typo fix in class-based view documentation.
Fixed #16666. Thanks saebyn.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16640 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 02:03:50 +00:00
Malcolm Tredinnick
1f233b479a Made documentation of ManyToManyField placement clearer (kind of).
Inspired by ticket #16661.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16639 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 01:07:19 +00:00
Malcolm Tredinnick
c471d471bf Improved error message display during validation errors.
When reporting a validation error (during model validation or fixture
loading, for example), the error messages now report the bad value as
well as the expected type. This can make identifying the offending field
and problem a bit easier.

Fixed #11595. Patch from raulcd and wildfire with supervision from
Russell.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16638 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 00:48:53 +00:00
Malcolm Tredinnick
d661cc5e3a Pre-formatted text wrapping change in technical debug page.
In (typically rare) cases, a very long exception line can appear that
requires horiztonal scrolling in the cut-and-paste exception layout box.
To make this fractionally more readable, we pre-wrap the text now.

Fixes #16331, based on a patch from Trinh Hai-Anh.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16637 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-22 00:12:51 +00:00
Ramiro Morales
4df45418f2 Fixed #16644 -- Fixed one additional test that was failing in Oracle due to false assumptions about the primary keys of objects. Thanks Aymeric Augustin for report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16636 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-21 18:09:08 +00:00
Ramiro Morales
2d51abfeb5 Fixed #16481 -- Adapted one raw SQL query in cull immplementation of the database-based cache backend so it works with Oracle. Thanks Aymeric Augustin for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16635 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-21 17:19:35 +00:00
James Bennett
cdd44dca45 Update my committer bio since I work somewhere else now.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16634 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-21 15:45:09 +00:00
Timo Graham
24a45a5fda Fixed #16602 - Added forms.widgets TOC links to docs; thanks kencochrane.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16633 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-21 11:51:48 +00:00
Timo Graham
ec530b1425 Fixed #16610 - Added more docs for template contexts in contrib.auth views; thanks Elvard!
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16632 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-21 10:37:02 +00:00
Timo Graham
c673bd1c4b Fixed #16654 - Syntax error in reverse() example; thanks jedie.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16630 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-20 19:27:58 +00:00
Timo Graham
2ac0b97d43 Fixed #16595 - Add pop() to session docs; thanks wilfred.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16628 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-20 19:22:34 +00:00
Gabriel Hurley
920d01edb7 Fixed #16660 -- Corrected a typo and removed an extra space in the GeoDjango tutorial. Thanks to spahn for the report.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16627 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-19 18:18:06 +00:00
Gabriel Hurley
40c8a603c3 Fixed #16591 -- Fixed some mismatched variable names in a widgets reference example. Thanks to santi.romero, el barto, and julien.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16626 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-18 22:39:20 +00:00
Gabriel Hurley
41b31b4d09 Fixed #16608 -- Clarified the description of the destroy_test_db method and cleaned up various other reST/Sphinx-related bits in the testing docs. Thanks to Stan for the report and Julien for the draft patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16625 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-18 22:31:32 +00:00
Gabriel Hurley
b825680df8 Fixed #16152 -- Added Sybase Advantage Database Server to the 3rd-party database backend list. Thanks to Mike Hagman and melinath.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16624 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-18 21:57:57 +00:00
Gabriel Hurley
bdd1409eea Fixed #16467 -- Restored a previously correct example which was broken in [16564]. Thanks to dmclain for pointing out that the original example was correct.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16623 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-18 21:47:04 +00:00
Jannis Leidel
7d782e51c1 Fixed #8190 -- Added support for a field's help text to the tabular admin inline. Thanks, Julien Phalip and Idan Gazit.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16622 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-17 14:12:25 +00:00
Chris Beaven
0e3d8bcb26 Removing the old url resolution method in contrib.auth.admin.UserAdmin which was deprecated in Django 1.1
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16621 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-17 04:06:42 +00:00
Jannis Leidel
283526a5a6 Fixed #15206 -- Added select_related call to the permissions field of the GroupAdmin to lower the number of queries. Thanks, Chris Adams.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16620 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-15 09:01:12 +00:00
Jannis Leidel
d37e3baf62 Fixed #16523 -- Made path handling in autoreload code work on Jython. Thanks, Aymeric Augustin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16619 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-15 08:29:08 +00:00
Jannis Leidel
cfba246037 Fixed #16631 -- Fixed embarrassing typo introduced in r16617. Thanks, Andi Albrecht.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16618 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-15 08:22:22 +00:00
Jannis Leidel
2980f2ab9a Fixed #16629 -- Relaxed check for STATIC_ROOT and STATIC_URL settings slightly to only raise an exception if really needed.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-14 18:15:04 +00:00
Jannis Leidel
a13de6cd76 Fixed #6644 -- Fixed django.contrib.formtools tests to be better isolated when running outside of the Django test suite. Also moved around the new wizard's templates a bit to better fit the common app layout.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16616 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-13 13:51:34 +00:00
Jannis Leidel
566b3295fa Fixed #16621 -- Fixed lots of typos in the docs. Thanks, Bernhard Essl.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16615 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-13 11:58:19 +00:00
Jannis Leidel
1abafe696e Fixed #14695 -- Stopped model fields from incorrectly overwriting the field name during model initialization if it was already passed as a keyword argument. Thanks, erikrose and willhardy.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16614 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-13 11:53:42 +00:00
Jannis Leidel
c0a4c04e2a Fixed #16613 -- Fixed test for introspected foreign keys in the MySQL backend if ANSI_QUOTES SQL mode is enabled. Thanks, Stan.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-13 11:53:33 +00:00
Timo Graham
f3bf62230a Fixed #16606 - Typo in docs/ref/contrib/csrf.txt; thanks selwin.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16612 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-13 11:25:57 +00:00
Jannis Leidel
e11c647d60 Fixed #16627 -- Fixed docs build warning.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16611 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-13 11:23:13 +00:00
Ramiro Morales
326949e444 Fixed #14503 -- Unified multiple implementations of test cases assert* methods that verify a given exception is raised by a callable throughout the Django test suite.
Replaced them with a new assertRaisesMessage method of a new SimpleTestCase, a lightweight subclass of unittest.TestCase. Both are also available for usage in user tests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@16610 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-13 00:42:08 +00:00
Jannis Leidel
a539d434d9 Fixed #16573 -- Corrected a regression in the admindocs app's view overview introduced in r16405. Thanks, lopopolo.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16609 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-12 14:15:56 +00:00
Jannis Leidel
02dcbe3317 Fixed #11559 -- Fixed the URL resolver to be able to handle captured parameters in parent URLconfs when also using namespaces. Thanks, cwb, ungenio and hvdklauw.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16608 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-12 14:15:50 +00:00
Jannis Leidel
351d5da69b Fixed #4617 -- Added raise_exception option to permission_required decorator to be able to raise a PermissionDenied exception instead of redirecting to the login page.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16607 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-12 14:15:41 +00:00
Jannis Leidel
1ca6e9b9e2 Fixed #9847 -- Added 403 response handler. Many thanks to kgrandis, adamnelson, vkryachko, fvox13 and Chris Beaven.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16606 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-12 14:15:31 +00:00
Jannis Leidel
958e049d4d Fixed #5831 -- Made sure the ForNode reports the correct source of an exception happening in one of the loops. Thanks, Charmless and vladmos.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16605 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-12 14:15:17 +00:00
Jannis Leidel
1d485cf14f Fixed #10405 -- Raise a more useful error if the formfield of a related model field can't be created yet because the related model isn't loaded yet. Thanks ojii and charstring.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@16604 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2011-08-12 14:15:08 +00:00