mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-08-22 19:44:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fixed #25708 -- Fixed annotations with geometry values.

Browse source
This commit is contained in:
Sergey Fedoseev 2015-11-09 11:33:40 +05:00 • committed by Tim Graham
parent 4a246a02bd
commit f909fa84be
3 changed files with 39 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
django/db/models/expressions.py
View file

@ -579,6 +579,8 @@ class Value(Expression):
val = self.output_field.get_db_prep_save(val, connection=connection)
else:
val = self.output_field.get_db_prep_value(val, connection=connection)
if hasattr(self._output_field, 'get_placeholder'):
return self._output_field.get_placeholder(val, compiler, connection), [val]
if val is None:
# cx_Oracle does not always convert None to the appropriate
# NULL type (like in case expressions using numbers), so we