boulder-oracle-sprint: Add in a few small trunk changes that svn merge had

missed.


git-svn-id: http://code.djangoproject.com/svn/django/branches/boulder-oracle-sprint@4729 bcc190cf-cafb-0310-a4f2-bffc1f526a37

9 files changed, 5 insertions, 9 deletions

diff --git a/django/contrib/admin/models.py b/django/contrib/admin/models.py
index 35b90cd249..022d20bed9 100644
--- a/django/contrib/admin/models.py
+++ b/django/contrib/admin/models.py
@@ -16,7 +16,7 @@ class LogEntry(models.Model):
     action_time = models.DateTimeField(_('action time'), auto_now=True)
     user = models.ForeignKey(User)
     content_type = models.ForeignKey(ContentType, blank=True, null=True)
-    object_id = models.CharField(_('object id'), maxlength=200, blank=True, null=True)
+    object_id = models.TextField(_('object id'), blank=True, null=True)
     object_repr = models.CharField(_('object repr'), maxlength=200)
     action_flag = models.PositiveSmallIntegerField(_('action flag'))
     change_message = models.TextField(_('change message'), blank=True)
diff --git a/django/contrib/sessions/models.py b/django/contrib/sessions/models.py
index 86c5d71957..f684cd381e 100644
--- a/django/contrib/sessions/models.py
+++ b/django/contrib/sessions/models.py
@@ -51,7 +51,6 @@ class Session(models.Model):
     session_key = models.CharField(_('session key'), maxlength=40, primary_key=True)
     session_data = models.TextField(_('session data'))
     expire_date = models.DateTimeField(_('expire date'))
-
     objects = SessionManager()
     class Meta:
         db_table = 'django_session'
diff --git a/django/db/__init__.py b/django/db/__init__.py
index bec4104ee9..4176b5aa79 100644
--- a/django/db/__init__.py
+++ b/django/db/__init__.py
@@ -25,7 +25,6 @@ except ImportError, e:
 
 get_introspection_module = lambda: __import__('django.db.backends.%s.introspection' % settings.DATABASE_ENGINE, {}, {}, [''])
 get_creation_module = lambda: __import__('django.db.backends.%s.creation' % settings.DATABASE_ENGINE, {}, {}, [''])
-get_query_module = lambda: __import__('django.db.backends.%s.query' % settings.DATABASE_ENGINE, {}, {}, [''])
 runshell = lambda: __import__('django.db.backends.%s.client' % settings.DATABASE_ENGINE, {}, {}, ['']).runshell()
 
 connection = backend.DatabaseWrapper(**settings.DATABASE_OPTIONS)
diff --git a/django/db/backends/dummy/base.py b/django/db/backends/dummy/base.py
index bfabc38873..e36a99e982 100644
--- a/django/db/backends/dummy/base.py
+++ b/django/db/backends/dummy/base.py
@@ -27,7 +27,6 @@ class DatabaseWrapper:
         pass # close()
 
 supports_constraints = False
-uses_case_insensitive_names = False
 quote_name = complain
 dictfetchone = complain
 dictfetchmany = complain
diff --git a/django/db/backends/oracle/base.py b/django/db/backends/oracle/base.py
index 5cf4f6f37e..35b053fafb 100644
--- a/django/db/backends/oracle/base.py
+++ b/django/db/backends/oracle/base.py
@@ -146,7 +146,7 @@ def get_datetime_cast_sql():
 def get_limit_offset_sql(limit, offset=None):
     # Limits and offset are too complicated to be handled here.
     # Instead, they are handled in django/db/backends/oracle/query.py.
-    raise NotImplementedError
+    return ""
 
 def get_random_function_sql():
     return "DBMS_RANDOM.RANDOM"
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 191442aff1..b1436dcecd 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -3,6 +3,7 @@ from django.dispatch import dispatcher
 from django.conf import settings
 from django.core import validators
 from django import oldforms
+from django import newforms as forms
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils.functional import curry
 from django.utils.itercompat import tee
diff --git a/django/db/models/query.py b/django/db/models/query.py
index f6484633cf..87571bcce6 100644
--- a/django/db/models/query.py
+++ b/django/db/models/query.py
@@ -1,4 +1,4 @@
-from django.db import backend, connection, get_query_module, transaction
+from django.db import backend, connection, transaction
 from django.db.models.fields import DateField, FieldDoesNotExist
 from django.db.models.fields.generic import GenericRelation
 from django.db.models import signals
diff --git a/tests/modeltests/basic/models.py b/tests/modeltests/basic/models.py
index 062f8b29ed..9af13c0e3e 100644
--- a/tests/modeltests/basic/models.py
+++ b/tests/modeltests/basic/models.py
@@ -9,8 +9,6 @@ from django.db import models
 class Article(models.Model):
     headline = models.CharField(maxlength=100, default='Default headline')
     pub_date = models.DateTimeField()
-    class Meta:
-        ordering = ('pub_date',)
 
     class Meta:
         ordering = ('pub_date','headline')
diff --git a/tests/modeltests/many_to_one/models.py b/tests/modeltests/many_to_one/models.py
index 392bcdf73c..82eb3257d0 100644
--- a/tests/modeltests/many_to_one/models.py
+++ b/tests/modeltests/many_to_one/models.py
@@ -155,7 +155,7 @@ False
 [<Article: John's second story>, <Article: This is a test>]
 
 # Find all Articles for the Reporter whose ID is 1.
-# Use direct ID check, pk check, and object comparison
+# Use direct ID check, pk check, and object comparison 
 >>> Article.objects.filter(reporter__id__exact=1)
 [<Article: John's second story>, <Article: This is a test>]
 >>> Article.objects.filter(reporter__pk=1)