mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity
7,213 Commits 30 Branches 460 Tags
50f5673c98ead853b200d9b930b5275e63838e2d
Commit Graph

974 Commits

Author SHA1 Message Date
Alex Gaynor
b4e069fab4 [soc2009/multidb] Fixed running the admin_scripts tests under sqlite without having DATABASE_NAME set 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11078 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-19 01:09:21 +00:00
Alex Gaynor
903ff126b0 [soc2009/multidb] Added tests to ensure that objects aren't being created before they are supposed to be, which would indicate we weren't creating objects in the right DB. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11076 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-19 00:29:18 +00:00
Alex Gaynor
4f461542b5 [soc2009/multidb] Ensure that when a QuerySet is given a Query object in its construct that we correct the detect the connection that is being used 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11073 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 17:31:36 +00:00
Alex Gaynor
bc3cd5d952 [soc2009/multidb] Merged up to trunk r11068 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11071 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 17:03:52 +00:00
Alex Gaynor
f6db1dd357 [soc2009/multidb] Merged up to trunk r11009 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11011 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-16 01:36:05 +00:00
Alex Gaynor
83df1f1056 [soc2009/multidb] Merged up to trunk r10973. Resolved merge conflicts 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-10 23:30:30 +00:00
Alex Gaynor
1653ffb571 [soc2009/multidb] Updated DateQuery to work correctly with multiple databases 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-07 23:56:42 +00:00
Alex Gaynor
f57bc92842 [soc2009/multidb] Merged upto trunk r10941 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-07 23:42:26 +00:00
Alex Gaynor
4d6c6d0596 [soc2009/multidb] Fixed the usage of the connection during Query construction, and defer it until actual SQL construction. In practice this means the GROUP BY optimization we do will be correctly applied based on the connection the Query is executed against, as oppossed to the on the QuerySet is targeting at the time the GROUP BY items are added 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-06 19:38:29 +00:00
Alex Gaynor
6aca03c24d [soc2009/multidb] Merged up to trunk r10931. Resolved the slight merge conflict 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-06 18:01:43 +00:00
Alex Gaynor
91520ec364 [soc2009/multidb] Made filter SQL generation lazy when we aren't filtering on a specific field, also added additional tests 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-04 16:53:45 +00:00
Alex Gaynor
fbb6fda5f6 [soc2009/multidb] Fixed the usage of using() on QuerySets in conjuction with create(), added tests for this 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-04 16:13:14 +00:00
Alex Gaynor
2f2cfac142 [soc2009/multidb] Merged multidb up to trunk r10914 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 19:13:11 +00:00
Alex Gaynor
23da5c0ac1 [soc2009/multidb] Bring this branch up to date with my external work. This means implementing the using method on querysets as well as a using kwarg on save and delete, plus many internal changes to facilitae this 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10904 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 02:37:33 +00:00
Alex Gaynor
9286db5145 [soc2009/multidb] Updated the test runner to support syncing all the databases django knows about so that tests can operate against more than one database 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10895 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 02:13:01 +00:00
Alex Gaynor
bce55b1aa8 [soc2009/multidb] Implemented a connections object that is responsible for tracking multiple database connections and lazily instantiating them. Also implemneted the DATABASES setting which replaces the various DATABASE_* settings 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 01:58:33 +00:00
Alex Gaynor
4cd29f2520 [soc2009/multidb] Merged up to trunk r10865 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10887 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-02 02:46:02 +00:00
Russell Keith-Magee
4567b44909 Modified a test from r10787 so that the comparison order is reliable. Thanks to Alex Gaynor and Tom Tobin for the report via IRC. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10828 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-20 00:19:13 +00:00
Karen Tracey
8c8625bde3 Fixed #11149 -- Don't call save_form_data on file-type fields multiple times when saving a model form. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10826 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-19 23:13:33 +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
Matt Boersma
56f3ed7f54 Fixed import statement in admin_views test to work with Python 2.3. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10789 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-15 15:01:40 +00:00
Russell Keith-Magee
a00be66311 Fixed #11120 -- Corrected handling of inlines attached to inherited classes, broken by r10756. Thanks to George Song and Michael Strickland for the simultaneous reports. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-15 12:44:51 +00:00
James Bennett
bcb0d124b4 Corrected tests from [10784]; instead of retrieving two comments, it was retrieving one comment twice. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10785 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-15 02:54:55 +00:00
Jacob Kaplan-Moss
d246401552 Fixed #11113: fixed a couple of issues that slipped through the cracks when comment moderation was added to django.contrib.comments. 
The is a potentially backwards-incompatible change for users already relying on the internals of comment moderaration. To wit:

   * The moderation system now listens to the new `comment_will_be_posted`/`comment_was_posted` signals instead of `pre/post_save`. This means that import request-based information is available to moderation as it should be.
   * Some experimental code from `django.contrib.comments.moderation` has been removed. It was never intended to be merged into Django, and was completely untested and likely buggy.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10784 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-14 15:20:50 +00:00
Jacob Kaplan-Moss
3da3716252 Fixed #10348: ChangeList no longer overwrites a select_related provided by ModelAdmin.queryset(). 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-14 15:09:33 +00:00
Jacob Kaplan-Moss
e508bfd27f Fixed #10992: fixed a bug saving inlines with custom primary key fields. Thanks, Zain. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-14 02:23:53 +00:00
Russell Keith-Magee
7215ffe8a4 Fixed #10243, #11043 -- Corrected handling of formsets over a ForeignKey that uses to_field, and by extension, fixed the admin for handling fields of that type. Thanks to apollo13 for the initial patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10756 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-13 14:04:29 +00:00
Jacob Kaplan-Moss
d20a0834ac Fixed #9751: admin scripts now calculate the project directory correctly when the settings module is a directory with an `__init__.py`. Thanks to Eric Holscher. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10751 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-12 21:45:03 +00:00
Karen Tracey
14a6f6cf9a Fixed #11032: close() a file explictly open()'d in a test, so that deleting the file tree it is in doesn't fail on Windows. Thanks bthomas for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10741 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-11 16:13:29 +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
Russell Keith-Magee
8c2db4ab0f Fixed #10906 -- Added a check for PostgreSQL pre 8.2 when using StdDev/Variance aggregates. Thanks to Richard Davies for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10731 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-10 09:22:53 +00:00
Russell Keith-Magee
b97178f7ec Fixed #10842 -- Corrected parsing of version numbers for PostgreSQL 8.4beta series. Thanks to hgdeoro for the report and fix. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10730 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-10 09:22:06 +00:00
Russell Keith-Magee
5663258de1 Fixed #10792 -- Ensured that ModelChoiceFields don't provide an empty option when the underlying field has blank=False and there is a default value available. Thanks to carljm for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-10 07:44:27 +00:00
Russell Keith-Magee
2c2871b7c3 Fixed #11042 -- Corrected admin inlines for inherited models. Thanks to jsmullyan for the report, and mir for helpful triage work. Patch includes regression test for #8093, and a commented out test for #10992. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10725 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-09 11:40:13 +00:00
Jacob Kaplan-Moss
c40f715257 Fixed #10687: fixed request parsing when upload_handlers is empty. Thanks, Armin Ronacher. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10723 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 17:22:34 +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
2af75b485d Fixed #10825: fixed the 'U' format code to dateformat (and the date/now filter/tag). Thanks to gsong and mir. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 13:39:37 +00:00
Jacob Kaplan-Moss
23fa913676 Fixed #10448: correcting errors on "save as new" now correctly create a new object instead of modifying the old one. Thanks, bastih. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 12:53:14 +00:00
Jacob Kaplan-Moss
155ab07a5d Fixed #10188: prevent newlines in HTTP headers. Thanks, bthomas. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10711 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 11:15:23 +00:00
Jacob Kaplan-Moss
a7faf6424a Fixed #8817: get_image_dimensions correctly closes the files it opens, and leaves open the ones it doesn't. Thanks, mitsuhiko. 
While I was at it, I converted the file_storage doctests to unit tests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10707 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 10:56:51 +00:00
Jacob Kaplan-Moss
614d881450 Fixed #10750: respect comment=False in inline formsets. Thanks, Koen Biermans. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10706 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 09:59:46 +00:00
Gary Wilson Jr
59507753c7 Fixed #9610 -- Fixed duplicate uploaded file name mangling when directory contained a dot and file didn't. Based on patches from fadlytabrani and adurdin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10701 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 05:50:31 +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
Jacob Kaplan-Moss
fb9ac5729d Fixed #10153: foreign key gte and lte lookups now work. Thanks, joelhooks and adurdin. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10692 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-07 16:12:08 +00:00
Jacob Kaplan-Moss
bfdb7d26aa Fixed #9659: fixed wsgi.file_wrapper in the builtin server. Thanks, mitsuhiko. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10690 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-07 15:39:06 +00:00
Matt Boersma
523da3801d Fixed test suite on Oracle that was broken by using keyword "date" as a field name. Refs #4140 and #10422. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10689 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-07 14:48:04 +00:00
Russell Keith-Magee
ae7d9bfad2 Fixed #10899 -- Ensured that log messages for deletions in the admin contain useful descriptions. Thanks to Jeremy Dunck for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10686 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-07 13:10:59 +00:00
Russell Keith-Magee
b5f0aff922 Fixed #10516 -- Corrected admin search when the search_fields definition contains multiple fields on the same base model. Thanks to Zain Memon for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10684 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-07 12:52:43 +00:00
Russell Keith-Magee
eb81d5acb3 Fixed #10893 -- Corrected a problem with using list_editable in the admin when the model has a manual primary key. Thanks to Alex Gaynor for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10681 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-07 11:56:10 +00:00
Russell Keith-Magee
9d28568cb4 Fixed #10275 -- Corrected the edge case of rendering a LogEntry with a contenttype of None. Thanks to Jarek Zgoda for the report, and Peter Bengtsson for the patch 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10675 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-05 11:52:03 +00:00