Fix stopping condition

mdanieli · mdanieli · commit d454a3d64fb5 · 2015-12-22T19:51:32.000+01:00
diff --git a/bigquery/client.py b/bigquery/client.py
@@ -327,7 +327,7 @@ 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 limit is None and page_token or len(records) < limit:
+        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")
