Skip to content

removed try/except wrapper on upsert method, added _process_table_error instead of create call #13815

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
2 commits merged into from
Sep 16, 2020
Merged

removed try/except wrapper on upsert method, added _process_table_error instead of create call #13815

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
e6f9bac
removed try/except wrapper on upsert method, added _process_table_err…
seankane-msft Sep 16, 2020
7413c82
forgot a newline
seankane-msft Sep 16, 2020
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
10 changes: 2 additions & 8 deletions sdk/tables/azure-data-tables/azure/data/tables/_table_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,6 @@ def upsert_entity( # pylint:disable=R1710
partition_key = entity['PartitionKey']
row_key = entity['RowKey']
entity = _add_entity_properties(entity)

try:
metadata = None
if mode is UpdateMode.MERGE:
Expand All @@ -556,10 +555,5 @@ def upsert_entity( # pylint:disable=R1710
raise ValueError("""Update mode {} is not supported.
For a list of supported modes see the UpdateMode enum""".format(mode))
return _trim_service_metadata(metadata)
except ResourceNotFoundError:
return self.create_entity(
partition_key=partition_key,
row_key=row_key,
table_entity_properties=entity,
**kwargs
)
except HttpResponseError as error:
_process_table_error(error)
9 changes: 2 additions & 7 deletions sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,10 +567,5 @@ async def upsert_entity(
raise ValueError("""Update mode {} is not supported.
For a list of supported modes see the UpdateMode enum""".format(mode))
return _trim_service_metadata(metadata)
except ResourceNotFoundError:
return await self.create_entity(
partition_key=partition_key,
row_key=row_key,
table_entity_properties=entity,
**kwargs
)
except HttpResponseError as error:
_process_table_error(error)