mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 10:19:20 +00:00
Code Issues 32 Releases Wiki Activity
7,216 Commits 29 Branches 451 Tags
Commit Graph

7216 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Gaynor
2ab1840a9d [soc2009/multidb] Merged up to trunk r11127 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11133 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-01 04:20:38 +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
b4e069fab4 [soc2009/multidb] Fixed running the admin_scripts tests under sqlite without having DATABASE_NAME set 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11078 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-19 01:09:21 +00:00
Alex Gaynor
03fbc3f25d [soc2009/multidb] Updated the TODO to more accurately reflect the current state of things. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-19 00:35:35 +00:00
Alex Gaynor
903ff126b0 [soc2009/multidb] Added tests to ensure that objects aren't being created before they are supposed to be, which would indicate we weren't creating objects in the right DB. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11076 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-19 00:29:18 +00:00
Alex Gaynor
64eec4a120 [soc2009/multidb] Removed the as_sql_takes_connection option from various classes, it was originally just to allow the tests to pass while the code base was being migrated, it was not meant to remain 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11075 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-19 00:21:38 +00:00
Alex Gaynor
99fdf66600 [soc2009/multidb] Updated TODO to bring it up to date with the current state 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11074 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 23:42:00 +00:00
Alex Gaynor
4f461542b5 [soc2009/multidb] Ensure that when a QuerySet is given a Query object in its construct that we correct the detect the connection that is being used 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11073 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-18 17:31:36 +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
f6db1dd357 [soc2009/multidb] Merged up to trunk r11009 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11011 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-16 01:36:05 +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
33ed158dc4 [soc2009/multidb] Fixed test failures that were introduced in r10943 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10951 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-08 01:14:44 +00:00
Alex Gaynor
1653ffb571 [soc2009/multidb] Updated DateQuery to work correctly with multiple databases 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-07 23:56:42 +00:00
Alex Gaynor
f57bc92842 [soc2009/multidb] Merged upto trunk r10941 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-07 23:42:26 +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
4d6c6d0596 [soc2009/multidb] Fixed the usage of the connection during Query construction, and defer it until actual SQL construction. In practice this means the GROUP BY optimization we do will be correctly applied based on the connection the Query is executed against, as oppossed to the on the QuerySet is targeting at the time the GROUP BY items are added 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-06 19:38:29 +00:00
Alex Gaynor
6aca03c24d [soc2009/multidb] Merged up to trunk r10931. Resolved the slight merge conflict 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-06 18:01:43 +00:00
Alex Gaynor
8bbd192681 [soc2009/multidb] Made reset_queries reset the queries for all connections 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10924 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-04 17:10:05 +00:00
Alex Gaynor
91520ec364 [soc2009/multidb] Made filter SQL generation lazy when we aren't filtering on a specific field, also added additional tests 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10923 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-04 16:53:45 +00:00
Alex Gaynor
fbb6fda5f6 [soc2009/multidb] Fixed the usage of using() on QuerySets in conjuction with create(), added tests for this 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-04 16:13:14 +00:00
Alex Gaynor
96cf08295d [soc2009/multidb] The various transaction functions now fallback to the "default" DB if none is specified, this preserves backwards compatibility 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10921 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 21:40:59 +00:00
Alex Gaynor
dc4eaff121 [soc2009/multidb] Made the remove method on many to many related managers use the default database for transactions. This will eventually need to be changed as a part of a larger refactor of many to many fields 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10920 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 21:25:20 +00:00
Alex Gaynor
7c797e138d [soc2009/multidb] Updated createcachetable management command for new multidb transaction API 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10919 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 21:02:35 +00:00
Alex Gaynor
c233618d4b [soc2009/multidb] Correct the type signature on CommentFlag.save 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10918 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 20:54:54 +00:00
Alex Gaynor
2f2cfac142 [soc2009/multidb] Merged multidb up to trunk r10914 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10917 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 19:13:11 +00:00
Alex Gaynor
b1f70d9e53 [soc2009/multidb] Updated the transaction decorators for use with multiple DB. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 03:18:48 +00:00
Alex Gaynor
23da5c0ac1 [soc2009/multidb] Bring this branch up to date with my external work. This means implementing the using method on querysets as well as a using kwarg on save and delete, plus many internal changes to facilitae this 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10904 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 02:37:33 +00:00
Alex Gaynor
f4bcbbfa8b [soc2009/multidb] Updated several strings and internal API names to be more consistant and descriptive 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 02:26:16 +00:00
Alex Gaynor
15d405077e [soc2009/multidb] Removed several instances of unnescary usage of the global connection object, where instead we should be using the connection object for the given Query 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10896 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 02:16:53 +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
f280c325cd [soc2009/multidb] Purged all remaining references to DATABASE_* settings and TEST_DATABASE_* settings from the database backends, all of these settings have been moved into dictionaries in the DATABASES setting 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-03 02:06:40 +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
Alex Gaynor
4cd29f2520 [soc2009/multidb] Merged up to trunk r10865 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10887 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-06-02 02:46:02 +00:00
Jacob Kaplan-Moss
059dac0207 Created "multidb" branch for Alex Gaynor's SoC project. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10852 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-27 18:45:22 +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
Karen Tracey
5dc30c9fd2 Fixed #11205 -- Made the links to the str method description look the same as the links to the unicode method description in the tutorial part 1. Having one be fully qualified while the other was not was odd-looking. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10843 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-26 16:46:56 +00:00
Karen Tracey
5e20adcdf6 Fixed #11202 -- Removed mod_python information from FAQ, as it is no longer the recommended deployment option, in favor of more general pointers to the docs and wiki where deployment is discussed in depth. 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@10841 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-05-26 16:27:12 +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
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