8000 bigquery: Job and Query default_dataset is DatasetReference (#4037) · googleapis/google-cloud-python@72a114f · GitHub
[go: up one dir, main page]
Skip to content

Commit 72a114f

Browse files
jbatswast
jba
authored and
tswast
committed
bigquery: Job and Query default_dataset is DatasetReference (#4037)
Change the type of the Job.default_dataset and Query.default_dataset properties to DatasetReference.
1 parent abd7096 commit 72a114f

File tree

4 files changed

+17
-19
lines changed

4 files changed

+17
-19
lines changed

‎bigquery/google/cloud/bigquery/job.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1248,7 +1248,7 @@ def __init__(self, job_id, query, client,
12481248
https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.query.createDisposition
12491249
"""
12501250

1251-
default_dataset = _TypedProperty('default_dataset', Dataset)
1251+
default_dataset = _TypedProperty('default_dataset', DatasetReference)
12521252
"""See
12531253
https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs#configuration.query.defaultDataset
12541254
"""
@@ -1437,8 +1437,8 @@ def _copy_configuration_properties(self, configuration):
14371437
if self.default_dataset is not None:
14381438
del self.default_dataset
14391439
else:
1440-
self.default_dataset = Dataset(
1441-
DatasetReference(def_ds['projectId'], def_ds['datasetId']))
1440+
self.default_dataset = DatasetReference(
1441+
def_ds['projectId'], def_ds['datasetId'])
14421442
udf_resources = []
14431443
for udf_mapping in configuration.get(self._UDF_KEY, ()):
14441444
key_val, = udf_mapping.items()

‎bigquery/google/cloud/bigquery/query.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from google.api.core import page_iterator
2020
from google.cloud.bigquery._helpers import _TypedProperty
2121
from google.cloud.bigquery._helpers import _rows_from_json
22-
from google.cloud.bigquery.dataset import Dataset
22+
from google.cloud.bigquery.dataset import DatasetReference
2323
from google.cloud.bigquery.job import QueryJob
2424
from google.cloud.bigquery.table import _parse_schema_resource
2525
from google.cloud.bigquery._helpers import QueryParametersProperty
@@ -273,7 +273,7 @@ def schema(self):
273273
"""
274274
return _parse_schema_resource(self._properties.get('schema', {}))
275275

276-
default_dataset = _TypedProperty('default_dataset', Dataset)
276+
default_dataset = _TypedProperty('default_dataset', DatasetReference)
277277
"""See
278278
https://cloud.google.com/bigquery/docs/reference/rest/v2/jobs/query#defaultDataset
279279
"""

‎bigquery/tests/unit/test_job.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,10 +1608,10 @@ def _verifyResourceProperties(self, job, resource):
16081608
else:
16091609
self.assertIsNone(job.create_disposition)
16101610
if 'defaultDataset' in query_config:
1611-
dataset = job.default_dataset
1611+
ds_ref = job.default_dataset
16121612
ds_ref = {
1613-
'projectId': dataset.project,
1614-
'datasetId': dataset.dataset_id,
1613+
'projectId': ds_ref.project,
1614+
'datasetId': ds_ref.dataset_id,
16151615
}
16161616
self.assertEqual(ds_ref, query_config['defaultDataset'])
16171617
else:
@@ -2125,7 +2125,7 @@ def test_result_error(self):
21252125
self.assertEqual(exc_info.exception.code, http_client.BAD_REQUEST)
21262126

21272127
def test_begin_w_bound_client(self):
2128-
from google.cloud.bigquery.dataset import Dataset
2128+
from google.cloud.bigquery.dataset import DatasetReference
21292129

21302130
PATH = '/projects/%s/jobs' % (self.PROJECT,)
21312131
DS_ID = 'DATASET'
@@ -2139,7 +2139,7 @@ def test_begin_w_bound_client(self):
21392139
client = _Client(project=self.PROJECT, connection=conn)
21402140

21412141
job = self._make_one(self.JOB_NAME, self.QUERY, client)
2142-
job.default_dataset = Dataset(DatasetReference(self.PROJECT, DS_ID))
2142+
job.default_dataset = DatasetReference(self.PROJECT, DS_ID)
21432143

21442144
job.begin()
21452145

@@ -2168,7 +2168,6 @@ def test_begin_w_bound_client(self):
21682168
self._verifyResourceProperties(job, RESOURCE)
21692169

21702170
def test_begin_w_alternate_client(self):
2171-
from google.cloud.bigquery.dataset import Dataset
21722171
from google.cloud.bigquery.dataset import DatasetReference
21732172

21742173
PATH = '/projects/%s/jobs' % (self.PROJECT,)
@@ -2204,12 +2203,11 @@ def test_begin_w_alternate_client(self):
22042203
job = self._make_one(self.JOB_NAME, self.QUERY, client1)
22052204

22062205
dataset_ref = DatasetReference(self.PROJECT, DS_ID)
2207-
dataset = Dataset(dataset_ref)
22082206
table_ref = dataset_ref.table(TABLE)
22092207

22102208
job.allow_large_results = True
22112209
job.create_disposition = 'CREATE_NEVER'
2212-
job.default_dataset = dataset
2210+
job.default_dataset = dataset_ref
22132211
job.destination = table_ref
22142212
job.flatten_results = True
22152213
job.priority = 'INTERACTIVE'

‎bigquery/tests/unit/test_query.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ def test_ctor_w_query_parameters(self):
196196
self.assertEqual(query.query_parameters, query_parameters)
197197

198198
def test_from_query_job(self):
199-
from google.cloud.bigquery.dataset import Dataset, DatasetReference
199+
from google.cloud.bigquery.dataset import DatasetReference
200200
from google.cloud.bigquery.job import QueryJob
201201
from google.cloud.bigquery._helpers import UDFResource
202202

@@ -206,8 +206,8 @@ def test_from_query_job(self):
206206
job = QueryJob(
207207
self.JOB_NAME, self.QUERY, client,
208208
udf_resources=[UDFResource("resourceUri", RESOURCE_URI)])
209-
dataset = Dataset(DatasetReference(self.PROJECT, DS_ID))
210-
job.default_dataset = dataset
209+
ds_ref = DatasetReference(self.PROJECT, DS_ID)
210+
job.default_dataset = ds_ref
211211
job.use_query_cache = True
212212
job.use_legacy_sql = True
213213
klass = self._get_target_class()
@@ -219,7 +219,7 @@ def test_from_query_job(self):
219219
self.assertIs(query._client, client)
220220
self.assertIs(query._job, job)
221221
self.assertEqual(query.udf_resources, job.udf_resources)
222-
self.assertIs(query.default_dataset, dataset)
222+
self.assertIs(query.default_dataset, ds_ref)
223223
self.assertTrue(query.use_query_cache)
224224
self.assertTrue(query.use_legacy_sql)
225225

@@ -743,9 +743,9 @@ def __init__(self, project='project', connection=None):
743743
self._connection = connection
744744

745745
def dataset(self, dataset_id):
746-
from google.cloud.bigquery.dataset import Dataset, DatasetReference
746+
from google.cloud.bigquery.dataset import DatasetReference
747747

748-
return Dataset(DatasetReference(self.project, dataset_id))
748+
return DatasetReference(self.project, dataset_id)
749749

750750

751751
class _Connection(object):

0 commit comments

Comments
 (0)
0