Skip to content

model: fix default Edm.DateTimeOffset value (#195) #197

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
phanak-sap merged 2 commits into from
Jan 31, 2022
Merged

model: fix default Edm.DateTimeOffset value (#195) #197

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
9163079
model: fix default Edm.DateTimeOffset value (#195)
rettichschnidi Jan 26, 2022
a264bac
model: adjust default Edm.DateTime value (#79)
rettichschnidi Jan 28, 2022
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
5 changes: 5 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

## [Unreleased]

### Fixed
- Fix Increased robustness when schema with empty properties is returned
- Use valid default value for Edm.DateTimeOffset - Reto Schneider

### Changed
- Adjusted Edm.DateTime default value to January 1, 1753 A.D - Reto Schneider

## [1.8.0]

Expand Down
4 changes: 2 additions & 2 deletions pyodata/v2/model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ def _build_types():
Types.register_type(Typ('Edm.Binary', 'binary\'\'', EdmBinaryTypTraits('(?:binary|X)')))
Types.register_type(Typ('Edm.Boolean', 'false', EdmBooleanTypTraits()))
Types.register_type(Typ('Edm.Byte', '0'))
Types.register_type(Typ('Edm.DateTime', 'datetime\'2000-01-01T00:00\'', EdmDateTimeTypTraits()))
Types.register_type(Typ('Edm.DateTime', 'datetime\'1753-01-01T00:00\'', EdmDateTimeTypTraits()))
Types.register_type(Typ('Edm.Decimal', '0.0M'))
Types.register_type(Typ('Edm.Double', '0.0d', EdmFPNumTypTraits.edm_double()))
Types.register_type(Typ('Edm.Single', '0.0f', EdmFPNumTypTraits.edm_single()))
Expand All @@ -200,7 +200,7 @@ def _build_types():
Types.register_type(Typ('Edm.String', '\'\'', EdmStringTypTraits()))
Types.register_type(Typ('Edm.Time', 'time\'PT00H00M\''))
Types.register_type(
Typ('Edm.DateTimeOffset', 'datetimeoffset\'0000-00-00T00:00:00Z\'', EdmDateTimeOffsetTypTraits()))
Typ('Edm.DateTimeOffset', 'datetimeoffset\'1753-01-01T00:00:00Z\'', EdmDateTimeOffsetTypTraits()))

@staticmethod
def register_type(typ):
Expand Down
26 changes: 25 additions & 1 deletion tests/test_service_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2345,6 +2345,28 @@ def test_create_entity_with_naive_datetime(service):
assert str(e_info.value).startswith('Emd.DateTime accepts only UTC')


@responses.activate
def test_null_datetime(service):
"""Test default value of DateTime. Default value gets inserted when a property is null"""

responses.add(
responses.GET,
f"{service.url}/TemperatureMeasurements",
headers={'Content-type': 'application/json'},
json={'d': {
'results': [
{
'Date': None,
}
]
}},
status=200)

result = service.entity_sets.TemperatureMeasurements.get_entities().execute()

assert result[0].Date == datetime.datetime(1753, 1, 1, 0, 0, 0, tzinfo=datetime.timezone.utc)


@responses.activate
def test_parsing_of_datetime_before_unix_time(service):
"""Test DateTime handling of time before 1970"""
Expand Down Expand Up @@ -2379,7 +2401,9 @@ def test_parsing_of_datetime_before_unix_time(service):
('/Date(981173106000+0001)/', datetime.datetime(2001, 2, 3, 4, 5, 6,
tzinfo=datetime.timezone(datetime.timedelta(minutes=1)))),
('/Date(981173106000-0001)/', datetime.datetime(2001, 2, 3, 4, 5, 6,
tzinfo=datetime.timezone(-datetime.timedelta(minutes=1))))])
tzinfo=datetime.timezone(-datetime.timedelta(minutes=1)))),
(None, datetime.datetime(1753, 1, 1, 0, 0, 0, tzinfo=datetime.timezone.utc)),
])
def test_parsing_of_datetimeoffset(service, json_input, expected):
"""Test DateTimeOffset handling."""

Expand Down