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

7303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Alex Gaynor
5a5e082161 [soc2009/multidb] Minor grammar fixes to some error messages. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-26 17:48:50 +00:00
Alex Gaynor
28c2d5fde7 [soc2009/multidb] Modified database ENGINE handling to allow (with warnings) for short-form engine names in a DATABASES dictionary. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-26 17:48:41 +00:00
Alex Gaynor
e58c73041b [soc2009/multidb] Fix a number of tests when run under an old style settings (i.e. using the DATABASE_* settings). 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-26 07:26:05 +00:00
Alex Gaynor
1dafb9ad6c [soc2009/multidb] Resolved a number of strange merge conflicts that had arisen throughout various merges. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:46:07 +00:00
Alex Gaynor
b8c35f95f4 [soc2009/multidb] Corrected some markup problems in the release notes and added deprecation notes. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:45:51 +00:00
Alex Gaynor
4e36fffab2 [soc2009/multidb] Renaming of database attributes - you now use NAME, ENGINE, etc rather than DATABASE_NAME, DATABASE_ENGINE inside DATABASES. Also deprecates the use of short names (.e.g., `sqlite3` for backends in ENGINE). Patch from Russell Keith-Magee. 
Conflicts:

	docs/releases/1.2.txt

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11775 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:45:41 +00:00
Alex Gaynor
3e6ae729bc [soc2009/multidb] Added test cases for cross-database assignment. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11774 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:44:47 +00:00
Alex Gaynor
ca0698553e [soc2009/multidb] Cleaned up check in aggregation_regress to remove the assumption that the only objects in __dict__ are field attributes. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11773 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:44:38 +00:00
Alex Gaynor
91ca0ebfd9 [soc2009/multidb] Added a fallback - if an object is unsaved and a related object is requested, default to the 'default' connection. This is required to preserve backwards compatibility. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11772 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:44:30 +00:00
Alex Gaynor
5792362418 [soc2009/multidb] Fix the output method of DeserializedObject - we can't assume deserialized objects already exist in the database. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11771 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:44:22 +00:00
Alex Gaynor
f0b8874479 [soc2009/multidb] Removed _meta.using. This shouldn't be a model-level property. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:44:05 +00:00
Alex Gaynor
da909ae3a0 [soc2009/multidb] Made instances sticky to the database that created them. 
This involves:
 * Adding a _state attribute to instances to track instance state
 * Making db a state attribute, and making the db a public attribute on querysets.

Patch from Russell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11769 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:43:54 +00:00
Alex Gaynor
cec677a782 [soc2009/multidb] Fixed some documentation markup problems. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:43:35 +00:00
Alex Gaynor
30d5a3c8f7 [soc2009/multidb] Added extra docs on configuring the database-backed session store. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11767 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:43:25 +00:00
Alex Gaynor
64d4c4c09f [soc2009/multidb] Updated db-backed session to be multi-db compatible. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11766 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:43:17 +00:00
Alex Gaynor
ba0d00ddbb [soc2009/multidb] Several optimizations and cleanups. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11765 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:43:06 +00:00
Alex Gaynor
f2604c331d [soc2009/multidb] Updated testing services to handle multiple databases better. Includes extra tests (some failing) for multiple database support. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11764 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:42:56 +00:00
Alex Gaynor
0c167ae0ff [soc2009/multidb] Modified the fixture loading, fixture dumping and synchronization process to be multi-db aware. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11763 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:42:38 +00:00
Alex Gaynor
1fc8f9a279 [soc2009/multidb] Merged up to trunk r11760. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11762 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 14:25:44 +00:00