Skip to content

django: fix DurationField arithmetic #209

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 17, 2019
Merged

django: fix DurationField arithmetic #209

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0507331
django: fix annotating DateTimeField + DurationField crash
timgraham Dec 17, 2019
3c06f88
django: implement DatabaseOperations.date_interval_sql()
timgraham Dec 17, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions spanner/django/features.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
# https://github.com/orijtech/spanner-orm/issues/155
'timezones.tests.LegacyDatabaseTests.test_raw_sql',
'timezones.tests.NewDatabaseTests.test_raw_sql',
# implement DatabaseOperations.date_interval_sql()
# https://github.com/orijtech/spanner-orm/issues/184
'timezones.tests.NewDatabaseTests.test_update_with_timedelta',
# Unable to infer type for parameter:
# https://github.com/orijtech/spanner-orm/issues/185
'timezones.tests.LegacyDatabaseTests.test_cursor_execute_returns_naive_datetime',
Expand Down Expand Up @@ -92,9 +89,6 @@ class DatabaseFeatures(BaseDatabaseFeatures):
'lookup.test_decimalfield.DecimalFieldLookupTests.test_lt',
'lookup.test_decimalfield.DecimalFieldLookupTests.test_lte',
'model_fields.test_decimalfield.DecimalFieldTests.test_filter_with_strings',
# annotating DateTimeField + DurationField crashes:
# https://github.com/orijtech/spanner-orm/issues/202
'annotations.tests.NonAggregateAnnotationTestCase.test_mixed_type_annotation_date_interval',
# using NULL with + crashes: https://github.com/orijtech/spanner-orm/issues/201
'annotations.tests.NonAggregateAnnotationTestCase.test_combined_annotation_commutative',
# Spanner loses DecimalField precision due to conversion to float:
Expand Down
16 changes: 16 additions & 0 deletions spanner/django/operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@

from django.conf import settings
from django.db.backends.base.operations import BaseDatabaseOperations
from django.db.utils import DatabaseError
from django.utils import timezone
from django.utils.duration import duration_microseconds
from spanner.dbapi.parse_utils import DateStr, TimestampStr, escape_name


Expand Down Expand Up @@ -173,6 +175,20 @@ def datetime_trunc_sql(self, lookup_type, field_name, tzname):
sql = 'TIMESTAMP_ADD(' + sql + ', INTERVAL 1 DAY)'
return sql

def date_interval_sql(self, timedelta):
return 'INTERVAL %s MICROSECOND' % duration_microseconds(timedelta)

def format_for_duration_arithmetic(self, sql):
return 'INTERVAL %s MICROSECOND' % sql

def combine_duration_expression(self, connector, sub_expressions):
if connector == '+':
return 'TIMESTAMP_ADD(' + ', '.join(sub_expressions) + ')'
elif connector == '-':
return 'TIMESTAMP_SUB(' + ', '.join(sub_expressions) + ')'
else:
raise DatabaseError('Invalid connector for timedelta: %s.' % connector)

def lookup_cast(self, lookup_type, internal_type=None):
# Cast text lookups to string to allow things like filter(x__contains=4)
if lookup_type in ('contains', 'icontains', 'startswith', 'istartswith',
Expand Down