Skip to content

BigQuery: Remove deprecated Client methods #5182

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

Merged
theacodes merged 1 commit into from
Apr 11, 2018
+29 −61
Merged

BigQuery: Remove deprecated Client methods #5182

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
34 changes: 1 addition & 33 deletions bigquery/google/cloud/bigquery/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import functools
import os
import uuid
import warnings

import six

Expand Down Expand Up @@ -437,16 +436,6 @@ def list_tables(self, dataset, max_results=None, page_token=None,
result.dataset = dataset
return result

def list_dataset_tables(self, *args, **kwargs):
"""DEPRECATED: List tables in the dataset.

Use :func:`~google.cloud.bigquery.client.Client.list_tables` instead.
"""
warnings.warn(
'list_dataset_tables is deprecated, use list_tables instead.',
DeprecationWarning)
return self.list_tables(*args, **kwargs)

def delete_dataset(self, dataset, delete_contents=False,
retry=DEFAULT_RETRY):
"""Delete a dataset.
Expand Down Expand Up @@ -1093,7 +1082,7 @@ def insert_rows(self, table, rows, selected_fields=None, **kwargs):
:type kwargs: dict
:param kwargs:
Keyword arguments to
:meth:`~google.cloud.bigquery.client.Client.create_rows_json`
:meth:`~google.cloud.bigquery.client.Client.insert_rows_json`

:rtype: list of mappings
:returns: One mapping per row with insert errors: the "index" key
Expand Down Expand Up @@ -1217,27 +1206,6 @@ def insert_rows_json(self, table, json_rows, row_ids=None,

return errors

def create_rows(self, *args, **kwargs):
"""DEPRECATED: Insert rows into a table via the streaming API.

Use :func:`~google.cloud.bigquery.client.Client.insert_rows` instead.
"""
warnings.warn(
'create_rows is deprecated, use insert_rows instead.',
DeprecationWarning)
return self.insert_rows(*args, **kwargs)

def create_rows_json(self, *args, **kwargs):
"""DEPRECATED: Insert rows into a table without type conversions.

Use :func:`~google.cloud.bigquery.client.Client.insert_rows_json`
instead.
"""
warnings.warn(
'create_rows_json is deprecated, use insert_rows_json instead.',
DeprecationWarning)
return self.insert_rows_json(*args, **kwargs)

def list_rows(self, table, selected_fields=None, max_results=None,
page_token=None, start_index=None, page_size=None,
retry=DEFAULT_RETRY):
Expand Down
56 changes: 28 additions & 28 deletions bigquery/tests/unit/test_client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,15 +1167,15 @@ def test_update_table_delete_property(self):
self.assertEqual(req[1]['data'], sent)
self.assertIsNone(table3.description)

def test_list_dataset_tables_empty(self):
def test_list_tables_empty(self):
path = '/projects/{}/datasets/{}/tables'.format(
self.PROJECT, self.DS_ID)
creds = _make_credentials()
client = self._make_one(project=self.PROJECT, credentials=creds)
conn = client._connection = _make_connection({})

dataset = client.dataset(self.DS_ID)
iterator = client.list_dataset_tables(dataset)
iterator = client.list_tables(dataset)
self.assertIs(iterator.dataset, dataset)
page = six.next(iterator.pages)
tables = list(page)
Expand All @@ -1186,7 +1186,7 @@ def test_list_dataset_tables_empty(self):
conn.api_request.assert_called_once_with(
method='GET', path=path, query_params={})

def test_list_dataset_tables_defaults(self):
def test_list_tables_defaults(self):
from google.cloud.bigquery.table import TableListItem

TABLE_1 = 'table_one'
Expand Down Expand Up @@ -1216,7 +1216,7 @@ def test_list_dataset_tables_defaults(self):
conn = client._connection = _make_connection(DATA)
dataset = client.dataset(self.DS_ID)

iterator = client.list_dataset_tables(dataset)
iterator = client.list_tables(dataset)
self.assertIs(iterator.dataset, dataset)
page = six.next(iterator.pages)
tables = list(page)
Expand All @@ -1232,7 +1232,7 @@ def test_list_dataset_tables_defaults(self):
conn.api_request.assert_called_once_with(
method='GET', path='/%s' % PATH, query_params={})

def test_list_dataset_tables_explicit(self):
def test_list_tables_explicit(self):
from google.cloud.bigquery.table import TableListItem

TABLE_1 = 'table_one'
Expand Down Expand Up @@ -1261,7 +1261,7 @@ def test_list_dataset_tables_explicit(self):
conn = client._connection = _make_connection(DATA)
dataset = client.dataset(self.DS_ID)

iterator = client.list_dataset_tables(
iterator = client.list_tables(
dataset, max_results=3, page_token=TOKEN)
self.assertIs(iterator.dataset, dataset)
page = six.next(iterator.pages)
Expand All @@ -1280,11 +1280,11 @@ def test_list_dataset_tables_explicit(self):
path='/%s' % PATH,
query_params={'maxResults': 3, 'pageToken': TOKEN})

def test_list_dataset_tables_wrong_type(self):
def test_list_tables_wrong_type(self):
creds = _make_credentials()
client = self._make_one(project=self.PROJECT, credentials=creds)
with self.assertRaises(TypeError):
client.list_dataset_tables(client.dataset(self.DS_ID).table("foo"))
client.list_tables(client.dataset(self.DS_ID).table("foo"))

def test_delete_dataset(self):
from google.cloud.bigquery.dataset import Dataset
Expand Down Expand Up @@ -2395,7 +2395,7 @@ def test_query_w_query_parameters(self):
'parameterValue': {'value': '123'}
})

def test_create_rows_wo_schema(self):
def test_insert_rows_wo_schema(self):
from google.cloud.bigquery.table import Table, _TABLE_HAS_NO_SCHEMA

creds = _make_credentials()
Expand All @@ -2411,11 +2411,11 @@ def test_create_rows_wo_schema(self):
]

with self.assertRaises(ValueError) as exc:
client.create_rows(table, ROWS)
client.insert_rows(table, ROWS)

self.assertEqual(exc.exception.args, (_TABLE_HAS_NO_SCHEMA,))

def test_create_rows_w_schema(self):
def test_insert_rows_w_schema(self):
import datetime
from google.cloud._helpers import UTC
from google.cloud._helpers import _datetime_to_rfc3339
Expand Down Expand Up @@ -2461,7 +2461,7 @@ def _row_data(row):
}

with mock.patch('uuid.uuid4', side_effect=map(str, range(len(ROWS)))):
errors = client.create_rows(table, ROWS)
errors = client.insert_rows(table, ROWS)

self.assertEqual(len(errors), 0)
conn.api_request.assert_called_once()
Expand All @@ -2470,7 +2470,7 @@ def _row_data(row):
self.assertEqual(req['path'], '/%s' % PATH)
self.assertEqual(req['data'], SENT)

def test_create_rows_w_list_of_dictionaries(self):
def test_insert_rows_w_list_of_dictionaries(self):
import datetime
from google.cloud._helpers import UTC
from google.cloud._helpers import _datetime_to_rfc3339
Expand Down Expand Up @@ -2526,15 +2526,15 @@ def _row_data(row):
}

with mock.patch('uuid.uuid4', side_effect=map(str, range(len(ROWS)))):
errors = client.create_rows(table, ROWS)
errors = client.insert_rows(table, ROWS)

self.assertEqual(len(errors), 0)
conn.api_request.assert_called_once_with(
method='POST',
path='/%s' % PATH,
data=SENT)

def test_create_rows_w_list_of_Rows(self):
def test_insert_rows_w_list_of_Rows(self):
from google.cloud.bigquery.table import Table
from google.cloud.bigquery.table import SchemaField
from google.cloud.bigquery.table import Row
Expand Down Expand Up @@ -2570,15 +2570,15 @@ def _row_data(row):
}

with mock.patch('uuid.uuid4', side_effect=map(str, range(len(ROWS)))):
errors = client.create_rows(table, ROWS)
errors = client.insert_rows(table, ROWS)

self.assertEqual(len(errors), 0)
conn.api_request.assert_called_once_with(
method='POST',
path='/%s' % PATH,
data=SENT)

def test_create_rows_w_skip_invalid_and_ignore_unknown(self):
def test_insert_rows_w_skip_invalid_and_ignore_unknown(self):
from google.cloud.bigquery.table import Table, SchemaField

PATH = 'projects/%s/datasets/%s/tables/%s/insertAll' % (
Expand Down Expand Up @@ -2626,7 +2626,7 @@ def _row_data(row):
for index, row in enumerate(ROWS)],
}

errors = client.create_rows(
errors = client.insert_rows(
table,
ROWS,
row_ids=[index for index, _ in enumerate(ROWS)],
Expand All @@ -2645,7 +2645,7 @@ def _row_data(row):
path='/%s' % PATH,
data=SENT)

def test_create_rows_w_repeated_fields(self):
def test_insert_rows_w_repeated_fields(self):
from google.cloud.bigquery.table import Table, SchemaField

PATH = 'projects/%s/datasets/%s/tables/%s/insertAll' % (
Expand Down Expand Up @@ -2677,15 +2677,15 @@ def _row_data(row):
}

with mock.patch('uuid.uuid4', side_effect=map(str, range(len(ROWS)))):
errors = client.create_rows(table, ROWS)
errors = client.insert_rows(table, ROWS)

self.assertEqual(len(errors), 0)
conn.api_request.assert_called_once_with(
method='POST',
path='/%s' % PATH,
data=SENT)

def test_create_rows_w_record_schema(self):
def test_insert_rows_w_record_schema(self):
from google.cloud.bigquery.table import SchemaField

PATH = 'projects/%s/datasets/%s/tables/%s/insertAll' % (
Expand Down Expand Up @@ -2723,7 +2723,7 @@ def _row_data(row):
}

with mock.patch('uuid.uuid4', side_effect=map(str, range(len(ROWS)))):
errors = client.create_rows(self.TABLE_REF, ROWS,
errors = client.insert_rows(self.TABLE_REF, ROWS,
selected_fields=[full_name, phone])

self.assertEqual(len(errors), 0)
Expand All @@ -2732,7 +2732,7 @@ def _row_data(row):
path='/%s' % PATH,
data=SENT)

def test_create_rows_errors(self):
def test_insert_rows_errors(self):
from google.cloud.bigquery.table import Table

ROWS = [
Expand All @@ -2748,17 +2748,17 @@ def test_create_rows_errors(self):

# table ref with no selected fields
with self.assertRaises(ValueError):
client.create_rows(self.TABLE_REF, ROWS)
client.insert_rows(self.TABLE_REF, ROWS)

# table with no schema
with self.assertRaises(ValueError):
client.create_rows(Table(self.TABLE_REF), ROWS)
client.insert_rows(Table(self.TABLE_REF), ROWS)

# neither Table nor tableReference
with self.assertRaises(TypeError):
client.create_rows(1, ROWS)
client.insert_rows(1, ROWS)

def test_create_rows_json(self):
def test_insert_rows_json(self):
from google.cloud.bigquery.table import Table, SchemaField
from google.cloud.bigquery.dataset import DatasetReference

Expand Down Expand Up @@ -2804,7 +2804,7 @@ def test_create_rows_json(self):
}

with mock.patch('uuid.uuid4', side_effect=map(str, range(len(ROWS)))):
errors = client.create_rows_json(table, ROWS)
errors = client.insert_rows_json(table, ROWS)

self.assertEqual(len(errors), 0)
conn.api_request.assert_called_once_with(
Expand Down