Skip to content
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.

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

fix(targets): Safely skip parsing record field as date-time if it is missing in schema #1844

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions singer_sdk/sinks/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -365,12 +365,15 @@ def _parse_timestamps_in_record(
schema: TODO
treatment: TODO
"""
for key in record:
for key, value in record.items():
if key not in schema["properties"]:
self.logger.warning("No schema for record field '%s'", key)
continue
datelike_type = get_datelike_property_type(schema["properties"][key])
if datelike_type:
date_val = record[key]
date_val = value
try:
if record[key] is not None:
if value is not None:
date_val = parser.parse(date_val)
except parser.ParserError as ex:
date_val = handle_invalid_timestamp_in_record(
Expand Down
2 changes: 2 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

from singer_sdk import SQLConnector
from singer_sdk import typing as th
from singer_sdk.helpers._typing import DatetimeErrorTreatmentEnum
from singer_sdk.helpers.capabilities import PluginCapabilities
from singer_sdk.sinks import BatchSink, SQLSink
from singer_sdk.target_base import SQLTarget, Target
Expand Down Expand Up @@ -75,6 +76,7 @@ class BatchSinkMock(BatchSink):
"""A mock Sink class."""

name = "batch-sink-mock"
datetime_error_treatment = DatetimeErrorTreatmentEnum.MAX

def __init__(
self,
Expand Down
41 changes: 41 additions & 0 deletions tests/core/sinks/test_validation.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
from __future__ import annotations

import datetime

from tests.conftest import BatchSinkMock, TargetMock


def test_validate_record():
target = TargetMock()
sink = BatchSinkMock(
target,
"users",
{
"type": "object",
"properties": {
"id": {"type": "integer"},
"created_at": {"type": "string", "format": "date-time"},
"invalid_datetime": {"type": "string", "format": "date-time"},
},
},
["id"],
)

record = {
"id": 1,
"created_at": "2021-01-01T00:00:00+00:00",
"missing_datetime": "2021-01-01T00:00:00+00:00",
"invalid_datetime": "not a datetime",
}
updated_record = sink._validate_and_parse(record)

assert updated_record["created_at"] == datetime.datetime(
2021,
1,
1,
0,
0,
tzinfo=datetime.timezone.utc,
)
assert updated_record["missing_datetime"] == "2021-01-01T00:00:00+00:00"
assert updated_record["invalid_datetime"] == "9999-12-31 23:59:59.999999"