summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2009-03-11Fixed some breakages in the test database handling from r10026.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10027 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-11Fixed #10459 -- Refactored the internals of database connection objects so ↵Adrian Holovaty
that connections know their own settings and pass around settings as dictionaries instead of passing around the Django settings module itself. This will make it easier for multiple database support. Thanks to Alex Gaynor for the initial patch. This is backwards-compatible but will likely break third-party database backends. Specific API changes are: * BaseDatabaseWrapper.__init__() now takes a settings_dict instead of a settings module. It's called settings_dict to disambiguate, and for easy grepability. This should be a dictionary containing DATABASE_NAME, etc. * BaseDatabaseWrapper has a settings_dict attribute instead of an options attribute. BaseDatabaseWrapper.options is now BaseDatabaseWrapper['DATABASE_OPTIONS'] * BaseDatabaseWrapper._cursor() no longer takes a settings argument. * BaseDatabaseClient.__init__() now takes a connection argument (a DatabaseWrapper instance) instead of no arguments. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10026 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-10Refs #10443: Added Oracle to the #10443 regression test exemption, since we ↵Ian Kelly
don't yet support it. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10024 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-10Added savepoint support to the Oracle backend, necessary per the thread at ↵Ian Kelly
http://groups.google.com/group/django-developers/browse_thread/thread/c87cf2d97478c068/ git-svn-id: http://code.djangoproject.com/svn/django/trunk@10022 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-10Fixed #9204 -- Added `GIcon` overlay, allowing customization for icons of ↵Justin Bronn
`GMarker` objects. Thanks to qingfeng for initial ticket/patch, and to prairiedogg for final implementation. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10021 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-10Removed a FIXME from the queryset-refactor days.Malcolm Tredinnick
Turns out, nothing needed to be fixed. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10018 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-10Fixed #10271, #10281 -- Fixed the handling multiple inline models that ↵Russell Keith-Magee
share a common base class and have the link to the inline parent on the base class. Includes modifications that allow the equivalent handling for GenericFields. Thanks to Idan Gazit, Antti Kaihola (akaihola), and Alex Gaynor for their work on this patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10017 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-10Fixed #10439 -- Fixed a subtle test failure caused by r9994.Malcolm Tredinnick
Thanks to Ramiro Morales for debugging what was going on here. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10015 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-10Fixed #10443 -- Fixed model attribute updating after r10003.Malcolm Tredinnick
Adding a get_db_prep_save() call to the UpdateQuery code path meant it was being called twice if you updated an existing model attribute. This change removes that double call and also makes TimeField.to_python() a little more robust for the benefit of the Oracle backend (just in case). git-svn-id: http://code.djangoproject.com/svn/django/trunk@10013 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-10Added an editorial comment to a test.Malcolm Tredinnick
This is to stop me trying to "fix" that piece of code again in the future. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10012 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-09Fixed #9955 -- Added `GoogleMapSet`, which enables multiple `GoogleMap` ↵Justin Bronn
objects to placed on the same page; moved all templates to `google` parent dir, and added 'google-map.html' for an included example. Thanks to mandric for the ticket and aromano for initial patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10011 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-09Updates German translation, fixes #10444Jannis Leidel
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10009 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-09Fixed #3163 -- Add a "Meta.managed" option to models.Malcolm Tredinnick
This allows a model to be defined which is not subject to database table creation and removal. Useful for models that sit over existing tables or database views. Thanks to Alexander Myodov, Wolfgang Kriesing and Ryan Kelly for the bulk of this patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10008 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-09Made a couple of cross-references in the model fields documentaiton consistent.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10007 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-09Fixed #9436 -- Updated docs build code to create "new in development version".Malcolm Tredinnick
Patch from Marc Fargas. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10006 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-09Changed a few versionadded doc directives from "development" to "1.1".Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10005 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-09Pass values through get_db_prep_save() in a QuerySet.update() call.Malcolm Tredinnick
This removes a long-standing FIXME in the update() handling and allows for greater flexibility in the values passed in. In particular, it brings updates into line with saves for django.contrib.gis fields, so fixed #10411. Thanks to Justin Bronn and Russell Keith-Magee for help with this patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10003 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08Fixed #10072 -- `GMarker` overlays now have `draggable` option. Thanks to ↵Justin Bronn
prairiedogg for ticket and patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@10002 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08Fixed #9626 -- Fixed a deletion race in the locmem cache.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9998 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08Fixed #9508 -- Added an appropriate FileField.__hash__ implementation.Malcolm Tredinnick
Required because we declare a custom __eq__ method. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9997 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08Fixed #9469 -- Apply the fix from r9189 to the WSGI handler as well.Malcolm Tredinnick
This is a defensive encoding fix. No functionality change for correct URLs. Patch from magneto. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9996 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08Fixed #9323 -- Allow glob loading in INSTALLED_APPS to handle digits in names.Malcolm Tredinnick
Patch from carljm. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9994 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08Fixed #9399 -- Added StopFutureHandlers to export list in file handling.Malcolm Tredinnick
Thanks, George Vilches. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9992 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08Fixed #10433: Corrected typo in test doc. Thanks Matt Doran.Karen Tracey
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9989 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-08Fixed #10432 -- Handle all kinds of iterators in queryset filters.Malcolm Tredinnick
Only consumes the iterators once and works with Python 2.3. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9986 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-07Maintenance refactor of the GDAL (OGR) ctypes interface. Changes include:Justin Bronn
* All C API method explictly called from their prototype module, no longer imported via *. * Applied DRY to C pointer management, classes that do so subclass from `GDALBase`. * `OGRGeometry`: Added `from_bbox` class method (patch from Christopher Schmidt) and `kml` property. * `SpatialReference`: Now initialize with `SetFromUserInput` (initialization is now more simple and flexible); removed duplicate methods. * `Envelope`: Added `expand_to_include` method and now allow same coordinates for lower left and upper right points. Thanks to Paul Smith for tickets and patches. * `OGRGeomType`: Now treat OGC 'Geometry' type as 'Unknown'. Fixed #9855, #10368, #10380. Refs #9806. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9985 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-06Fixed #9649 -- Better error handling in model creation.Malcolm Tredinnick
Previously, you could explicitly assign None to a non-null ForeignKey (or other) field when creating the model (Child(parent=None), etc). We now throw an exception when you do that, which matches the behaviour when you assign None to the attribute after creation. Thanks to ales.zoulek@gmail.com and ondrej.kohout@gmail.com for some analysis of this problem. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9983 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-06Fixed #6710 -- Made DATABASE_OPTIONS work with postgresql_psycopg2 backend.Malcolm Tredinnick
Thanks to rcoup for the patch. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9981 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-06Improved table join handling for comparisons against NULL.Malcolm Tredinnick
This fixes a broad class of bugs involving filters that look for missing related models and fields. Most of them don't seem to have been reported (the added tests cover the root cause). The exception is that this has also fixed #9868. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9979 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-06Fixed #10397 -- made GIS test runner compatible with changes in r9756.Justin Bronn
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9978 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-05Clarified documentation regarding Oracle's treatment of nulls and empty strings.Ian Kelly
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9976 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-04Made it explicit if you accidentally override a Field from a parent model.Malcolm Tredinnick
This was always not working reliably (model initialization and serialization were two of the problems). Now, it's an explicit error. Also, documented. Fixed #10252. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9974 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-04Fixed #10406 -- Fixed some problems with model inheritance and pk fields.Malcolm Tredinnick
Manually specifying both a OneToOneField(parent_link=True) and separate a primary key field was causing invalid SQL to be generated. Thanks to Ramiro Morales for some analysis on this one. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9971 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-04Fixed #10251 -- Fixed model inheritance when there's also an explicit pk field.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9970 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-04Fixed #10362 -- An update() that only affects a parent model no longer crashes.Malcolm Tredinnick
This includes a fairly large refactor of the update() query path (and the initial portions of constructing the SQL for any query). The previous code appears to have been only working more or less by accident and was very fragile. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9967 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-04Changed the row count value returned from update queries in some cases.Malcolm Tredinnick
If an update only affected an ancestor model (not the child), we were returning 0 for the number of rows updated. This could have been misleading if the value is used to detect an update occuring. So we now return the rowcount from the first non-trivial query that is executed (if any). Still a slight compromise, but better than what we had. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9966 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-04Changed the handling of as_sql() versus _as_sql() in Query/QuerySet from r9928.Malcolm Tredinnick
This avoids inadvertently hiding AttributeError that is raised for other reasons. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9965 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-04Fixed #10381 -- Fixed some a machine-dependent test failure after r9921.Malcolm Tredinnick
The patch is from Russell, but I'm applying it because I want my tests to pass again (and he doesn't see the failure). git-svn-id: http://code.djangoproject.com/svn/django/trunk@9964 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-03Fixed #10159 -- `F()` expressions now work on geographic fields. The tests ↵Justin Bronn
are in `relatedapp`, which has been retrofitted to work with Oracle (minus the prior offending tests). I'm back. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9963 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-03Final piece (he says, hopefully) of r9945 changes.Malcolm Tredinnick
This time, "django-admin.py diffsettings" is fixed. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9961 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-03Fixed #10395 -- Fixed more fallout from r9945.Malcolm Tredinnick
(Simultaneously, stop django.contrib.gis using some internal attribute when there's a perfectly good public property available to do the same thing.) git-svn-id: http://code.djangoproject.com/svn/django/trunk@9960 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-03Minor update to documentation for many-to-many filter() calls.Malcolm Tredinnick
Removed a potential ambiguity when describing how multiple conditions in one filter() call are handled. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9958 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02Updated Czech localflavor in Polish translationJarek Zgoda
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9955 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02Fixed #10392 -- Fixed an oversight from the refactoring in r9945.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9953 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02Fixed #9701 -- Added a "safeseq" template filter.Malcolm Tredinnick
This is like "safe", except it operates on the individual elements of a sequence, rather than treating the whole argument as a string. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9952 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02Fixed #10181 -- Handle an EmptyResultSet exception case properly in nested ↵Malcolm Tredinnick
querysets. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02Small edit to the caching docs.Malcolm Tredinnick
Turns out, super-lightning is not faster than normal lightning. :-) git-svn-id: http://code.djangoproject.com/svn/django/trunk@9949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02Removed some import-time dependencies on Django's settings.Malcolm Tredinnick
Now you can import the file storage stuff and still call settings.configure() afterwards. There is still one import-time usage of settings in django.contrib.comments, but that's unavoidable. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9946 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02Factor out some common pieces of django.conf.LazySettings.Malcolm Tredinnick
This is in preparation for some reuse elsewhere in the core code. git-svn-id: http://code.djangoproject.com/svn/django/trunk@9945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2009-03-02Fixed some test output in the wake of r9940.Malcolm Tredinnick
git-svn-id: http://code.djangoproject.com/svn/django/trunk@9944 bcc190cf-cafb-0310-a4f2-bffc1f526a37