mirror of
https://github.com/django/django.git
synced 2025-07-04 09:49:12 +00:00
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/http-wsgi-improvements@10990 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
6713e1557d
commit
1acb38da06
@ -192,7 +192,7 @@ def _ogrinspect(data_source, model_name, geom_name='geom', layer_key=0, srid=Non
|
|||||||
elif field_type is OFTDate:
|
elif field_type is OFTDate:
|
||||||
yield ' %s = models.TimeField(%s)' % (mfield, kwargs_str[2:])
|
yield ' %s = models.TimeField(%s)' % (mfield, kwargs_str[2:])
|
||||||
else:
|
else:
|
||||||
raise TypeError('Unknown field type %s in %s' % (fld_type, mfield))
|
raise TypeError('Unknown field type %s in %s' % (field_type, mfield))
|
||||||
|
|
||||||
# TODO: Autodetection of multigeometry types (see #7218).
|
# TODO: Autodetection of multigeometry types (see #7218).
|
||||||
gtype = layer.geom_type
|
gtype = layer.geom_type
|
||||||
|
@ -689,7 +689,7 @@ class BaseQuery(object):
|
|||||||
|
|
||||||
If 'with_aliases' is true, any column names that are duplicated
|
If 'with_aliases' is true, any column names that are duplicated
|
||||||
(without the table names) are given unique aliases. This is needed in
|
(without the table names) are given unique aliases. This is needed in
|
||||||
some cases to avoid ambiguitity with nested queries.
|
some cases to avoid ambiguity with nested queries.
|
||||||
"""
|
"""
|
||||||
qn = self.quote_name_unless_alias
|
qn = self.quote_name_unless_alias
|
||||||
qn2 = self.connection.ops.quote_name
|
qn2 = self.connection.ops.quote_name
|
||||||
@ -2362,7 +2362,7 @@ class BaseQuery(object):
|
|||||||
return cursor
|
return cursor
|
||||||
if result_type == SINGLE:
|
if result_type == SINGLE:
|
||||||
if self.ordering_aliases:
|
if self.ordering_aliases:
|
||||||
return cursor.fetchone()[:-len(results.ordering_aliases)]
|
return cursor.fetchone()[:-len(self.ordering_aliases)]
|
||||||
return cursor.fetchone()
|
return cursor.fetchone()
|
||||||
|
|
||||||
# The MULTI case.
|
# The MULTI case.
|
||||||
|
Loading…
x
Reference in New Issue
Block a user