mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-31 01:25:32 +00:00
Code Issues 32 Releases Wiki Activity
7,299 Commits 30 Branches 460 Tags
c958523121ddf69028f61d2a82357625f7a123c9
Commit Graph

259 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Adrian Holovaty
a251e0ab7e Fixed #11070 -- Removed JING_PATH setting, which was no longer used. Thanks for the patch, seanl 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10840 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-26 05:32:52 +00:00
Karen Tracey
c8e071b00d Fixed #11031 -- Added doc for some additional roles needed when testing Oracle. Thanks JirkaV and Matt Boersma. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10805 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-17 17:24:59 +00:00
Karen Tracey
3465ac05a6 Fixed #11034: Corrected serialization example in admin actions doc. Thanks timo and kaikuehne. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10804 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-17 17:13:33 +00:00
Karen Tracey
50745cc31e Fixed #11066 -- Corrected 15 duplicate "the"s found in docs and code comments. Thanks kaikuehne. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10801 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-17 16:45:28 +00:00
James Bennett
bed1418034 Add a proper cross-reference to the mention of HttpRequest in the comment moderation docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10786 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-15 02:57:53 +00:00
Jacob Kaplan-Moss
d246401552 Fixed #11113: fixed a couple of issues that slipped through the cracks when comment moderation was added to django.contrib.comments. 
The is a potentially backwards-incompatible change for users already relying on the internals of comment moderaration. To wit:

   * The moderation system now listens to the new `comment_will_be_posted`/`comment_was_posted` signals instead of `pre/post_save`. This means that import request-based information is available to moderation as it should be.
   * Some experimental code from `django.contrib.comments.moderation` has been removed. It was never intended to be merged into Django, and was completely untested and likely buggy.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@10784 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-14 15:20:50 +00:00
Jacob Kaplan-Moss
d987b378ce Fixed #11039: documented that aggregation and generic relations don't mix. Thanks, psmith. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10781 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-14 02:38:27 +00:00
Jacob Kaplan-Moss
5bdee2556e Fixed #11022: documented that the admin bulk delete action calls QuerySet.delete(), not Model.delete(). Thanks, Idan Gazit. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10780 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-14 02:35:16 +00:00
Jacob Kaplan-Moss
690cb616ce Fixed #10886: corrected a mistaken example in the admin docs. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10776 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-14 02:17:40 +00:00
Jacob Kaplan-Moss
66ff7db385 Fixed #11046: fixed a use of the deprecated cycle tag syntax in the template documentation. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-14 01:53:57 +00:00
Jacob Kaplan-Moss
d08339686b Fixed #9675: added note about upgrading the URLconf to the comment upgrade guide. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10746 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-12 17:23:43 +00:00
Russell Keith-Magee
5663258de1 Fixed #10792 -- Ensured that ModelChoiceFields don't provide an empty option when the underlying field has blank=False and there is a default value available. Thanks to carljm for the report and patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10729 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-10 07:44:27 +00:00
Jacob Kaplan-Moss
2af75b485d Fixed #10825: fixed the 'U' format code to dateformat (and the date/now filter/tag). Thanks to gsong and mir. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10716 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 13:39:37 +00:00
Jacob Kaplan-Moss
155ab07a5d Fixed #10188: prevent newlines in HTTP headers. Thanks, bthomas. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10711 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-08 11:15:23 +00:00
Russell Keith-Magee
95bcb70b56 Fixed #10367 -- Corrected an example in the documentation for GenericRelation. Thanks to George Song for the patch. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10659 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-02 14:51:54 +00:00