[Tables] Fix bug in update mode (#20264)

* Fix bug in update mode * Updated codeowners
Azure · Sep 29, 2021 · 86d042d · 86d042d
1 parent eab3162
commit 86d042d
Show file tree

Hide file tree

Showing 10 changed files with 637 additions and 19 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -119,7 +119,7 @@
 /sdk/translation/                                                    @kristapratico @mohamedshabanofficial
 
 # PRLabel: %Tables
-/sdk/tables/                                                         @seankane-msft
+/sdk/tables/                                                         @annatisch @YalinLi0312
 
 # PRLabel: %Media
 /sdk/media/                                                          @naiteeks @bennage @giakas

diff --git a/sdk/tables/azure-data-tables/CHANGELOG.md b/sdk/tables/azure-data-tables/CHANGELOG.md
@@ -8,6 +8,8 @@
 
 ### Bugs Fixed
 
+- Resolved bug where strings couldn't be used instead of enum value for entity Update Mode (#20247).
+
 ### Other Changes
 
 - Bumped dependency on `msrest` to `>=0.6.21`

diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_table_batch.py b/sdk/tables/azure-data-tables/azure/data/tables/_table_batch.py
@@ -261,7 +261,7 @@ def update(
         partition_key = temp["PartitionKey"]
         row_key = temp["RowKey"]
         temp = _add_entity_properties(temp)
-        if mode is UpdateMode.REPLACE:
+        if mode == UpdateMode.REPLACE:
             self._batch_update_entity(
                 table=self.table_name,
                 partition_key=partition_key,
@@ -270,7 +270,7 @@ def update(
                 table_entity_properties=temp,
                 **kwargs
             )
-        elif mode is UpdateMode.MERGE:
+        elif mode == UpdateMode.MERGE:
             self._batch_merge_entity(
                 table=self.table_name,
                 partition_key=partition_key,
@@ -279,6 +279,8 @@ def update(
                 table_entity_properties=temp,
                 **kwargs
             )
+        else:
+            raise ValueError("Mode type '{}' is not supported.".format(mode))
 
     def _batch_update_entity(
         self,
@@ -668,19 +670,21 @@ def upsert(
         row_key = temp["RowKey"]
         temp = _add_entity_properties(temp)
 
-        if mode is UpdateMode.MERGE:
+        if mode == UpdateMode.MERGE:
             self._batch_merge_entity(
                 table=self.table_name,
                 partition_key=partition_key,
                 row_key=row_key,
                 table_entity_properties=temp,
                 **kwargs
             )
-        elif mode is UpdateMode.REPLACE:
+        elif mode == UpdateMode.REPLACE:
             self._batch_update_entity(
                 table=self.table_name,
                 partition_key=partition_key,
                 row_key=row_key,
                 table_entity_properties=temp,
                 **kwargs
             )
+        else:
+            raise ValueError("Mode type '{}' is not supported.".format(mode))
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/_table_client.py b/sdk/tables/azure-data-tables/azure/data/tables/_table_client.py
@@ -466,7 +466,7 @@ def update_entity(
         try:
             metadata = None
             content = None
-            if mode is UpdateMode.REPLACE:
+            if mode == UpdateMode.REPLACE:
                 metadata, content = self._client.table.update_entity(  # type: ignore
                     table=self.table_name,
                     partition_key=partition_key,
@@ -476,7 +476,7 @@ def update_entity(
                     cls=kwargs.pop("cls", _return_headers_and_deserialized),
                     **kwargs
                 )
-            elif mode is UpdateMode.MERGE:
+            elif mode == UpdateMode.MERGE:
                 metadata, content = self._client.table.merge_entity(  # type: ignore
                     table=self.table_name,
                     partition_key=partition_key,
@@ -487,7 +487,7 @@ def update_entity(
                     **kwargs
                 )
             else:
-                raise ValueError("Mode type is not supported")
+                raise ValueError("Mode type '{}' is not supported.".format(mode))
         except HttpResponseError as error:
             _process_table_error(error)
         return _trim_service_metadata(metadata, content=content)  # type: ignore
@@ -654,7 +654,7 @@ def upsert_entity(
         try:
             metadata = None
             content = None
-            if mode is UpdateMode.MERGE:
+            if mode == UpdateMode.MERGE:
                 metadata, content = self._client.table.merge_entity(  # type: ignore
                     table=self.table_name,
                     partition_key=partition_key,
@@ -663,7 +663,7 @@ def upsert_entity(
                     cls=kwargs.pop("cls", _return_headers_and_deserialized),
                     **kwargs
                 )
-            elif mode is UpdateMode.REPLACE:
+            elif mode == UpdateMode.REPLACE:
                 metadata, content = self._client.table.update_entity(  # type: ignore
                     table=self.table_name,
                     partition_key=partition_key,

diff --git a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_batch_async.py b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_batch_async.py
@@ -233,7 +233,7 @@ def update(
         partition_key = temp["PartitionKey"]
         row_key = temp["RowKey"]
         temp = _add_entity_properties(temp)
-        if mode is UpdateMode.REPLACE:
+        if mode == UpdateMode.REPLACE:
             self._batch_update_entity(
                 table=self.table_name,
                 partition_key=partition_key,
@@ -242,7 +242,7 @@ def update(
                 table_entity_properties=temp,
                 **kwargs
             )
-        elif mode is UpdateMode.MERGE:
+        elif mode == UpdateMode.MERGE:
             self._batch_merge_entity(
                 table=self.table_name,
                 partition_key=partition_key,
@@ -251,6 +251,8 @@ def update(
                 table_entity_properties=temp,
                 **kwargs
             )
+        else:
+            raise ValueError("Mode type '{}' is not supported.".format(mode))
 
     def _batch_update_entity(
         self,
@@ -631,19 +633,21 @@ def upsert(
         row_key = temp["RowKey"]
         temp = _add_entity_properties(temp)
 
-        if mode is UpdateMode.MERGE:
+        if mode == UpdateMode.MERGE:
             self._batch_merge_entity(
                 table=self.table_name,
                 partition_key=partition_key,
                 row_key=row_key,
                 table_entity_properties=temp,
                 **kwargs
             )
-        elif mode is UpdateMode.REPLACE:
+        elif mode == UpdateMode.REPLACE:
             self._batch_update_entity(
                 table=self.table_name,
                 partition_key=partition_key,
                 row_key=row_key,
                 table_entity_properties=temp,
                 **kwargs
             )
+        else:
+            raise ValueError("Mode type '{}' is not supported.".format(mode))
diff --git a/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py b/sdk/tables/azure-data-tables/azure/data/tables/aio/_table_client_async.py
@@ -448,7 +448,7 @@ async def update_entity(
         try:
             metadata = None
             content = None
-            if mode is UpdateMode.REPLACE:
+            if mode == UpdateMode.REPLACE:
                 metadata, content = await self._client.table.update_entity(  # type: ignore
                     table=self.table_name,
                     partition_key=partition_key,
@@ -458,7 +458,7 @@ async def update_entity(
                     cls=kwargs.pop("cls", _return_headers_and_deserialized),
                     **kwargs
                 )
-            elif mode is UpdateMode.MERGE:
+            elif mode == UpdateMode.MERGE:
                 metadata, content = await self._client.table.merge_entity(  # type: ignore
                     table=self.table_name,
                     partition_key=partition_key,
@@ -469,7 +469,7 @@ async def update_entity(
                     **kwargs
                 )
             else:
-                raise ValueError("Mode type is not supported")
+                raise ValueError("Mode type '{}' is not supported.".format(mode))
         except HttpResponseError as error:
             _process_table_error(error)
         return _trim_service_metadata(metadata, content=content)  # type: ignore
@@ -632,7 +632,7 @@ async def upsert_entity(
         try:
             metadata = None
             content = None
-            if mode is UpdateMode.MERGE:
+            if mode == UpdateMode.MERGE:
                 metadata, content = await self._client.table.merge_entity(  # type: ignore
                     table=self.table_name,
                     partition_key=partition_key,
@@ -641,7 +641,7 @@ async def upsert_entity(
                     cls=kwargs.pop("cls", _return_headers_and_deserialized),
                     **kwargs
                 )
-            elif mode is UpdateMode.REPLACE:
+            elif mode == UpdateMode.REPLACE:
                 metadata, content = await self._client.table.update_entity(  # type: ignore
                     table=self.table_name,
                     partition_key=partition_key,