[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
django · Jul 19, 2009 · 0536cb9 · 0536cb9
1 parent 8395544
commit 0536cb9
Show file tree

Hide file tree

Showing 6 changed files with 136 additions and 124 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -14,6 +14,7 @@ The PRIMARY AUTHORS are (and/or have been):
     * Robert Wittams
     * Gary Wilson
     * Brian Rosner
+    * Justin Bronn
     * Karen Tracey
 
 More information on the main contributors to Django can be found in

diff --git a/TODO.txt b/TODO.txt
@@ -14,16 +14,12 @@ that need to be done.  I'm trying to be as granular as possible.
 
     flush, reset, and syncdb need to not prompt the user multiple times.
 
-3)  Remove any references to the global ``django.db.connection`` object in the
-    SQL creation process.  This includes(but is probably not limited to):
+3)  Handle nesting of Querysets using __in across multiple dbs.
 
-    * The way we create ``Query`` from ``BaseQuery`` is awkward and hacky.
-    * ``Field.get_db_prep_lookup``
-    * ``DateField.get_db_prep_value``
-    * ``DateTimeField.get_db_prep_value``
-    * ``DecimalField.get_db_prep_save``
-    * ``TimeField.get_db_prep_value``
+4)  Handle backends with custom Query classes.
 
-4)  Wait on the merge of the m2m stuff.
+5)  Wait on the merge of the m2m stuff.
 
-6) Time permitting add support for a ``DatabaseManager``.
+6)  Fix django.contrib.gis, it's broken in all sorts of ways.
+
+7) Time permitting add support for a ``DatabaseManager``.
diff --git a/django/conf/locale/pl/LC_MESSAGES/django.mo b/django/conf/locale/pl/LC_MESSAGES/django.mo