Commit Graph

388 Commits

Author SHA1 Message Date
Karen Tracey eca89ea9be [1.1.X] Fixed #12142 -- EmptyQuerySet.update() no longer updates all rows in the database
r12171 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12960 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-12 17:27:53 +00:00
Luke Plant 0819c291e7 Fixed test failure that was occurring since r12909
The tests were relying on being able to do
ManyToManyField("NameOfThisModel") instead of the only documented method for
recursive relationships, namely ManyToManyField("self").  The former stopped
working when the fix in r12909 was applied.

Backport of r12932 from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-06 12:22:29 +00:00
Russell Keith-Magee 17636ef999 [1.1.X] Fixed #12247 -- Corrected the way update queries are processed when the update only refers to attributes on a base class. Thanks to jsmullyan for the report, and matiasb for the fix.
Backport of r12910 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-04-03 11:47:46 +00:00
Brian Rosner 64e4ffc932 [1.1.X] Restored pre-r10062 behavior allowing None from formfield_callback to exclude itself from the form
Backported from r12891 from trunk

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-31 08:08:29 +00:00
Russell Keith-Magee 373daf5876 [1.1.X] Modified the delete test to clean up after itself properly, so that the proxy_model_inheritance test can run without requiring manual confirmation.
Backport of r12850 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12851 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-25 17:32:52 +00:00
Russell Keith-Magee b74e6c3557 [1.1.X] Fixed #12286 -- Modified the test case added in r12828 so that it passes under Postgres.
Backport of r12846 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12847 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-25 13:15:13 +00:00
Russell Keith-Magee 6e60c8b7c0 [1.1.X] Fixed #13171 -- Corrected the field_subclassing unit test. Thanks to Gabriel Hurley for the report and patch.
Backport of r12838 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-23 14:21:14 +00:00
Karen Tracey 3a55a2f42c [1.1.X] Fixed #12286: Ensure proxied model's table is created.
Thanks to telenieko for the report and flyingfred0 for test and fix.

Test is r12828 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12829 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-21 20:35:05 +00:00
Russell Keith-Magee 9b85ef2895 [1.1.X] Added a transaction rollback needed to clean up after the test introduced by r12764.
Backport of r12788 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-15 13:00:24 +00:00
Karen Tracey c94de07570 [1.1.X] Fixed #13107: Adjusted decimal_places validation to accept 0 as a valid value. Thanks to loewis for report.
r12774 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-13 22:15:09 +00:00
Russell Keith-Magee 3f7fcdda71 [1.1.X] Fixed #12404 -- Improved model validation for CharField and DecimalField. Thanks to tiliv for the report, josh for the patch, and Leo for the tests.
Backport of r12768 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-12 15:24:28 +00:00
Russell Keith-Magee 1e1b57bfbe [1.1.X] Fixed #11900 -- Corrected an edge case of transaction handling in the commit_on_success decorator. Thanks to guettli for the report, and Gabriel Hurley for the initial test case.
Backport of r12764 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12765 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-12 14:27:31 +00:00
Luke Plant 55c71d3ed5 [1.1.X] Fixed #11940 - ModelForm evaluates callable default values on form class creation
Thanks to Harm Geerts for the report and initial patch.

Backport of [12721] from trunk


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12722 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 15:13:08 +00:00
Karen Tracey 9b2ac2ad2d [1.1.X] Made a few Python 2.3 compatibility test fixes.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-08 04:37:45 +00:00
Russell Keith-Magee 24b969d28e [1.1.X] Fixed #12876 -- Corrected a problem with recursive relations under deepcopy. Thanks to elachuni for the patch.
Backport of r12700 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12702 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-07 07:18:46 +00:00
Joseph Kocherhans 55bcc8ac30 [1.1.X] Fixed #12734. Deferred fields will now be properly converted to python when accessed. Backport of r12579 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-06 19:17:29 +00:00
Karen Tracey cc65ac9e2b [1.1.X] Fixed the files test to not care whether the names are reported as bytestrings or unicode. Refs #12898.
r12676 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12677 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-03-03 13:46:40 +00:00
Karen Tracey e0679ef165 [1.1.X] Removed more stray tabs in Python files.
Applicable parts of r12616 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12617 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-27 16:37:32 +00:00
Justin Bronn 499c715513 [1.1.X] Fixed #12608 -- No longer return inconsistent results when using values and values_list in conjunction with annotate. Thanks, Charlie Leifer.
Backport of r12505 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12613 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 17:11:58 +00:00
Russell Keith-Magee a52f1dd95c [1.1.X] Fixed #11226 -- Corrected an validation edge case with m2m relations between two models with the same class name. Thanks to pkoch for the report, and to Ramiro Morales for the patch.
Backport of r12489 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12596 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 11:12:14 +00:00
Karen Tracey 6ca3154bcd [1.1.X] Fixed a bunch of Python 2.3 incompatibilities that had crept into the 1.1.X branch.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12595 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-26 05:14:36 +00:00
Joseph Kocherhans 18c800f1a3 [1.1.X] Fixed #12152. DoesNotExist and MultipleObjectsReturned now subclass their parent model's exceptions. Backport of r12567 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12568 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-24 14:42:03 +00:00
Jacob Kaplan-Moss 778b7bcd19 [1.1.X] Fixed an unspecified ordering in the expression tests that could lead to a heisenbug.
Backport of [12553]

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12554 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-23 23:04:25 +00:00
Jacob Kaplan-Moss a9879b1438 [1.1.X] Fixed #6054: work around PIL's installation brokeness by detecting either of the two ways it can end up being installed.
Backport of [12429] from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12430 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-14 18:33:01 +00:00
Russell Keith-Magee d751f2cade [1.1.X] Fixed #12524 -- Clarified handling of pre-1000AD dates in datetime_safe (and thus, the serializers). Patch includes moving the datetime_safe tests into the utils regressiontests module. Thanks to gsf for the report and initial patch.
Backport of r12423 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 14:06:13 +00:00
Russell Keith-Magee bf11ab2b21 [1.1.X] Fixed #12011 -- Modified the test client to preserve the request scheme on a redirect. Thanks to tgardner for the report and patch.
Backport of r12419 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@12421 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2010-02-13 12:32:01 +00:00
Russell Keith-Magee d0ea8f2d4c [1.1.X] Tweaked the model_formsets test to work around a weird sorting problem between versions of Postgres. Thanks to Alex Gaynor for the report.
Backport of r11953 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 15:57:45 +00:00
Russell Keith-Magee 7d6213e0aa [1.1.X] Fixed #11936 -- Removed deferred models from the list returned by the app_cache. Thanks to ryszard for the report, and clamothe for the initial patch.
Backport of r11938 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-22 11:20:43 +00:00
Luke Plant c81f1da152 [1.1.X] Fixed #6961 - loaddata fails if models is a package instead of a module
Thanks to pmd for report, zhaoz, mmalone and justinlilly for patch

Backport of 11914 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-19 15:27:50 +00:00
Russell Keith-Magee 45bc45eac2 [1.1.X] Cleaned up some stray text in the test from r11874. Thanks to Rob Hudson for the eagle eyes.
Backport of r11876 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11877 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-16 15:16:21 +00:00
Russell Keith-Magee 632a0e9a8d [1.1.X] Fixed #10263 -- Added a queryset argument to BaseInlineFormSet, normalizing with BaseModelFormSet, and allowing for custom ordering/subsets in inlines. Thanks to Paulo Scardine for the patch.
Backport of r11874 from trunk.

git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11875 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-16 14:53:42 +00:00
Karen Tracey 31618e3ea4 [1.1.X] Fixed #11632: Fixed a test broken by r11827 that relied on the exact (invalid HTML) id of an initial hidden input field.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11836 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-12-12 20:55:46 +00:00
Russell Keith-Magee a2c7fe52a8 [1.1.X] Fixed #11886 -- Corrected handling of F() expressions that use parentheses. Thanks to Brent Hagany for the report.
Merge of r11581 from trunk.


git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@11582 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-09-16 12:12:54 +00:00
Karen Tracey e6e96d871d Fix the expressions modeltest to work on Pythons earlier than 2.5.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11423 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-08-09 15:44:09 +00:00
Russell Keith-Magee b2f72fc040 Fixed #11527 -- Added unit tests and documentation for the use of F() expressions in single object updates. Thanks to Zachary Voase for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11322 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-07-24 13:38:36 +00:00
Russell Keith-Magee e522e61a80 Fixed #11392 -- Enforced a predictable result order for a couple of test cases. Thanks to Nathan Auch for the report and patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11119 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-29 12:29:48 +00:00
Russell Keith-Magee b38cf5db5c Fixed #11311 -- Reverted [10952], Refs #10785. Changeset [10952] caused problems with m2m relations between models that had non-integer primary keys. Thanks to Ronny for the report and test case.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@11007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-15 11:47:01 +00:00
Russell Keith-Magee 031385e4cc Fixed #11194 -- Corrected loading of Proxy models from fixtures (and, by extension, save_base(raw=True) for Proxy models).
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-08 13:35:39 +00:00
Russell Keith-Magee 81aedbd157 Fixed #10672 -- Altered save_base to ensure that proxy models send a post_save signal.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10954 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-08 13:04:22 +00:00
Russell Keith-Magee 6cd37e0a1f Fixed #10785 -- Corrected a case for foreign key lookup where the related object is a custom primary key. Thanks to Alex Gaynor for the patch.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-08 04:50:24 +00:00
Russell Keith-Magee 512ee0f528 Fixed #10572 -- Corrected the operation of the defer() and only() clauses when used on inherited models.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-06-06 06:14:05 +00:00
Gary Wilson Jr d89ba464dd Changes to `ImageFileDescriptor` and `ImageField` to fix a few cases of setting image dimension fields.
* Moved dimension field update logic out of `ImageFileDescriptor.__set__` and into its own method on `ImageField`.
 * New `ImageField.update_dimension_fields` method is attached to model instance's `post_init` signal so that:
   * Dimension fields are set when defined before the ImageField.
   * Dimension fields are set when the field is assigned in the model constructor (fixes #11196), but only if the dimension fields don't already have values, so we avoid updating the dimensions every time an object is loaded from the database (fixes #11084).
 * Clear dimension fields when the ImageField is set to None, which also causes dimension fields to be cleared when `ImageFieldFile.delete()` is used.
 * Added many more tests for ImageField that test edge cases we weren't testing before, and moved the ImageField tests out of `file_storage` and into their own module within `model_fields`.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@10858 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-28 05:46:09 +00:00
Jacob Kaplan-Moss c935d7ffe3 Fixed #11134: signals recievers that disconnect during their processing no longer mess things up for other handlers. Thanks, Honza Kral.
While I was at it I also cleaned up the formatting of the docstrings a bit.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10831 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-20 16:13:55 +00:00
Russell Keith-Magee 2e24596001 Fixed #11116 -- Corrected the deletion of proxy objects. Thanks to Samuel Adam for the fix.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10824 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-19 13:42:38 +00:00
Russell Keith-Magee b9b9ca334e Fixed #9308 -- Corrected the updated of nullable foreign key fields when deleting objects. Thanks to Bob Thomas for the fix, and markshep for the improvements on the test case.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10822 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-19 12:44:17 +00:00
Karen Tracey 50745cc31e Fixed #11066 -- Corrected 15 duplicate "the"s found in docs and code comments. Thanks kaikuehne.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-17 16:45:28 +00:00
Jacob Kaplan-Moss baaf29895c Fixed #10953, #10955: proxies of proxies now work correctly, though I still don't quite understand why you'd want to do such a thing. Thanks, Armin Ronacher.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10738 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-11 10:10:03 +00:00
Jacob Kaplan-Moss 2b0903b2c4 Fixed #10404: ImageField height_field and width_field options no longer depend on putting the image field after the height/width fields as they did after r9766.
This bug actually exposed a related handful of inconsistancies in the underlying file handling and wraping, so a few related changes are in here as well:

    * Dimensions are also now calculated the moment the image is assigned to the field instead of upon save.
    * The base `File` object now when possible delegates its closed attribute down to the os-level file it wrapps.
    * In-memory files' `close()` now is a no-op. Without this certain APIs that should be able to handle in-memory files were failing.
    * Accessing `FieldFile.closed` used to open the file. That's silly, and it doesn't any more.
    * Some over-eager error handling was squishing some errors that would normally be raised. One unit test was incorrectly depending on this behavior, so the test was removed.

Thanks to Armin Ronacher for much of this work.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10737 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-11 09:57:19 +00:00
Jacob Kaplan-Moss 68a890e79f Fixed #7712, #9404, #10249, #10300: a light refactor and cleanup of file storage and the `File` object. Thanks to Armin Ronacher and Alex Gaynor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10717 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-08 15:08:09 +00:00
Jacob Kaplan-Moss 7caf21aa2e Make sure that all uses of max_length in the test suite use values smaller than 255. If we use max_length > 255 the test suite can't be run on MySQL 4.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10697 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-05-07 18:06:22 +00:00