Disable proto/enum parsing for unnamed proto/enum fields inside a struct

Author: trollyxia

google/cloud/bigtable/data/execute_query/_query_result_parsing_utils.py

@@ -116,13 +116,11 @@ def _parse_struct_type(
     for value, field in zip(value.array_value.values, metadata_type.fields):
         field_name, field_type = field
         nested_column_name: str | None
-        if column_name is None:
-            nested_column_name = None
-        else:
+        if column_name and field_name:
             # qualify the column name for nested lookups
-            nested_column_name = (
-                f"{column_name}.{field_name}" if field_name else column_name
-            )
+            nested_column_name = f"{column_name}.{field_name}"
+        else:
+            nested_column_name = None
         struct.add_field(
             field_name,
             _parse_pb_value_to_python_value(

tests/unit/data/execute_query/test_query_result_parsing_utils.py

@@ -365,34 +365,14 @@ def test__struct_with_proto_and_enum(self):
         assert result[2] == 0
         assert result[3] == 1
 
-        # with proto definition and Singer definition for unnamed nested fields
-        result = _parse_pb_value_to_python_value(
-            value._pb,
-            metadata_type,
-            "struct_field",
-            {
-                "struct_field.field1": singer_pb2.Singer(),
-                "struct_field.field2": singer_pb2.Genre,
-                "struct_field": singer_pb2.Singer(),
-            },
-        )
-        assert isinstance(result, Struct)
-        assert result["field1"] == singer1
-        assert result["field2"] == "POP"
-        assert result[0] == singer1
-        assert result[1] == singer2
-        assert result[2] == "POP"
-        assert result[3] == 1
-
-        # with proto definition and Genre definition for unnamed nested fields
+        # with proto definition
         result = _parse_pb_value_to_python_value(
             value._pb,
             metadata_type,
             "struct_field",
             {
                 "struct_field.field1": singer_pb2.Singer(),
                 "struct_field.field2": singer_pb2.Genre,
-                "struct_field": singer_pb2.Genre,
             },
         )
         assert isinstance(result, Struct)
@@ -401,7 +381,7 @@ def test__struct_with_proto_and_enum(self):
         assert result[0] == singer1
         assert result[1] == singer2.SerializeToString()
         assert result[2] == "POP"
-        assert result[3] == "JAZZ"
+        assert result[3] == 1
 
     def test__array_of_structs(self):
         _type = PBType(
@@ -590,19 +570,21 @@ 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(),
+                "array_field": singer_pb2.Singer(),  # unused
             },
         )
         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
+        # unnamed proto fields won't get parsed
+        assert result[0][2] == singer1.SerializeToString()
         assert isinstance(result[1], Struct)
         assert result[1]["proto_field"] == singer2
         assert result[1]["enum_field"] == "JAZZ"
-        assert result[1][2] == singer2
+        # unnamed proto fields won't get parsed
+        assert result[1][2] == singer2.SerializeToString()
 
     def test__map(self):
         _type = PBType(