From 69534d623df020ffc8a25b1aca28d8313bd13441 Mon Sep 17 00:00:00 2001 From: IlyaFaer Date: Thu, 7 Jan 2021 11:53:35 +0300 Subject: [PATCH 1/3] fix: use the original protobuf --- google/cloud/spanner_dbapi/cursor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/google/cloud/spanner_dbapi/cursor.py b/google/cloud/spanner_dbapi/cursor.py index 254eb5734a..8b20629e58 100644 --- a/google/cloud/spanner_dbapi/cursor.py +++ b/google/cloud/spanner_dbapi/cursor.py @@ -99,7 +99,7 @@ def description(self): # Size of the SQL type of the column. display_size=code_to_display_size.get(field.type_.code), # Client perceived size of the column. - internal_size=field.ByteSize(), + internal_size=field.pb().ByteSize(), ) columns.append(column_info) From a23dbb4d00f04a952aece89a2d71a8ccc34325e0 Mon Sep 17 00:00:00 2001 From: IlyaFaer Date: Thu, 7 Jan 2021 12:08:41 +0300 Subject: [PATCH 2/3] use pb --- google/cloud/spanner_dbapi/cursor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google/cloud/spanner_dbapi/cursor.py b/google/cloud/spanner_dbapi/cursor.py index 8b20629e58..8af11bdaa4 100644 --- a/google/cloud/spanner_dbapi/cursor.py +++ b/google/cloud/spanner_dbapi/cursor.py @@ -89,7 +89,7 @@ def description(self): if not (self._result_set and self._result_set.metadata): return None - row_type = self._result_set.metadata.row_type + row_type = self._result_set.metadata.pb().row_type columns = [] for field in row_type.fields: @@ -99,7 +99,7 @@ def description(self): # Size of the SQL type of the column. display_size=code_to_display_size.get(field.type_.code), # Client perceived size of the column. - internal_size=field.pb().ByteSize(), + internal_size=field.ByteSize(), ) columns.append(column_info) From 04a3e6616491cb2ea6a9ad122d316c5747f26171 Mon Sep 17 00:00:00 2001 From: IlyaFaer Date: Thu, 7 Jan 2021 12:20:02 +0300 Subject: [PATCH 3/3] use pb --- google/cloud/spanner_dbapi/cursor.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/google/cloud/spanner_dbapi/cursor.py b/google/cloud/spanner_dbapi/cursor.py index 8af11bdaa4..c2e893a098 100644 --- a/google/cloud/spanner_dbapi/cursor.py +++ b/google/cloud/spanner_dbapi/cursor.py @@ -89,7 +89,7 @@ def description(self): if not (self._result_set and self._result_set.metadata): return None - row_type = self._result_set.metadata.pb().row_type + row_type = self._result_set.metadata.row_type columns = [] for field in row_type.fields: @@ -99,7 +99,7 @@ def description(self): # Size of the SQL type of the column. display_size=code_to_display_size.get(field.type_.code), # Client perceived size of the column. - internal_size=field.ByteSize(), + internal_size=field._pb.ByteSize(), ) columns.append(column_info)