Address review comments

Author: trollyxia

google/cloud/bigtable/data/_async/client.py

@@ -758,6 +758,10 @@ async def execute_query(
                             # Nested field in a MAP column named 'my_map'
                             "my_map.key": my_pb2.MapKeyEnum, # If map keys were enums
                             "my_map.value": my_pb2.MapValueMessage,
+
+                            # PROTO field inside a STRUCT, where the STRUCT is the value in a MAP column
+                            "struct_map.value.nested_proto_field": my_pb2.DeeplyNestedProto,
+                            "struct_map.value.nested_enum_field": my_pb2.DeeplyNestedEnum
                         }
 
         Returns:

google/cloud/bigtable/data/_sync_autogen/client.py

@@ -585,6 +585,10 @@ def execute_query(
                             # Nested field in a MAP column named 'my_map'
                             "my_map.key": my_pb2.MapKeyEnum, # If map keys were enums
                             "my_map.value": my_pb2.MapValueMessage,
+
+                            # PROTO field inside a STRUCT, where the STRUCT is the value in a MAP column
+                            "struct_map.value.nested_proto_field": my_pb2.DeeplyNestedProto,
+                            "struct_map.value.nested_enum_field": my_pb2.DeeplyNestedEnum
                         }
 
         Returns:

tests/unit/data/execute_query/test_query_result_parsing_utils.py

@@ -523,6 +523,10 @@ def test__array_of_structs_with_proto_and_enum(self):
                                     "field_name": "enum_field",
                                     "type_": enum_type(),
                                 },
+                                {
+                                    "field_name": None,
+                                    "type_": proto_type(),
+                                },
                             ]
                         }
                     }
@@ -538,6 +542,7 @@ def test__array_of_structs_with_proto_and_enum(self):
                                 "values": [
                                     {"bytes_value": singer1.SerializeToString()},
                                     {"int_value": 0},  # POP
+                                    {"bytes_value": singer1.SerializeToString()},
                                 ]
                             }
                         },
@@ -546,6 +551,7 @@ def test__array_of_structs_with_proto_and_enum(self):
                                 "values": [
                                     {"bytes_value": singer2.SerializeToString()},
                                     {"int_value": 1},  # JAZZ
+                                    {"bytes_value": singer2.SerializeToString()},
                                 ]
                             }
                         },
@@ -559,6 +565,7 @@ def test__array_of_structs_with_proto_and_enum(self):
         assert type(metadata_type.element_type) is SqlType.Struct
         assert type(metadata_type.element_type["proto_field"]) is SqlType.Proto
         assert type(metadata_type.element_type["enum_field"]) is SqlType.Enum
+        assert type(metadata_type.element_type[2]) is SqlType.Proto
 
         # without proto definition
         result = _parse_pb_value_to_python_value(
@@ -569,9 +576,11 @@ def test__array_of_structs_with_proto_and_enum(self):
         assert isinstance(result[0], Struct)
         assert result[0]["proto_field"] == singer1.SerializeToString()
         assert result[0]["enum_field"] == 0
+        assert result[0][2] == singer1.SerializeToString()
         assert isinstance(result[1], Struct)
         assert result[1]["proto_field"] == singer2.SerializeToString()
         assert result[1]["enum_field"] == 1
+        assert result[1][2] == singer2.SerializeToString()
 
         # with proto definition
         result = _parse_pb_value_to_python_value(
@@ -581,16 +590,19 @@ def test__array_of_structs_with_proto_and_enum(self):
             {
                 "array_field.proto_field": singer_pb2.Singer(),
                 "array_field.enum_field": singer_pb2.Genre,
+                "array_field": singer_pb2.Singer(),
             },
         )
         assert isinstance(result, list)
         assert len(result) == 2
         assert isinstance(result[0], Struct)
         assert result[0]["proto_field"] == singer1
         assert result[0]["enum_field"] == "POP"
+        assert result[0][2] == singer1
         assert isinstance(result[1], Struct)
         assert result[1]["proto_field"] == singer2
         assert result[1]["enum_field"] == "JAZZ"
+        assert result[1][2] == singer2
 
     def test__map(self):
         _type = PBType(