mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-07-05 18:29:11 +00:00
Code Issues 32 Releases Wiki Activity

Merged to 940

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/branches/new-admin@941 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Robert Wittams 2005-10-18 16:02:53 +00:00
parent 1819b38ae3
commit 16d966a163
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/core/db/backends/ado_mssql.py
View File

@ -102,8 +102,10 @@ def get_limit_offset_sql(limit, offset=None):
return sql return sql
def get_random_function_sql(): def get_random_function_sql():
# TODO: This is a guess. Make sure this is correct. return "RAND()"
return "RANDOM()"
def get_table_list(cursor):
raise NotImplementedError
def get_relations(cursor, table_name): def get_relations(cursor, table_name):
raise NotImplementedError raise NotImplementedError
@ -151,3 +153,5 @@ DATA_TYPES = {
'URLField': 'varchar(200)', 'URLField': 'varchar(200)',
'USStateField': 'varchar(2)', 'USStateField': 'varchar(2)',
} }
DATA_TYPES_REVERSE = {}

2
django/models/auth.py
View File

@ -180,7 +180,7 @@ class Message(meta.Model):
class LogEntry(meta.Model): class LogEntry(meta.Model):
action_time = meta.DateTimeField(auto_now=True) action_time = meta.DateTimeField(auto_now=True)
user = meta.ForeignKey(User) 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_id = meta.TextField(blank=True, null=True)
object_repr = meta.CharField(maxlength=200) object_repr = meta.CharField(maxlength=200)
action_flag = meta.PositiveSmallIntegerField() action_flag = meta.PositiveSmallIntegerField()

2
docs/model-api.txt
View File

@ -249,7 +249,7 @@ Here are all available field types:
The admin represents this as an ``<input type="file">`` (a file-upload widget). The admin represents this as an ``<input type="file">`` (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: steps:
1. In your settings file, you'll need to define ``MEDIA_ROOT`` as the 1. In your settings file, you'll need to define ``MEDIA_ROOT`` as the