File tree Expand file tree Collapse file tree 3 files changed +7
-4
lines changed Expand file tree Collapse file tree 3 files changed +7
-4
lines changed Original file line number Diff line number Diff line change @@ -205,7 +205,7 @@ def _parse_value_pb(value_pb, field_type):
205
205
_parse_value_pb (item_pb , field_type .struct_type .fields [i ].type_ )
206
206
for (i , item_pb ) in enumerate (value_pb .list_value .values )
207
207
]
208
- elif field_type . code == TypeCode .NUMERIC :
208
+ elif type_code == TypeCode .NUMERIC :
209
209
return decimal .Decimal (value_pb .string_value )
210
210
else :
211
211
raise ValueError ("Unknown type: %s" % (field_type ,))
Original file line number Diff line number Diff line change 18
18
from google .protobuf .struct_pb2 import Value
19
19
from google .cloud import exceptions
20
20
from google .cloud .spanner_v1 import PartialResultSet
21
+ from google .cloud .spanner_v1 import ResultSetMetadata
21
22
from google .cloud .spanner_v1 import TypeCode
22
23
import six
23
24
@@ -65,7 +66,9 @@ def metadata(self):
65
66
:rtype: :class:`~google.cloud.spanner_v1.types.ResultSetMetadata`
66
67
:returns: structure describing the results
67
68
"""
68
- return self ._metadata
69
+ if self ._metadata :
70
+ return ResultSetMetadata .wrap (self ._metadata )
71
+ return None
69
72
70
73
@property
71
74
def stats (self ):
@@ -119,7 +122,7 @@ def _consume_next(self):
119
122
response_pb = PartialResultSet .pb (response )
120
123
121
124
if self ._metadata is None : # first response
122
- metadata = self ._metadata = response .metadata
125
+ metadata = self ._metadata = response_pb .metadata
123
126
124
127
source = self ._source
125
128
if source is not None and source ._transaction_id is None :
Original file line number Diff line number Diff line change @@ -147,7 +147,7 @@ def test_properties_set(self):
147
147
metadata = streamed ._metadata = self ._make_result_set_metadata (FIELDS )
148
148
stats = streamed ._stats = self ._make_result_set_stats ()
149
149
self .assertEqual (list (streamed .fields ), FIELDS )
150
- self .assertIs (streamed .metadata , metadata )
150
+ self .assertIs (streamed .metadata . _pb , metadata )
151
151
self .assertIs (streamed .stats , stats )
152
152
153
153
def test__merge_chunk_bool (self ):
You can’t perform that action at this time.
0 commit comments