Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
  • 147 commits
  • 123 files changed
  • 0 comments
  • 3 contributors
May 27, 2009
Jacob Kaplan-Moss 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
059dac0
Jun 02, 2009
Alex Gaynor [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
4cd29f2
Jun 03, 2009
Alex Gaynor [soc2009/multidb] Implemented a connections object that is responsibl…
…e 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
bce55b1
Alex Gaynor [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
1dc3305
Alex Gaynor [soc2009/multidb] Purged all remaining references to DATABASE_* setti…
…ngs 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
f280c32
Alex Gaynor [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
9286db5
Alex Gaynor [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
15d4050
Alex Gaynor [soc2009/multidb] Updated several strings and internal API names to b…
…e more consistant and descriptive

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10897 bcc190cf-cafb-0310-a4f2-bffc1f526a37
f4bcbbf
Alex Gaynor [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
23da5c0
Alex Gaynor [soc2009/multidb] Updated the transaction decorators for use with mul…
…tiple DB.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
b1f70d9
Alex Gaynor [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
2f2cfac
Alex Gaynor [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
c233618
Alex Gaynor [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
7c797e1
Alex Gaynor [soc2009/multidb] Made the remove method on many to many related mana…
…gers 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
dc4eaff
Alex Gaynor [soc2009/multidb] The various transaction functions now fallback to t…
…he "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
96cf082
Jun 04, 2009
Alex Gaynor [soc2009/multidb] Fixed the usage of using() on QuerySets in conjucti…
…on with create(), added tests for this

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
fbb6fda
Alex Gaynor [soc2009/multidb] Made filter SQL generation lazy when we aren't filt…
…ering 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
91520ec
Alex Gaynor [soc2009/multidb] Made reset_queries reset the queries for all connec…
…tions

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10924 bcc190cf-cafb-0310-a4f2-bffc1f526a37
8bbd192
Jun 06, 2009
Alex Gaynor [soc2009/multidb] Merged up to trunk r10931. Resolved the slight merg…
…e conflict

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
6aca03c
Alex Gaynor [soc2009/multidb] Fixed the usage of the connection during Query cons…
…truction, 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
4d6c6d0
Jun 07, 2009
Alex Gaynor [soc2009/multidb] Updated the contributing documentation for the sett…
…ings changes

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10936 bcc190cf-cafb-0310-a4f2-bffc1f526a37
fdd5ff6
Alex Gaynor [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
110e4f6
Alex Gaynor [soc2009/multidb] Merged upto trunk r10941
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10942 bcc190cf-cafb-0310-a4f2-bffc1f526a37
f57bc92
Alex Gaynor [soc2009/multidb] Updated DateQuery to work correctly with multiple d…
…atabases

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@10943 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1653ffb
Jun 08, 2009
Alex Gaynor [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
33ed158
Jun 10, 2009
Alex Gaynor [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
83df1f1
Jun 16, 2009
Alex Gaynor [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
f6db1dd
Jun 18, 2009
Alex Gaynor [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
bc3cd5d
Alex Gaynor [soc2009/multidb] Removed a duplicate bit of docs that snuck in durin…
…g a merge

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11072 bcc190cf-cafb-0310-a4f2-bffc1f526a37
f3808a0
Alex Gaynor [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
4f46154
Alex Gaynor [soc2009/multidb] Updated TODO to bring it up to date with the curren…
…t state

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11074 bcc190cf-cafb-0310-a4f2-bffc1f526a37
99fdf66
Jun 19, 2009
Alex Gaynor [soc2009/multidb] Removed the as_sql_takes_connection option from var…
…ious 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
64eec4a
Alex Gaynor [soc2009/multidb] Added tests to ensure that objects aren't being cre…
…ated 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
903ff12
Alex Gaynor [soc2009/multidb] Updated the TODO to more accurately reflect the cur…
…rent state of things.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11077 bcc190cf-cafb-0310-a4f2-bffc1f526a37
03fbc3f
Alex Gaynor [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
b4e069f
Alex Gaynor [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
4f199d0
Alex Gaynor [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
61db8d6
Jun 26, 2009
Alex Gaynor [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
50f5673
Alex Gaynor [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
1b18321
Alex Gaynor [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
7838fd8
Jul 01, 2009
Alex Gaynor [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
2ab1840
Alex Gaynor [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
04e3fc8
Alex Gaynor [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
5d462b9
Jul 02, 2009
Alex Gaynor [soc2009/multidb] Replaced a lot of raw strings with the appropriate …
…constant. Thanks to Igor Sobreira for reminding me about these.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11150 bcc190cf-cafb-0310-a4f2-bffc1f526a37
f73cbae
Jul 09, 2009
Alex Gaynor [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
94e002c
Jul 16, 2009
Alex Gaynor [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
08ab082
Alex Gaynor [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
24b66ac
Jul 17, 2009
Alex Gaynor [soc2009/multidb] Fixed a bug with EmptyQuerySet.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11257 bcc190cf-cafb-0310-a4f2-bffc1f526a37
6060ee7
Alex Gaynor [soc2009/multidb] Added connection parameter to the get_db_prep_* fam…
…ily 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
8395544
Jul 19, 2009
Alex Gaynor [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
0536cb9
Alex Gaynor [soc2009/multidb] Raise an exception at an attempt to do a subquery w…
…ith 2 different databases. Eventually we'll just evaluate the 2 queries seperates.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11273 bcc190cf-cafb-0310-a4f2-bffc1f526a37
502d498
Jul 20, 2009
Alex Gaynor [soc2009/multidb] Correctly handle pickling of Query objects, restori…
…ng them to the correct database.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11274 bcc190cf-cafb-0310-a4f2-bffc1f526a37
ac74fa7
Jul 31, 2009
Alex Gaynor [soc2009/multidb] Updated to trunk r11371.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11373 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1a98f6f
Alex Gaynor [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
7cf6fd8
Aug 01, 2009
Alex Gaynor [soc2009/multidb] Switched from using an ugly hacky wrapper to a Meta…
…class for maitaing backwards compatibility in the get_db_prep_* and db_type methods. Thanks to Jacob for the good idea.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11375 bcc190cf-cafb-0310-a4f2-bffc1f526a37
3cd611b
Aug 02, 2009
Alex Gaynor [soc2009/multidb] Correct the kwarg provided to warn.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
3dd211f
Aug 04, 2009
Alex Gaynor [soc2009/multidb] Support multiple databases where one of them has a …
…custom Query class. This needs more testing as I don't have access to Oracle (or DB2, or MSSQL, or Sybase)

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11384 bcc190cf-cafb-0310-a4f2-bffc1f526a37
ada3f39
Alex Gaynor [soc2009/multidb] Fix several bugs I introduced into the Oracle backe…
…nd. Thanks to Karen Tracey\!

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
80ef8a8
Aug 05, 2009
Alex Gaynor [soc2009/multidb] Fixed a bug in the MySQL backend creation where it …
…hadn't been updated for the recent API changes

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11393 bcc190cf-cafb-0310-a4f2-bffc1f526a37
c7af1de
Alex Gaynor [soc2009/multidb] Fixed a bug with the dates() queryset method and Or…
…acle

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1e583db
Alex Gaynor [soc2009/multidb] Removed several tests that were no longer needed as…
… they're tested elsehwere

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11405 bcc190cf-cafb-0310-a4f2-bffc1f526a37
e2fecde
Aug 06, 2009
Alex Gaynor [soc2009/multidb] Fix a number of tests that were looking at settings…
….DATABASE_ENGINE, which has been deprecated in favor of the DATABASES interface

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11406 bcc190cf-cafb-0310-a4f2-bffc1f526a37
8ad4ea7
Alex Gaynor [soc2009/multidb] Fix the remaining tests that were depending on the …
…out of date setting.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11407 bcc190cf-cafb-0310-a4f2-bffc1f526a37
b7b5493
Alex Gaynor [soc2009/multidb] Fixed some exceptionally weird merging that git did…
…. Bad git.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11408 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2231e64
Aug 09, 2009
Alex Gaynor [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
2899acc
Alex Gaynor [soc2009/multidb] Removed duplicate cache in the Oracle backend.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11417 bcc190cf-cafb-0310-a4f2-bffc1f526a37
b6ae173
Alex Gaynor [soc2009/multidb] Fixed the method_set_order function that is used wi…
…th the order_with_respect to option to work in a multidb environ

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11418 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2309288
Alex Gaynor [soc2009/multidb] Fixed a naming inconsistancy in the transsaction de…
…corators.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11419 bcc190cf-cafb-0310-a4f2-bffc1f526a37
07fc796
Alex Gaynor [soc2009/multidb] Fix the last commit.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5fe110e
Alex Gaynor [soc2009/multidb] Change a conditional to be more idiomatic.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11421 bcc190cf-cafb-0310-a4f2-bffc1f526a37
50ad53d
Alex Gaynor [soc2009/multidb] Fix the extra_regress tests to be more forward comp…
…atible.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
fde0bfe
Alex Gaynor [soc2009/multidb] Raise a ConnectionDoesNotExist exception, instead o…
…f a KeyError for an invaid connection

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11424 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1cbe183
Alex Gaynor [soc2009/multidb] Added tests for using foreign keys across multipled…
… databases, ManyToMany tests will come after the merger of my many-to-many refactor work.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11425 bcc190cf-cafb-0310-a4f2-bffc1f526a37
0d62f50
Alex Gaynor [soc2009/multidb] Added a note to the documentation about the depreca…
…tion of the DATABASE_* settings.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11426 bcc190cf-cafb-0310-a4f2-bffc1f526a37
3a43d53
Aug 18, 2009
Alex Gaynor [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
6f98387
Oct 09, 2009
Alex Gaynor [soc2009/multidb] Updated to trunk r11603. This includes a critical s…
…ecurity fix.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11614 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2bc7422
Nov 21, 2009
Alex Gaynor [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
e9e73c4
Alex Gaynor [soc2009/multidb] Split SQL construction into two seperate classes, t…
…he 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
4f40925
Nov 23, 2009
Alex Gaynor [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
1fc8f9a
Alex Gaynor [soc2009/multidb] Modified the fixture loading, fixture dumping and s…
…ynchronization 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
0c167ae
Alex Gaynor [soc2009/multidb] Updated testing services to handle multiple databas…
…es 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
f2604c3
Alex Gaynor [soc2009/multidb] Several optimizations and cleanups. Patch from Russ…
…ell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11765 bcc190cf-cafb-0310-a4f2-bffc1f526a37
ba0d00d
Alex Gaynor [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
64d4c4c
Alex Gaynor [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
30d5a3c
Alex Gaynor [soc2009/multidb] Fixed some documentation markup problems. Patch fro…
…m Russell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11768 bcc190cf-cafb-0310-a4f2-bffc1f526a37
cec677a
Alex Gaynor [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
da909ae
Alex Gaynor [soc2009/multidb] Removed _meta.using. This shouldn't be a model-leve…
…l property. Patch from Russell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11770 bcc190cf-cafb-0310-a4f2-bffc1f526a37
f0b8874
Alex Gaynor [soc2009/multidb] Fix the output method of DeserializedObject - we ca…
…n'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
5792362
Alex Gaynor [soc2009/multidb] Added a fallback - if an object is unsaved and a re…
…lated 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
91ca0eb
Alex Gaynor [soc2009/multidb] Cleaned up check in aggregation_regress to remove t…
…he 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
ca06985
Alex Gaynor [soc2009/multidb] Added test cases for cross-database assignment. Pat…
…ch from Russell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11774 bcc190cf-cafb-0310-a4f2-bffc1f526a37
3e6ae72
Alex Gaynor [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
4e36fff
Alex Gaynor [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
b8c35f9
Alex Gaynor [soc2009/multidb] Resolved a number of strange merge conflicts that h…
…ad arisen throughout various merges.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11777 bcc190cf-cafb-0310-a4f2-bffc1f526a37
1dafb9a
Nov 26, 2009
Alex Gaynor [soc2009/multidb] Fix a number of tests when run under an old style s…
…ettings (i.e. using the DATABASE_* settings).

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
e58c730
Alex Gaynor [soc2009/multidb] Modified database ENGINE handling to allow (with wa…
…rnings) 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
28c2d5f
Alex Gaynor [soc2009/multidb] Minor grammar fixes to some error messages. Patch f…
…rom Russell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5a5e082
Dec 03, 2009
Alex Gaynor [soc2009/multidb] Cleaned up the double processing required by valida…
…te() 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
0ca0ed0
Alex Gaynor [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
fdadb7b
Alex Gaynor [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
a824570
Alex Gaynor [soc2009/multidb] Removed a documentation reference to Meta.using. Pa…
…tch from Russell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11793 bcc190cf-cafb-0310-a4f2-bffc1f526a37
6bc1b7d
Dec 04, 2009
Alex Gaynor [soc2009/multidb] Corrected a typo in the get_db_prep_* migration not…
…es. 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
2e900d4
Dec 09, 2009
Alex Gaynor [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
bee835f
Dec 12, 2009
Alex Gaynor [soc2009/multidb] Added documentation about the potential complicatio…
…ns 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
353e079
Alex Gaynor [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
c881136
Alex Gaynor [soc2009/multidb] Merged in all of Justin Bronn's GIS work. Multidb s…
…hould 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
049dc42
Dec 13, 2009
Alex Gaynor [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
2794cce
Dec 14, 2009
Alex Gaynor [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
4e25ca0
Dec 15, 2009
Alex Gaynor [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
d5e883f
Alex Gaynor [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
808aa3b
Alex Gaynor [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
255608f
Alex Gaynor [soc2009/multidb] Corrected some test errors introduced by merging tr…
…unk. Patch from Russell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11870 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5afff61
Alex Gaynor [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
11c00d6
Dec 16, 2009
Alex Gaynor [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
05b4d2f
Alex Gaynor [soc2009/multidb] Fixed a problem with m2m descriptors not sticking t…
…o 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
fc36471
Dec 17, 2009
Alex Gaynor [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
f9412b4
Alex Gaynor [soc2009/multidb] Updated content types to be multidb aware. Patch fr…
…om Russell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11889 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2a99b2b
Alex Gaynor [soc2009/multidb] Updated contrib.auth User model for multi-db suppor…
…t. Patch from Russell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11890 bcc190cf-cafb-0310-a4f2-bffc1f526a37
3c8c3bd
Alex Gaynor [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
44f21f2
Alex Gaynor [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
562c5ff
Alex Gaynor [soc2009/multidb] Modified using= arguments to default to None; modif…
…ied 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
bdf21cc
Alex Gaynor [soc2009/multidb] Added using argument to comment view. Patch from Ru…
…ssell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11894 bcc190cf-cafb-0310-a4f2-bffc1f526a37
e4dc8be
Alex Gaynor [soc2009/multidb] More cleanups of using= arguments. Patch from Russe…
…ll Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11895 bcc190cf-cafb-0310-a4f2-bffc1f526a37
4eecb92
Alex Gaynor [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
c958523
Alex Gaynor [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
d255be2
Alex Gaynor [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
2269813
Alex Gaynor [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
601db0d
Dec 18, 2009
Alex Gaynor [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
e95bc7b
Dec 19, 2009
Justin Bronn [soc2009/multidb] Fixed #12402 -- `QuerySet.defer` now interacts prop…
…erly with `SQLCompiler` subclasses that implement `resolve_columns`.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11911 bcc190cf-cafb-0310-a4f2-bffc1f526a37
df2746b
Alex Gaynor [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
42c03cb
Dec 20, 2009
Alex Gaynor [soc2009/multidb] Merged up to trunk r11921. This does not include up…
…dating Manager.raw() for multiple database support.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11922 bcc190cf-cafb-0310-a4f2-bffc1f526a37
576b641
Dec 21, 2009
Alex Gaynor [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
8da7538
Alex Gaynor [soc2009/multidb] Correct the handling of raw and defered fields with…
… multi-db.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11926 bcc190cf-cafb-0310-a4f2-bffc1f526a37
4424a8d
Alex Gaynor [soc2009/multidb] Remove cross database protection. This will be read…
…ded in a way that is more ammenable to master-slave and other mirroring schemes.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11927 bcc190cf-cafb-0310-a4f2-bffc1f526a37
e4f8015
Alex Gaynor [soc2009/multidb] A couple of cleanups of multi-db support for raw qu…
…eries, 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
928e1f1
Alex Gaynor [soc2009/multidb] Fix to allow editing of inline formsets of objects …
…on non-default databases. Patch from Russell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11931 bcc190cf-cafb-0310-a4f2-bffc1f526a37
e3d8278
Alex Gaynor [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
39f69c0
Alex Gaynor [soc2009/multidb] Fixed a problem with overzealous purging of content…
…types during syncdb. Patch from Russell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11933 bcc190cf-cafb-0310-a4f2-bffc1f526a37
5cf2bed
Alex Gaynor [soc2009/multidb] Removed another item from the TODO. Patch from Russ…
…ell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11934 bcc190cf-cafb-0310-a4f2-bffc1f526a37
c3ba4c4
Dec 22, 2009
Alex Gaynor [soc2009/multidb] Merged up to trunk r11938.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11939 bcc190cf-cafb-0310-a4f2-bffc1f526a37
d5104b6
Justin Bronn [soc2009/multidb] `LayerMapping` and geographic sitemap views weren't…
… using `DEFAULT_DB_ALIAS` as the default for `using` kwarg.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11940 bcc190cf-cafb-0310-a4f2-bffc1f526a37
c3cc219
Alex Gaynor [soc2009/multidb] Updated defer_regress tests to reflect extra models…
… in multi-db branch. Patch from Russell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11944 bcc190cf-cafb-0310-a4f2-bffc1f526a37
d691420
Alex Gaynor [soc2009/multidb] Final cleanup of multi-db docs. Patch from Russell …
…Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11945 bcc190cf-cafb-0310-a4f2-bffc1f526a37
c770ae0
Alex Gaynor [soc2009/multidb] Cleaned up documentation for now stale using argume…
…nt. Patch from Russell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11946 bcc190cf-cafb-0310-a4f2-bffc1f526a37
cac9b38
Alex Gaynor [soc2009/multidb] Added versionadded tags to custom model field docs.…
… Patch from Russell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11947 bcc190cf-cafb-0310-a4f2-bffc1f526a37
8a20a3e
Alex Gaynor [soc2009/multidb] Whitespace and comment cleanup. Patch from Russell …
…Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11949 bcc190cf-cafb-0310-a4f2-bffc1f526a37
27c43c3
Alex Gaynor [soc2009/multidb] Updated management commands to ensure that a databa…
…se name is always available. Patch from Russell Keith-Magee.

git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11950 bcc190cf-cafb-0310-a4f2-bffc1f526a37
45b4288