Skip to content
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

Jump to bottom

feat(bigquery): add support for custom QueryJobConfig in BigQuery.cursor.execute method #9278

Merged
merged 2 commits into from
Sep 26, 2019
Merged

feat(bigquery): add support for custom QueryJobConfig in BigQuery.cursor.execute method #9278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7d23584
feat(big_query): add support for custom QueryJobConfig in execute cur…
Sep 24, 2019
cb6304d
fixup! feat(big_query): add support for custom QueryJobConfig in exec…
Sep 24, 2019
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
8 changes: 5 additions & 3 deletions bigquery/google/cloud/bigquery/dbapi/cursor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ def _set_rowcount(self, query_results):
total_rows = num_dml_affected_rows
self.rowcount = total_rows

def execute(self, operation, parameters=None, job_id=None):
def execute(self, operation, parameters=None, job_id=None, job_config=None):
"""Prepare and execute a database operation.

.. note::
Expand Down Expand Up @@ -148,6 +148,9 @@ def execute(self, operation, parameters=None, job_id=None):
:type job_id: str
:param job_id: (Optional) The job_id to use. If not set, a job ID
is generated at random.

:type job_config: :class:`~google.cloud.bigquery.job.QueryJobConfig`
:param job_config: (Optional) Extra configuration options for the query job.
"""
self._query_data = None
self._query_job = None
Expand All @@ -160,9 +163,8 @@ def execute(self, operation, parameters=None, job_id=None):
formatted_operation = _format_operation(operation, parameters=parameters)
query_parameters = _helpers.to_query_parameters(parameters)

config = job.QueryJobConfig()
config = job_config or job.QueryJobConfig(use_legacy_sql=False)
config.query_parameters = query_parameters
config.use_legacy_sql = False
self._query_job = client.query(
formatted_operation, job_config=config, job_id=job_id
)
Expand Down
14 changes: 14 additions & 0 deletions bigquery/tests/unit/test_dbapi_cursor.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,20 @@ def test_execute_custom_job_id(self):
self.assertEqual(args[0], "SELECT 1;")
self.assertEqual(kwargs["job_id"], "foo")

def test_execute_custom_job_config(self):
from google.cloud.bigquery.dbapi import connect
from google.cloud.bigquery import job

config = job.QueryJobConfig(use_legacy_sql=True)
client = self._mock_client(rows=[], num_dml_affected_rows=0)
connection = connect(client)
cursor = connection.cursor()
cursor.execute("SELECT 1;", job_id="foo", job_config=config)
args, kwargs = client.query.call_args
self.assertEqual(args[0], "SELECT 1;")
self.assertEqual(kwargs["job_id"], "foo")
self.assertEqual(kwargs["job_config"], config)

def test_execute_w_dml(self):
from google.cloud.bigquery.dbapi import connect

Expand Down