Skip to content

Take into account limit argument when returning rows #76

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
merged 2 commits into from
Dec 22, 2015
Merged

Take into account limit argument when returning rows #76

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c0167e
Take into account limit argument when returning rows
mdanieli Dec 22, 2015
d454a3d
Fix stopping condition
mdanieli Dec 22, 2015
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
4 changes: 2 additions & 2 deletions bigquery/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,13 +327,13 @@ def get_query_rows(self, job_id, offset=None, limit=None, timeout=0):
records = [self._transform_row(row, schema) for row in rows]

# Append to records if there are multiple pages for query results
while page_token:
while page_token and (not limit or len(records) < limit):
query_reply = self.get_query_results(job_id, offset=offset, limit=limit,
page_token=page_token, timeout=timeout)
page_token = query_reply.get("pageToken")
rows = query_reply.get('rows', [])
records += [self._transform_row(row, schema) for row in rows]
return records
return records[:limit] if limit else records

def check_dataset(self, dataset_id):
"""Check to see if a dataset exists.
Expand Down