Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion gcloud/bigquery/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ def list_jobs(self, max_results=None, page_token=None, all_users=None,
retrieved with another call, passing that value as
``page_token``).
"""
params = {}
params = {'projection': 'full'}

if max_results is not None:
params['maxResults'] = max_results
Expand Down
2 changes: 1 addition & 1 deletion gcloud/bigquery/job.py
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ def from_api_repr(cls, resource, client):
dest_config = config['destinationTable']
dataset = Dataset(dest_config['datasetId'], client)
destination = Table(dest_config['tableId'], dataset)
source_urls = config['sourceUris']
source_urls = config.get('sourceUris', ())

This comment was marked as spam.

This comment was marked as spam.

job = cls(name, destination, source_urls, client=client)
job._set_properties(resource)
return job
Expand Down
57 changes: 55 additions & 2 deletions gcloud/bigquery/test_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,59 @@ def test_list_jobs_defaults(self):
req = conn._requested[0]
self.assertEqual(req['method'], 'GET')
self.assertEqual(req['path'], '/%s' % PATH)
self.assertEqual(req['query_params'], {})
self.assertEqual(req['query_params'], {'projection': 'full'})

def test_list_jobs_load_job_wo_sourceUris(self):
from gcloud.bigquery.job import LoadTableFromStorageJob
PROJECT = 'PROJECT'
DATASET = 'test_dataset'
SOURCE_TABLE = 'source_table'
JOB_TYPES = {
'load_job': LoadTableFromStorageJob,
}
PATH = 'projects/%s/jobs' % PROJECT
TOKEN = 'TOKEN'
LOAD_DATA = {
'id': '%s:%s' % (PROJECT, 'load_job'),
'jobReference': {
'projectId': PROJECT,
'jobId': 'load_job',
},
'state': 'DONE',
'configuration': {
'load': {
'destinationTable': {
'projectId': PROJECT,
'datasetId': DATASET,
'tableId': SOURCE_TABLE,
},
}
},
}
DATA = {
'nextPageToken': TOKEN,
'jobs': [
LOAD_DATA,
]
}
creds = _Credentials()
client = self._makeOne(PROJECT, creds)
conn = client.connection = _Connection(DATA)

jobs, token = client.list_jobs()

self.assertEqual(len(jobs), len(DATA['jobs']))
for found, expected in zip(jobs, DATA['jobs']):
name = expected['jobReference']['jobId']
self.assertTrue(isinstance(found, JOB_TYPES[name]))
self.assertEqual(found.job_id, expected['id'])
self.assertEqual(token, TOKEN)

self.assertEqual(len(conn._requested), 1)
req = conn._requested[0]
self.assertEqual(req['method'], 'GET')
self.assertEqual(req['path'], '/%s' % PATH)
self.assertEqual(req['query_params'], {'projection': 'full'})

def test_list_jobs_explicit_empty(self):
PROJECT = 'PROJECT'
Expand All @@ -282,7 +334,8 @@ def test_list_jobs_explicit_empty(self):
self.assertEqual(req['method'], 'GET')
self.assertEqual(req['path'], '/%s' % PATH)
self.assertEqual(req['query_params'],
{'maxResults': 1000,
{'projection': 'full',
'maxResults': 1000,
'pageToken': TOKEN,
'allUsers': True,
'stateFilter': 'done'})
Expand Down