mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 09:49:12 +00:00
Code Issues 32 Releases Wiki Activity
7,322 Commits 29 Branches 451 Tags
Commit Graph

7322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Gaynor
45b4288bb6 [soc2009/multidb] Updated management commands to ensure that a database name is always available. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11950 bcc190cf-cafb-0310-a4f2-bffc1f526a37
archive/soc2009/multidb 		2009-12-22 14:37:40 +00:00
Alex Gaynor
27c43c3acc [soc2009/multidb] Whitespace and comment cleanup. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-22 14:37:26 +00:00
Alex Gaynor
8a20a3e3fc [soc2009/multidb] Added versionadded tags to custom model field docs. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11947 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-22 14:37:16 +00:00
Alex Gaynor
cac9b38b1a [soc2009/multidb] Cleaned up documentation for now stale using argument. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11946 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-22 14:37:09 +00:00
Alex Gaynor
c770ae0e8b [soc2009/multidb] Final cleanup of multi-db docs. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-22 14:37:01 +00:00
Alex Gaynor
d69142033b [soc2009/multidb] Updated defer_regress tests to reflect extra models in multi-db branch. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11944 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-22 14:36:53 +00:00
Justin Bronn
c3cc2198e7 [soc2009/multidb] LayerMapping and geographic sitemap views weren't using DEFAULT_DB_ALIAS as the default for using kwarg. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11940 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-22 06:26:41 +00:00
Alex Gaynor
d5104b63a3 [soc2009/multidb] Merged up to trunk r11938. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-22 06:08:15 +00:00
Alex Gaynor
c3ba4c400d [soc2009/multidb] Removed another item from the TODO. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-21 19:31:19 +00:00
Alex Gaynor
5cf2bede96 [soc2009/multidb] Fixed a problem with overzealous purging of contenttypes during syncdb. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-21 19:31:13 +00:00
Alex Gaynor
39f69c016e [soc2009/multidb] Added documentation for usage of admin with multidb. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11932 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-21 19:31:05 +00:00
Alex Gaynor
e3d8278553 [soc2009/multidb] Fix to allow editing of inline formsets of objects on non-default databases. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-21 19:30:57 +00:00
Alex Gaynor
928e1f1f33 [soc2009/multidb] A couple of cleanups of multi-db support for raw queries, including a using() call on raw query sets. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11930 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-21 19:30:49 +00:00
Alex Gaynor
e4f8015112 [soc2009/multidb] Remove cross database protection. This will be readded in a way that is more ammenable to master-slave and other mirroring schemes. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-21 03:39:00 +00:00
Alex Gaynor
4424a8d3d8 [soc2009/multidb] Correct the handling of raw and defered fields with multi-db. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-21 02:38:38 +00:00
Alex Gaynor
8da7538b18 [soc2009/multidb] Merged up to trunk r11924. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11925 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-21 02:01:24 +00:00
Alex Gaynor
576b641c51 [soc2009/multidb] Merged up to trunk r11921. This does not include updating Manager.raw() for multiple database support. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-20 18:27:33 +00:00
Alex Gaynor
42c03cbeae [soc2009/multidb] Merged up to trunk r11917. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-19 18:03:58 +00:00
Justin Bronn
df2746b16c [soc2009/multidb] Fixed #12402 -- QuerySet.defer now interacts properly with SQLCompiler subclasses that implement resolve_columns. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-19 01:11:33 +00:00
Alex Gaynor
e95bc7b50d [soc2009/multidb] Cleaned up the interaction between managers and the using() method by the addition of a db_manager() method. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11908 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-18 01:31:53 +00:00
Alex Gaynor
601db0d2df [soc2009/multidb] Merged up to trunk r11901. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11904 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-17 22:18:23 +00:00
Alex Gaynor
2269813616 [soc2009/multidb] Merged up to trunk r11900. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11902 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-17 22:07:42 +00:00
Alex Gaynor
d255be2619 [soc2009/multidb] Updated TODO list. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-17 16:13:42 +00:00
Alex Gaynor
c958523121 [soc2009/multidb] Modified admin to allow for multidb customization. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11896 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-17 16:13:36 +00:00
Alex Gaynor
4eecb92fc4 [soc2009/multidb] More cleanups of using= arguments. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11895 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-17 16:13:25 +00:00
Alex Gaynor
e4dc8be3a9 [soc2009/multidb] Added using argument to comment view. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-17 16:13:17 +00:00
Alex Gaynor
bdf21ccf8b [soc2009/multidb] Modified using= arguments to default to None; modified querysets so you can track explicit database assignments. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11893 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-17 16:13:07 +00:00
Alex Gaynor
562c5ffb07 [soc2009/multidb] Added partial handling for comments to be multi-db compliant. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11892 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-17 16:12:51 +00:00
Alex Gaynor
44f21f2374 [soc2009/multidb] Add multi-db support to fixture loading. Involves a rework of models in the multi-db test cases to make the fixture a complete test case. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11891 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-17 16:12:43 +00:00
Alex Gaynor
3c8c3bd651 [soc2009/multidb] Updated contrib.auth User model for multi-db support. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11890 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-17 16:12:23 +00:00
Alex Gaynor
2a99b2ba5b [soc2009/multidb] Updated content types to be multidb aware. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-17 16:12:06 +00:00
Alex Gaynor
f9412b4d21 [soc2009/multidb] Merged up to trunk r11885. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11888 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-17 15:15:26 +00:00
Alex Gaynor
fc36471d1b [soc2009/multidb] Fixed a problem with m2m descriptors not sticking to the right database. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11873 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-16 07:01:56 +00:00
Alex Gaynor
05b4d2f67b [soc2009/multidb] Fixed #11741 -- Updates to the spatial backends (e.g., re-enabled POSTGIS_VERSION setting); added geometry backend module. Patch from Justin Bronn. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11872 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-16 02:33:33 +00:00
Alex Gaynor
11c00d632d [soc2009/multidb] Reorganized sql.InsertQuery to defer the need for a connection till later in the process. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11871 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-15 17:58:17 +00:00
Alex Gaynor
5afff61b02 [soc2009/multidb] Corrected some test errors introduced by merging trunk. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-15 17:58:04 +00:00
Alex Gaynor
255608f085 [soc2009/multidb] Clarified text of deprecation warnings. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11869 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-15 17:57:49 +00:00
Alex Gaynor
808aa3b89d [soc2009/multidb] Added backwards compatibility layer for contrib.gis. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11868 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-15 08:25:58 +00:00
Alex Gaynor
d5e883f2e3 [soc2009/multidb] Corrected merge error. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11867 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-15 08:25:50 +00:00
Alex Gaynor
4e25ca00c8 [soc2009/multidb] Merged up to trunk r11864. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11866 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-14 17:47:04 +00:00
Alex Gaynor
2794cceb5f [soc2009/multidb] Merged up to trunk r11858. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11860 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-13 22:15:08 +00:00
Alex Gaynor
049dc42bde [soc2009/multidb] Merged in all of Justin Bronn's GIS work. Multidb should now work fully with GIS. This is backwards incompatible, if you are using GIS, your ENGINE setting should now be django.contrib.gis.db.backends.XXX where XXX is the name of your DB backend. Thanks to Justin for all his work. This also resolves merge conflicts from the previous commit. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-12 02:13:30 +00:00
Alex Gaynor
c88113683d [soc2009/multidb] Merged up to trunk r11810. There are many conflicts in this merge, these will be resolved in a subsequent commit. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11812 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-12 02:10:28 +00:00
Alex Gaynor
353e079792 [soc2009/multidb] Added documentation about the potential complications trying to migrate an object between databases. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11811 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-12 02:09:11 +00:00
Alex Gaynor
bee835fa44 [soc2009/multidb] Merged up to trunk r11804. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-09 17:23:16 +00:00
Alex Gaynor
2e900d47f2 [soc2009/multidb] Corrected a typo in the get_db_prep_* migration notes. Thanks to Waldemar Kornewald for the report. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11794 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-04 00:55:38 +00:00
Alex Gaynor
6bc1b7d8cd [soc2009/multidb] Removed a documentation reference to Meta.using. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11793 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-03 20:57:53 +00:00
Alex Gaynor
a824570484 [soc2009/multidb] Corrected error handling when the database backend is incorrectly specified. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11792 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-03 20:57:33 +00:00
Alex Gaynor
fdadb7bf18 [soc2009/multidb] Merged up to trunk r11785. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11787 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-03 06:28:26 +00:00
Alex Gaynor
0ca0ed0453 [soc2009/multidb] Cleaned up the double processing required by validate() by splitting get_db_prep_* functions into db-specific and non-db-specific parts. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-12-03 06:25:45 +00:00