diff --git a/django/core/db/backends/ado_mssql.py b/django/core/db/backends/ado_mssql.py index 46116ccdad..9ea0d5456d 100644 --- a/django/core/db/backends/ado_mssql.py +++ b/django/core/db/backends/ado_mssql.py @@ -102,8 +102,10 @@ def get_limit_offset_sql(limit, offset=None): return sql def get_random_function_sql(): - # TODO: This is a guess. Make sure this is correct. - return "RANDOM()" + return "RAND()" + +def get_table_list(cursor): + raise NotImplementedError def get_relations(cursor, table_name): raise NotImplementedError @@ -151,3 +153,5 @@ DATA_TYPES = { 'URLField': 'varchar(200)', 'USStateField': 'varchar(2)', } + +DATA_TYPES_REVERSE = {} diff --git a/django/models/auth.py b/django/models/auth.py index 430cad192a..20d846157e 100644 --- a/django/models/auth.py +++ b/django/models/auth.py @@ -180,7 +180,7 @@ class Message(meta.Model): class LogEntry(meta.Model): action_time = meta.DateTimeField(auto_now=True) user = meta.ForeignKey(User) - content_type = meta.ForeignKey(core.ContentType, blank=True, null=True) # TODO: content_type_id name? + content_type = meta.ForeignKey(core.ContentType, blank=True, null=True) object_id = meta.TextField(blank=True, null=True) object_repr = meta.CharField(maxlength=200) action_flag = meta.PositiveSmallIntegerField() diff --git a/docs/model-api.txt b/docs/model-api.txt index ee5f9ee723..85d2e58aca 100644 --- a/docs/model-api.txt +++ b/docs/model-api.txt @@ -249,7 +249,7 @@ Here are all available field types: The admin represents this as an ```` (a file-upload widget). - Using a `FieldField` or an ``ImageField`` (see below) in a model takes a few + Using a ``FileField` or an ``ImageField`` (see below) in a model takes a few steps: 1. In your settings file, you'll need to define ``MEDIA_ROOT`` as the