Skip to content

fix: remove additional merge_values call to prevent double parsing #239

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

Closed
larkee wants to merge 1 commit into from
Closed

fix: remove additional merge_values call to prevent double parsing #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion google/cloud/spanner_v1/streamed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def _merge_chunk(self, value):
field = self.fields[current_column]
merged = _merge_by_type(self._pending_chunk, value, field.type_)
self._pending_chunk = None
return _parse_value(merged, field.type_)
return merged

def _merge_values(self, values):
"""Merge values into rows.
Expand Down
12 changes: 6 additions & 6 deletions tests/unit/test_streamed.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ def test__merge_chunk_int64(self):
chunk = 13

merged = streamed._merge_chunk(chunk)
self.assertEqual(merged, 4213)
self.assertEqual(merged, "4213")
self.assertIsNone(streamed._pending_chunk)

def test__merge_chunk_float64_nan_string(self):
Expand Down Expand Up @@ -244,9 +244,9 @@ def test__merge_chunk_string_w_bytes(self):

self.assertEqual(
merged,
b"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACXBIWXMAAAsTAAAL"
b"EwEAmpwYAAAA\nB3RJTUUH4QQGFwsBTL3HMwAAABJpVFh0Q29tbWVudAAAAAAAU0"
b"FNUExFMG3E+AAAAApJREFUCNdj\nYAAAAAIAAeIhvDMAAAAASUVORK5CYII=\n",
"iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAAAAAA6fptVAAAACXBIWXMAAAsTAAAL"
"EwEAmpwYAAAA\nB3RJTUUH4QQGFwsBTL3HMwAAABJpVFh0Q29tbWVudAAAAAAAU0"
"FNUExFMG3E+AAAAApJREFUCNdj\nYAAAAAIAAeIhvDMAAAAASUVORK5CYII=\n",
)
self.assertIsNone(streamed._pending_chunk)

Expand Down Expand Up @@ -278,7 +278,7 @@ def test__merge_chunk_array_of_int(self):

merged = streamed._merge_chunk(chunk)

expected = [0, 1, 23, 4, 5]
expected = [0, 1, "23", 4, 5]
self.assertEqual(merged, expected)
self.assertIsNone(streamed._pending_chunk)

Expand Down Expand Up @@ -371,7 +371,7 @@ def test__merge_chunk_array_of_array_of_int(self):

expected = [
[0, 1],
[23],
["23"],
[4, 5],
]

Expand Down