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

feat: convert BIGNUMERIC values to decimal objects #414

Merged
merged 5 commits into from
Dec 4, 2020
Merged

feat: convert BIGNUMERIC values to decimal objects #414

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c377219
feat: convert `BIGNUMERIC` values to decimal objects
tswast Dec 3, 2020
a30ddaf
test: add unit tests for BIGNUMERIC
tswast Dec 4, 2020
bb12162
Merge branch 'master' into tswast-patch-1-1
tswast Dec 4, 2020
9da3953
blacken
tswast Dec 4, 2020
1819a8f
Merge branch 'tswast-patch-1-1' of github.com:googleapis/python-bigqu…
tswast Dec 4, 2020
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: 2 additions & 0 deletions google/cloud/bigquery/_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,7 @@ def _record_from_json(value, field):
"FLOAT": _float_from_json,
"FLOAT64": _float_from_json,
"NUMERIC": _decimal_from_json,
"BIGNUMERIC": _decimal_from_json,
"BOOLEAN": _bool_from_json,
"BOOL": _bool_from_json,
"STRING": _string_from_json,
Expand Down Expand Up @@ -347,6 +348,7 @@ def _time_to_json(value):
"FLOAT": _float_to_json,
"FLOAT64": _float_to_json,
"NUMERIC": _decimal_to_json,
"BIGNUMERIC": _decimal_to_json,
"BOOLEAN": _bool_to_json,
"BOOL": _bool_to_json,
"BYTES": _bytes_to_json,
Expand Down
99 changes: 76 additions & 23 deletions tests/unit/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6290,38 +6290,43 @@ def test_insert_rows_w_numeric(self):
creds = _make_credentials()
http = object()
client = self._make_one(project=project, credentials=creds, _http=http)
conn = client._connection = make_connection({})
table_ref = DatasetReference(project, ds_id).table(table_id)
schema = [SchemaField("account", "STRING"), SchemaField("balance", "NUMERIC")]
insert_table = table.Table(table_ref, schema=schema)
rows = [
("Savings", decimal.Decimal("23.47")),
("Checking", decimal.Decimal("1.98")),
("Mortgage", decimal.Decimal("-12345678909.87654321")),
]
schemas = [
[SchemaField("account", "STRING"), SchemaField("balance", "NUMERIC")],
[SchemaField("account", "STRING"), SchemaField("balance", "BIGNUMERIC")],
]

with mock.patch("uuid.uuid4", side_effect=map(str, range(len(rows)))):
errors = client.insert_rows(insert_table, rows)
for schema in schemas:
conn = client._connection = make_connection({})

self.assertEqual(len(errors), 0)
rows_json = [
{"account": "Savings", "balance": "23.47"},
{"account": "Checking", "balance": "1.98"},
{"account": "Mortgage", "balance": "-12345678909.87654321"},
]
sent = {
"rows": [
{"json": row, "insertId": str(i)} for i, row in enumerate(rows_json)
insert_table = table.Table(table_ref, schema=schema)
with mock.patch("uuid.uuid4", side_effect=map(str, range(len(rows)))):
errors = client.insert_rows(insert_table, rows)

self.assertEqual(len(errors), 0)
rows_json = [
{"account": "Savings", "balance": "23.47"},
{"account": "Checking", "balance": "1.98"},
{"account": "Mortgage", "balance": "-12345678909.87654321"},
]
}
conn.api_request.assert_called_once_with(
method="POST",
path="/projects/{}/datasets/{}/tables/{}/insertAll".format(
project, ds_id, table_id
),
data=sent,
timeout=None,
)
sent = {
"rows": [
{"json": row, "insertId": str(i)} for i, row in enumerate(rows_json)
]
}
conn.api_request.assert_called_once_with(
method="POST",
path="/projects/{}/datasets/{}/tables/{}/insertAll".format(
project, ds_id, table_id
),
data=sent,
timeout=None,
)

@unittest.skipIf(pandas is None, "Requires `pandas`")
def test_insert_rows_from_dataframe(self):
Expand Down Expand Up @@ -6915,6 +6920,54 @@ def test_list_rows_query_params(self):
test[1]["formatOptions.useInt64Timestamp"] = True
self.assertEqual(req[1]["query_params"], test[1], "for kwargs %s" % test[0])

def test_list_rows_w_numeric(self):
from google.cloud.bigquery.schema import SchemaField
from google.cloud.bigquery.table import Table

resource = {
"totalRows": 3,
"rows": [
{
"f": [
{"v": "-1.23456789"},
{"v": "-123456789.987654321"},
]
},
{
"f": [
{"v": None},
{"v": "3.141592653589793238462643383279502884"},
]
},
{
"f": [
{"v": "2718281828459045235360287471.352662497"},
{"v": None},
]
},
],
}
creds = _make_credentials()
http = object()
client = self._make_one(project=self.PROJECT, credentials=creds, _http=http)
conn = client._connection = make_connection(resource)
schema = [
SchemaField("num", "NUMERIC"),
SchemaField("bignum", "BIGNUMERIC"),
]
table = Table(self.TABLE_REF, schema=schema)

iterator = client.list_rows(table)
rows = list(iterator)

self.assertEqual(len(rows), 3)
self.assertEqual(rows[0]["num"], decimal.Decimal("-1.23456789"))
self.assertEqual(rows[0]["bignum"], decimal.Decimal("-123456789.987654321"))
self.assertIsNone(rows[1]["num"])
self.assertEqual(rows[1]["bignum"], decimal.Decimal("3.141592653589793238462643383279502884"))
self.assertEqual(rows[2]["num"], decimal.Decimal("2718281828459045235360287471.352662497"))
self.assertIsNone(rows[2]["bignum"])

def test_list_rows_repeated_fields(self):
from google.cloud.bigquery.schema import SchemaField

Expand Down