summaryrefslogtreecommitdiff
path: root/django/db/models
AgeCommit message (Collapse)Author
2008-07-27Fixed #7913 -- Corrected backwards incompatible parts of [7977] when ↵Russell Keith-Magee
optgroup handling was added to field choices (Ticket #4412). Thanks to Michael Elsdorfer (miracle2k) for the report and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8102 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-27Fixed #7778 -- Fixed a tricky case of foreign key clearing with inheritedMalcolm Tredinnick
models. Patch from James Murty. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8100 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-27Fixed #7530, #7716 -- When using select_related() and encountering a NULLMalcolm Tredinnick
related object, populate the attribute correctly. Patch from Bastien Kleineidam. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8098 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-23Allow for matches against unsaved objects in querysets (which will thereforeMalcolm Tredinnick
match nothing). This allows for some more straightforward code in the admin interface. Fixed #7488 (all the debugging there was done by Brian Rosner, who narrowed it down to the item in this patch). git-svn-id: http://code.djangoproject.com/svn/django/trunk@8061 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-22Fixed #7813 -- Allow pickling of Query classes that use select_related().Malcolm Tredinnick
Based on a patch from Justin Bronn. The test in this patch most likely breaks on Oracle. That's another issue. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8053 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-22Fixed #7791 -- Fixed a really silly error I introduced in [7926]. :-(Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@8052 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-22To ensure that a model BooleanField has an explicit value set (and since it'sMalcolm Tredinnick
not required, by default), set the default properly in the constructor. This code can be simplified when/if we resolve the BooleanField/NullBooleanField overlap, but the current stuff is backwards compatible. This would previously cause SQL errors on PostgreSQL and interesting failures in subtle ways on MySQL and SQLite. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8050 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-22Fixed #7848 -- Removed a bunch of code that wasn't contributing to society. ↵Adrian Holovaty
Thanks, julien git-svn-id: http://code.djangoproject.com/svn/django/trunk@8047 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-22Fixed #7847 -- Removed a whole bunch of unused imports from throughout the ↵Adrian Holovaty
codebase. Thanks, julien git-svn-id: http://code.djangoproject.com/svn/django/trunk@8046 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-22Fixed #6755: model inheritance now works in the admin. Thanks, sloonz and ↵Jacob Kaplan-Moss
Michael Placentra. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8033 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-21FIxed #7666: use a bare queryset when accessing single related objects so ↵Jacob Kaplan-Moss
that the related objects never become inaccessible. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-20Fixed #6450 -- Improved the checking of errors when creating the directories ↵Russell Keith-Magee
for saved files. Thanks to henry@precheur.org for the report and patch, and vung for the excellent test case. git-svn-id: http://code.djangoproject.com/svn/django/trunk@8007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19Reverted [7986].Malcolm Tredinnick
It turns out that we need to treat filename creation/display (in particular, the upload_to path) differently depending upon whether the value is out of the database or provided by other code and there's no reliable way to determine that at the moment (although some later proposed changes might alter that). So calling get_FIELD_filename on an unsaved model with a changed file attribute will not necessarily return the same result as after the save(). Refs #5619. Fixed #7843. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19Fixed #5619 -- Return the same path in get_FOO_filename() before and after aMalcolm Tredinnick
model is saved (i.e. make sure the upload prefix is prepended in both cases). Patch from wreese@gmail.com. Tests from Leah Culver. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19Fixed #4412 -- Added support for optgroups, both in the model when defining ↵Russell Keith-Magee
choices, and in the form field and widgets when the optgroups are displayed. Thanks to Matt McClanahan <cardinal@dodds.net>, Tai Lee <real.human@mrmachine.net> and SmileyChris for their contributions at various stages in the life of this ticket. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7977 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-19Fixed #7741: django.newforms is now django.forms. This is obviously a ↵Jacob Kaplan-Moss
backwards-incompatible change. There's a warning upon import of django.newforms itself, but deeper imports will raise errors. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18Merged the newforms-admin branch into trunk.Brian Rosner
This is a backward incompatible change. The admin contrib app has been refactored. The newforms module has several improvements including FormSets and Media definitions. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18Fixed #7816 -- Fixed error in a few DeprecationWarnings. Thanks, leahculverAdrian Holovaty
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18Fixed #7805 -- Removed ImageField.get_internal_type() because it doesn't ↵Adrian Holovaty
offer anything beyond FileField's implementation. Thanks, Gulopine git-svn-id: http://code.djangoproject.com/svn/django/trunk@7947 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-18Fixed #1443 -- Django's various bits now support dates before 1900. Thanks ↵Adrian Holovaty
to SmileyChris, Chris Green, Fredrik Lundh and others for patches and design help git-svn-id: http://code.djangoproject.com/svn/django/trunk@7946 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-16Fixed #7759 -- Fixed QuerySet.count() when the results cache was only partiallyMalcolm Tredinnick
populated. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7938 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-15Fixed #7411 -- worked around some possible transaction conflicts in SQLite.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-13Re-organized imports, removing a couple that were unused.Gary Wilson Jr
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7912 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-13Added a docstring to CyclicDependency exception class.Gary Wilson Jr
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-12Fixed #7734 -- Fixed a Python 2.3 compatibility problem.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7910 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-12Fixed #7667: fixied FileField.save_file for inline related objects. This is ↵Jacob Kaplan-Moss
really just papering over a bigger problem that should get fixed either by newforms-admin or the file-storage refactoring, but this fix makes the admin work until either of those things happen. Thanks, oggy. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7906 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-12Fixed a bozo bug from [7885]. Fixed #7698.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7901 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-11Removed a FIXME that isn't really a problem any longer.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7886 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-11Fixed #7698 -- Handle '0' correctly when used as the upper bound of a slice.Malcolm Tredinnick
Based on a patch from enoksrd. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7885 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-11Fixed #7448 -- Convert "in" filters to pass in the correct values for datetimesMalcolm Tredinnick
and similar complex objects. Based on patches from cgrady and alexkosholev. Refs #7707. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7883 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-11Fixed #7682 -- Added a work around to keep existing admin alive untilMalcolm Tredinnick
newforms-admin merges (to handle changes in [7790]). This code becomes irrelevant in a non-oldforms world, so even if it's not quite correct, it will do for now. Based on a patch from puyb@puyb.net and Karen Tracey. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7882 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-08Fixed a couple typos as well as several minor style issues.Gary Wilson Jr
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7871 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-07Fixed #7614: the quickening has come, and there now is only one ↵Jacob Kaplan-Moss
UploadedFile. On top of that, UploadedFile's interface has been improved: * The API now more closely matches a proper file API. This unfortunately means a few backwards-incompatible renamings; see BackwardsIncompatibleChanges. This refs #7593. * While we were at it, renamed chunk() to chunks() to clarify that it's an iterator. * Temporary uploaded files now property use the tempfile library behind the scenes which should ensure better cleanup of tempfiles (refs #7593 again). Thanks to Mike Axiak for the bulk of this patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7859 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-06Fixed #7621 -- Enable superclassing of the various metaclasses we use.Malcolm Tredinnick
Also tidy up some initialisation code in django.db.models.base.ModelBase. Thanks, Christian Tanzer. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7846 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-04Redo the changes in [7773] in a better way.Malcolm Tredinnick
This removes some of the leaky abstraction problems (lifting WhereNode internals into the Query class) from that commit and makes it possible for extensions to WhereNode to have access to the field instances. It's also backwards-compatible with pre-[7773] code, which is also better. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-01Fixed #2070: refactored Django's file upload capabilities.Jacob Kaplan-Moss
A description of the new features can be found in the new [http://www.djangoproject.com/documentation/upload_handing/ upload handling documentation]; the executive summary is that Django will now happily handle uploads of large files without issues. This changes the representation of uploaded files from dictionaries to bona fide objects; see BackwardsIncompatibleChanges for details. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-07-01Modified [7760] to not include a "col is not NULL" fragment for non-nullable ↵Malcolm Tredinnick
fields. This avoids any use of "pk is not NULL" fragment, which behave inconsistently in MySQL. Thanks to Russell Keith-Magee for diagnosing the problem and suggesting the easy fix. Refs #7076. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-30Fixed #4485 -- Allow nullable DecimalFields to store NULLs.Malcolm Tredinnick
Based on a patch from tdterry. Thanks. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-30Fixed #7156 -- Normalise file paths before returning them in models.Malcolm Tredinnick
This avoids problems with a database that was created on Unix being used on Windows and giving interesting results. Patch from fcaprioli@alice.it. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-30Fixed #7033 -- Removed an unused field.Malcolm Tredinnick
OrderingField was added in the magic-removal branch to support something that never ultimately materialised, but it wasn't removed. So this is backwards-incompatible if you're using this field that has no purpose, I guess. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-30Fixed #7314 -- Changed the way extra() bits are handled when QuerySets are ↵Malcolm Tredinnick
merged. Also added a section to the documentation to indicate why it's probably not a good idea to rely on this feature for complex stuff. Garbage in, garbage out applies even to Django code. Thanks to erik for the test case for this one. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-30Make sure we only create the minimum number of table indexes for MySQL.Malcolm Tredinnick
This patch simplifies a bunch of code for all backends and removes some duplicate index creation for MySQL, in particular (versions 4.x and later). Patch from Nis Jørgensen. Fixed #5671, #5680, #7170, #7186. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7790 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-29A way better fix for the count() issue in [7787].Malcolm Tredinnick
The first attempt was brain-damaged. Let's never speak of it again. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7788 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-29Fixed #7323 -- Fixed a count() edge-case.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-29Fixed #7371 -- Fixed an edge case when ordering on related models.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-29Fixed #7378 -- Use the "to_field" where appropriate on reverse relations.Malcolm Tredinnick
Patch from mturtle@gmail.com. The remaining uses of "%s__pk" in fields/related.py all look safe, since they are for many-to-many fields, which doesn't take "to_field" as a parameter. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7785 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-29Fixed #7276 -- Delete multi-table objects correctly.Malcolm Tredinnick
When model inheritance is used, the parent objects should be deleted as part of the delete() call on the child. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7784 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-29Factored out a semi-complex if-test that was used in two places.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-29Fixed #7246 -- Pull in the all the necessary data when using ↵Malcolm Tredinnick
select_related() with multi-table inheritance. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-06-29Fixed handling of multiple fields in a model pointing to the same related model.Malcolm Tredinnick
Thanks to ElliotM, mk and oyvind for some excellent test cases for this. Fixed #7110, #7125. git-svn-id: http://code.djangoproject.com/svn/django/trunk@7778 bcc190cf-cafb-0310-a4f2-bffc1f526a37