Skip to content

Commit

Permalink
feat(bigquery): non-nullable schema support for embedded fields in st…
Browse files Browse the repository at this point in the history
…ruct
  • Loading branch information
ssabdb committed Sep 21, 2024
1 parent c62efce commit f3f0229
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 0 deletions.
5 changes: 5 additions & 0 deletions ibis/backends/bigquery/tests/unit/test_datatypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,11 @@
param(dt.string, "STRING", id="string"),
param(dt.Array(dt.int64), "ARRAY<INT64>", id="array<int64>"),
param(dt.Array(dt.string), "ARRAY<STRING>", id="array<string>"),
param(
dt.Struct({"a": dt.String(nullable=False)}),
"STRUCT<`a` STRING NOT NULL>",
id="struct<a: !string>",
),
param(
dt.Struct.from_tuples(
[("a", dt.int64), ("b", dt.string), ("c", dt.Array(dt.string))]
Expand Down
18 changes: 18 additions & 0 deletions ibis/backends/sql/datatypes.py
Original file line number Diff line number Diff line change
Expand Up @@ -944,6 +944,24 @@ def _from_ibis_GeoSpatial(cls, dtype: dt.GeoSpatial) -> sge.DataType:
f"Current geotype: {dtype.geotype}, Current srid: {dtype.srid}"
)

@classmethod
def _from_ibis_Struct(cls, dtype: dt.Struct) -> sge.DataType:
fields = [
sge.ColumnDef(
# always quote struct fields to allow reserved words as field names
this=sg.to_identifier(name, quoted=True),
# Bigquery supports embeddable nulls
kind=cls.from_ibis(field),
constraints=(
None
if field.nullable
else [sge.ColumnConstraint(kind=sge.NotNullColumnConstraint())]
),
)
for name, field in dtype.items()
]
return sge.DataType(this=typecode.STRUCT, expressions=fields, nested=True)


class BigQueryUDFType(BigQueryType):
@classmethod
Expand Down

0 comments on commit f3f0229

Please sign in to comment.