Merge branch 'main' into job-rate-limit

googleapis · Jan 22, 2024 · ce34c69 · ce34c69
2 parents 7ce7bad + 89f1299
commit ce34c69
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 72 deletions.
diff --git a/docs/usage/queries.rst b/docs/usage/queries.rst
@@ -5,9 +5,9 @@ Querying data
 ^^^^^^^^^^^^^
 
 Run a query and wait for it to finish with the
-:func:`~google.cloud.bigquery.client.Client.query` method:
+:func:`~google.cloud.bigquery.client.Client.query_and_wait` method:
 
-.. literalinclude:: ../samples/client_query.py
+.. literalinclude:: ../samples/snippets/client_query.py
    :language: python
    :dedent: 4
    :start-after: [START bigquery_query]

diff --git a/samples/client_query.py b/samples/client_query.py
diff --git a/samples/desktopapp/user_credentials.py b/samples/desktopapp/user_credentials.py
@@ -61,10 +61,10 @@ def main(project: str) -> None:
     WHERE name = 'William'
     GROUP BY name;
     """
-    query_job = client.query(query_string)
+    results = client.query_and_wait(query_string)
 
     # Print the results.
-    for row in query_job.result():  # Wait for the job to complete.
+    for row in results:  # Wait for the job to complete.
         print("{}: {}".format(row["name"], row["total"]))
     # [END bigquery_auth_user_query]
 

diff --git a/samples/tests/test_client_query.py b/samples/tests/test_client_query.py