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,322 Commits 29 Branches 451 Tags
Commit Graph

7322 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alex Gaynor
5a5e082161 [soc2009/multidb] Minor grammar fixes to some error messages. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11782 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-26 17:48:50 +00:00
Alex Gaynor
28c2d5fde7 [soc2009/multidb] Modified database ENGINE handling to allow (with warnings) 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
 2009-11-26 17:48:41 +00:00
Alex Gaynor
e58c73041b [soc2009/multidb] Fix a number of tests when run under an old style settings (i.e. using the DATABASE_* settings). 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11779 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-26 07:26:05 +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
3e6ae729bc [soc2009/multidb] Added test cases for cross-database assignment. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11774 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:44:47 +00:00
Alex Gaynor
ca0698553e [soc2009/multidb] Cleaned up check in aggregation_regress to remove the 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
 2009-11-23 16:44:38 +00:00
Alex Gaynor
91ca0ebfd9 [soc2009/multidb] Added a fallback - if an object is unsaved and a related 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
 2009-11-23 16:44:30 +00:00
Alex Gaynor
5792362418 [soc2009/multidb] Fix the output method of DeserializedObject - we can'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
 2009-11-23 16:44:22 +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
da909ae3a0 [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
 2009-11-23 16:43:54 +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
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
ba0d00ddbb [soc2009/multidb] Several optimizations and cleanups. Patch from Russell Keith-Magee. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11765 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-11-23 16:43:06 +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
0d62f50271 [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
 2009-08-09 22:03:24 +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
fde0bfe929 [soc2009/multidb] Fix the extra_regress tests to be more forward compatible. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11422 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-08-09 02:55:45 +00:00
Alex Gaynor
50ad53dbca [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
 2009-08-09 02:52:45 +00:00
Alex Gaynor
5fe110e149 [soc2009/multidb] Fix the last commit. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11420 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-08-09 02:49:27 +00:00
Alex Gaynor
07fc79651d [soc2009/multidb] Fixed a naming inconsistancy in the transsaction decorators. 
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11419 bcc190cf-cafb-0310-a4f2-bffc1f526a37
 2009-08-09 02:48:19 +00:00
Alex Gaynor
2309288688 [soc2009/multidb] Fixed the method_set_order function that is used with 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
 2009-08-09 02:46:27 +00:00
Alex Gaynor
b6ae173078 [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
 2009-08-09 02:41:56 +00:00
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