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

241 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Adrian Holovaty
9848f888ba Made some small improvements to docs/topics/http/sessions.txt 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10839 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-26 05:29:28 +00:00
Brian Rosner
5d9983d084 Fixed #8857 -- Corrected ref in modelforms documentation and added ref to file upload documentation in form documentation. Thanks Kyle Fox and prairiedogg. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10837 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-24 06:46:02 +00:00
Karen Tracey
e258961e4f Fixed #11188 -- Removed incorrect doc note about step being unsupported when slicing query sets. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10835 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-23 12:58:31 +00:00
Karen Tracey
ae95edf91d Fixed #11138 -- Corrected the description of behavior related to the max_num parameter for model formsets. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10819 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-18 16:00:29 +00:00
Karen Tracey
5a5842ccf2 Fixed #11137 -- Add missing base class in proxy model extra managers doc. Thanks ekarulf. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10818 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-18 15:36:18 +00:00
Karen Tracey
a6a0b29318 Fixed #10400: Added a note in the file uploads doc about the correct form type needed for file uploads to work. Thanks claudep and timo. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10816 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-17 18:45:25 +00:00
Karen Tracey
b2d2aba77e Fixed #10817 -- Corrected some grammar in the forms doc. Thanks nickretallack@gmail.com. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10814 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-17 18:10:10 +00:00
Karen Tracey
b527a59da8 Fixed #10855: Reference doc on creating superusers in the tutorial at the point where an account is needed, so that readers who neglected to create one earlier (or who forgot the password) don't get stuck or think they have to start all over. Thanks cwolf127 and timo. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10810 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-17 17:54:51 +00:00
Karen Tracey
5a4ad739b7 Fixed #10971 -- Corrected code example involving redirect_chain in the testing doc. Thanks yourcelf. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10807 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-17 17:36:04 +00:00
Karen Tracey
2cbec63f0b Fixed #11106 -- Corrected typo in models doc. Thanks mnieber. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10797 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-17 16:20:11 +00:00
Karen Tracey
7ba62f2c15 Fixed #11128 -- Misc. fixes and improvements to the model forms doc. Thanks Ramiro and Alex. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10795 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-17 16:12:05 +00:00
Russell Keith-Magee
975ec181ea Fixed #9206 -- Added documentation on savepoints, and how to use them to recover from errors in PostgreSQL. Thanks to Richard Davies for the draft text. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10791 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-16 06:23:06 +00:00
Jacob Kaplan-Moss
fc458dd710 Fixed #10795: added a link to model formsets docs from the formsets docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10774 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-14 02:13:08 +00:00