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

fix validate connection failing #168

Merged
merged 4 commits into from
Apr 27, 2022
Merged

fix validate connection failing #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81ef226
fix validate connection failing
ChenyuLInx Apr 26, 2022
70632ca
Merge branch 'main' into test_validate_connection
ChenyuLInx Apr 26, 2022
7eaecc3
fix code check
ChenyuLInx Apr 26, 2022
7321472
more format
ChenyuLInx Apr 27, 2022
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
22 changes: 17 additions & 5 deletions dbt/adapters/bigquery/connections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,8 +380,11 @@ def raw_execute(self, sql, fetch=False, *, use_legacy_sql=False):
client = conn.handle

fire_event(SQLQuery(conn_name=conn.name, sql=sql))

if self.profile.query_comment and self.profile.query_comment.job_label:
if (
hasattr(self.profile, "query_comment")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the only meaningful change, others are just format fixes by black

and self.profile.query_comment
and self.profile.query_comment.job_label
):
query_comment = self.query_header.comment.query_comment
labels = self._labels_from_query_comment(query_comment)
else:
Expand Down Expand Up @@ -475,7 +478,10 @@ def execute(
message = f"{code} ({num_rows_formated} rows, {processed_bytes} processed)"

response = BigQueryAdapterResponse( # type: ignore[call-arg]
_message=message, rows_affected=num_rows, code=code, bytes_processed=bytes_processed
_message=message,
rows_affected=num_rows,
code=code,
bytes_processed=bytes_processed,
)

return response, table
Expand Down Expand Up @@ -530,7 +536,8 @@ def copy_and_results():

self._retry_and_handle(
msg='copy table "{}" to "{}"'.format(
", ".join(source_ref.path for source_ref in source_ref_array), destination_ref.path
", ".join(source_ref.path for source_ref in source_ref_array),
destination_ref.path,
),
conn=conn,
fn=copy_and_results,
Expand Down Expand Up @@ -572,7 +579,12 @@ def fn():
self._retry_and_handle(msg="create dataset", conn=conn, fn=fn)

def _query_and_results(
self, client, sql, job_params, job_creation_timeout=None, job_execution_timeout=None
self,
client,
sql,
job_params,
job_creation_timeout=None,
job_execution_timeout=None,
):
"""Query the client and wait for results."""
# Cannot reuse job_config if destination is set and ddl is used
Expand Down
4 changes: 4 additions & 0 deletions tests/functional/adapter/test_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
from dbt.tests.adapter.basic.test_snapshot_check_cols import BaseSnapshotCheckCols
from dbt.tests.adapter.basic.test_snapshot_timestamp import BaseSnapshotTimestamp
from dbt.tests.adapter.basic.test_adapter_methods import BaseAdapterMethod
from dbt.tests.adapter.basic.test_validate_connection import BaseValidateConnection


class TestSimpleMaterializationsBigQuery(BaseSimpleMaterializations):
Expand Down Expand Up @@ -54,3 +55,6 @@ class TestSnapshotTimestampBigQuery(BaseSnapshotTimestamp):

class TestBaseAdapterMethodBigQuery(BaseAdapterMethod):
pass

class TestBigQueryValidateConnection(BaseValidateConnection):
pass