mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-12 16:29:14 +00:00
Code Issues 32 Releases Wiki Activity
7,281 Commits 30 Branches 459 Tags
Commit Graph

2502 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Alex Gaynor
4f40925785 [soc2009/multidb] Split SQL construction into two seperate classes, the Query class which stores data about a query being constructed, and a Compiler class which generates SQL. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11759 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-21 07:03:40 +00:00
Alex Gaynor
e9e73c4b68 [soc2009/multidb] Merged up to trunk r11756. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11758 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-21 06:55:11 +00:00
Alex Gaynor
2bc7422b52 [soc2009/multidb] Updated to trunk r11603. This includes a critical security fix. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11614 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-10-09 22:16:10 +00:00
Alex Gaynor
6f983870f3 [soc2009/multidb] Merged up to trunk r11467. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11468 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-08-18 05:17:59 +00:00
Alex Gaynor
3a43d539b4 [soc2009/multidb] Added a note to the documentation about the deprecation of the DATABASE_* settings. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-08-09 22:11:51 +00:00
Alex Gaynor
1cbe183ff7 [soc2009/multidb] Raise a ConnectionDoesNotExist exception, instead of a KeyError for an invaid connection 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-08-09 21:53:57 +00:00
Alex Gaynor
2899accd26 [soc2009/multidb] Merged up to trunk r11413. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11416 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-08-09 02:39:23 +00:00
Alex Gaynor
7cf6fd8d61 [soc2009/multidb] Resolved a strange merge conflict. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11374 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-31 18:31:55 +00:00
Alex Gaynor
1a98f6ff26 [soc2009/multidb] Updated to trunk r11371. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-31 18:29:06 +00:00
Alex Gaynor
0536cb98d5 [soc2009/multidb] Merged up to trunk r11267. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11272 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-19 21:31:13 +00:00
Alex Gaynor
8395544774 [soc2009/multidb] Added connection parameter to the get_db_prep_* family of functions. This allows us to generate the lookup and save values for Fields in a backend specific manner. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11264 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-17 15:57:43 +00:00
Alex Gaynor
24b66ace9d [soc2009/multidb] Merged up to trunk r11251. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11252 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-16 23:13:49 +00:00
Alex Gaynor
08ab082480 [soc2009/multidb] Merged up to trunk r11240. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11247 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-16 03:02:08 +00:00
Alex Gaynor
94e002c6e4 [soc2009/multidb] Merged up to trunk r11205 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11209 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-09 17:45:59 +00:00
Alex Gaynor
5d462b9ec1 [soc2009/multidb] Added a using option to a Model's Meta class. This allows you to select the default database for a specific model, in addition to the global default 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11135 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-01 05:01:59 +00:00
Alex Gaynor
04e3fc8de2 [soc2009/multidb] First set of documentation for multi-db 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11134 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-01 04:37:08 +00:00
Alex Gaynor
7838fd87eb [soc2009/multidb] Added the start of documentation for multidb 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11118 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-26 18:16:18 +00:00
Alex Gaynor
1b183216ec [soc2009/multidb] Updated the list of settings documentation for the move of the TEST_DATABASE_* settings 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11117 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-26 18:10:12 +00:00
Alex Gaynor
50f5673c98 [soc2009/multidb] Merged up to trunk r11103. Resolved merge conflict 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11116 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-26 18:03:12 +00:00
Alex Gaynor
61db8d6b97 [soc2009/multidb] Updated testing documentation for the new settings, also updated the TODO 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11082 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-19 02:19:37 +00:00
Alex Gaynor
4f199d099c [soc2009/multidb] Merged up to trunk r11079 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11081 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-19 02:18:47 +00:00
Alex Gaynor
f3808a02c3 [soc2009/multidb] Removed a duplicate bit of docs that snuck in during a merge 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 17:05:59 +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
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
110e4f68ef [soc2009/multidb] Updated the transactions documentation for parts of the API that were extended to support multiple databases. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10937 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-07 03:26:12 +00:00
Alex Gaynor
fdd5ff646e [soc2009/multidb] Updated the contributing documentation for the settings changes 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10936 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-07 03:06:13 +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
1dc330595c [soc2009/multidb] Coverted all applicable management commands to have a --database flag for signifying with database to preform the operations against. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10893 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 02:03:49 +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
Karen Tracey
7638651cc3 Fixed #11204 -- Corrected typo in the pluralize doc. Thanks martin and SmileyChris. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10849 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-27 16:26:56 +00:00
Karen Tracey
9b19fd7a76 Fixed #11209 -- Added a note to doc on connection.queries that the logged sql may not inlude parameter quoting. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10847 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-27 16:20:11 +00:00
Karen Tracey
bdf33b37da Fixed #11215 -- Replaced erroneous catch with except in testing doc. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10845 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-27 16:03:51 +00:00