Skip to content
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

Jump to bottom

BigQuery: Fix schema recognition of struct field types #9001

Merged
merged 2 commits into from
Aug 14, 2019
Merged

BigQuery: Fix schema recognition of struct field types #9001

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0217edb
Fix schema recognition of struct field types
plamut Aug 9, 2019
565e4a7
Mark STRUCT_TYPES as private in schema.py
plamut Aug 13, 2019
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
Prev Previous commit
Mark STRUCT_TYPES as private in schema.py
  • Loading branch information
@plamut
plamut committed Aug 13, 2019
commit 565e4a78710b48696ea292398f4f4006212d3bd2
4 changes: 2 additions & 2 deletions bigquery/google/cloud/bigquery/_pandas_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ def bq_to_arrow_data_type(field):
return pyarrow.list_(inner_type)
return None

if field.field_type.upper() in schema.STRUCT_TYPES:
if field.field_type.upper() in schema._STRUCT_TYPES:
return bq_to_arrow_struct_data_type(field)

data_type_constructor = BQ_TO_ARROW_SCALARS.get(field.field_type.upper())
Expand Down Expand Up @@ -167,7 +167,7 @@ def bq_to_arrow_array(series, bq_field):
arrow_type = bq_to_arrow_data_type(bq_field)
if bq_field.mode.upper() == "REPEATED":
return pyarrow.ListArray.from_pandas(series, type=arrow_type)
if bq_field.field_type.upper() in schema.STRUCT_TYPES:
if bq_field.field_type.upper() in schema._STRUCT_TYPES:
return pyarrow.StructArray.from_pandas(series, type=arrow_type)
return pyarrow.array(series, type=arrow_type)

Expand Down
4 changes: 2 additions & 2 deletions bigquery/google/cloud/bigquery/schema.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
from google.cloud.bigquery_v2 import types


STRUCT_TYPES = ("RECORD", "STRUCT")
_STRUCT_TYPES = ("RECORD", "STRUCT")

# SQL types reference:
# https://cloud.google.com/bigquery/data-types#legacy_sql_data_types
Expand Down Expand Up @@ -152,7 +152,7 @@ def to_api_repr(self):

# If this is a RECORD type, then sub-fields are also included,
# add this to the serialized representation.
if self.field_type.upper() in STRUCT_TYPES:
if self.field_type.upper() in _STRUCT_TYPES:
answer["fields"] = [f.to_api_repr() for f in self.fields]

# Done; return the serialized dictionary.
Expand Down