mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-04 17:59:13 +00:00
Code Issues 32 Releases Wiki Activity
7,240 Commits 29 Branches 451 Tags
Commit Graph

7240 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
2231e64115 [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
 2009-08-06 00:48:45 +00:00
Alex Gaynor
b7b5493fc3 [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
 2009-08-06 00:46:53 +00:00
Alex Gaynor
8ad4ea7b04 [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
 2009-08-06 00:27:53 +00:00
Alex Gaynor
e2fecde4a9 [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
 2009-08-05 21:49:24 +00:00
Alex Gaynor
1e583db0df [soc2009/multidb] Fixed a bug with the dates() queryset method and Oracle 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11404 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-08-05 21:45:04 +00:00
Alex Gaynor
c7af1de191 [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
 2009-08-05 00:47:07 +00:00
Alex Gaynor
80ef8a86d1 [soc2009/multidb] Fix several bugs I introduced into the Oracle backend. Thanks to Karen Tracey\! 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11392 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-08-04 23:49:14 +00:00
Alex Gaynor
ada3f39dca [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
 2009-08-04 04:37:30 +00:00
Alex Gaynor
3dd211ff03 [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
 2009-08-02 19:37:57 +00:00
Alex Gaynor
3cd611b89c [soc2009/multidb] Switched from using an ugly hacky wrapper to a Metaclass 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
 2009-08-01 05:26:02 +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
ac74fa7e32 [soc2009/multidb] Correctly handle pickling of Query objects, restoring them to the correct database. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11274 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-07-20 18:52:47 +00:00
Alex Gaynor
502d4982c9 [soc2009/multidb] Raise an exception at an attempt to do a subquery with 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
 2009-07-19 21:57:08 +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
6060ee7c77 [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
 2009-07-17 00:15:02 +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
f73cbaea67 [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
 2009-07-02 02:28:12 +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
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