Skip to content

Commit

Permalink
Merge branch 'main' into 2155-target-set-batch-size-rows
Browse files Browse the repository at this point in the history
  • Loading branch information
edgarrmondragon authored Feb 19, 2024
2 parents 51f2e57 + da62f9a commit 84793a9
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion singer_sdk/helpers/_typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ def append_type(type_dict: dict, new_type: str) -> dict:
return result

if "oneOf" in result:
result["oneOf"].append(new_type)
result["oneOf"].append({"type": new_type})
return result

if "type" in result:
Expand Down
2 changes: 1 addition & 1 deletion tests/core/test_typing.py
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ def test_to_sql_type(jsonschema_type, expected):
),
pytest.param(
{"oneOf": [{"type": "integer"}, {"type": "number"}]},
{"oneOf": [{"type": "integer"}, {"type": "number"}, "null"]},
{"oneOf": [{"type": "integer"}, {"type": "number"}, {"type": "null"}]},
id="oneOf",
),
],
Expand Down

0 comments on commit 84793a9

Please sign in to comment.