Skip to content

Commit

Permalink
Fix connections.py call sites
Browse files Browse the repository at this point in the history
  • Loading branch information
jtcohen6 committed Nov 10, 2021
1 parent c29f8bd commit a915fef
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
14 changes: 9 additions & 5 deletions dbt/adapters/bigquery/connections.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,14 @@
FailedToConnectException, RuntimeException, DatabaseException, DbtProfileError
)
from dbt.adapters.base import BaseConnectionManager, Credentials
from dbt.logger import GLOBAL_LOGGER as logger
from dbt.events import AdapterLogger
from dbt.events.functions import fire_event
from dbt.events.types import SQLQuery
from dbt.version import __version__ as dbt_version

from dbt.dataclass_schema import StrEnum

logger = AdapterLogger("BigQuery")

BQ_QUERY_JOB_SPLIT = '-----Query Job SQL Follows-----'

Expand Down Expand Up @@ -344,7 +347,7 @@ def raw_execute(self, sql, fetch=False, *, use_legacy_sql=False):
conn = self.get_thread_connection()
client = conn.handle

logger.debug('On {}: {}', conn.name, sql)
fire_event(SQLQuery(conn_name=conn.name, sql=sql))

if self.profile.query_comment and self.profile.query_comment.job_label:
query_comment = self.query_header.comment.query_comment
Expand Down Expand Up @@ -534,7 +537,7 @@ def _retry_and_handle(self, msg, conn, fn):
"""retry a function call within the context of exception_handler."""
def reopen_conn_on_error(error):
if isinstance(error, REOPENABLE_ERRORS):
logger.warning('Reopening connection after {!r}', error)
logger.warning('Reopening connection after {!r}'.format(error))
self.close(conn)
self.open(conn)
return
Expand Down Expand Up @@ -577,8 +580,9 @@ def count_error(self, error):
self.error_count += 1
if _is_retryable(error) and self.error_count <= self.retries:
logger.debug(
'Retry attempt {} of {} after error: {}',
self.error_count, self.retries, repr(error))
'Retry attempt {} of {} after error: {}'.format(
self.error_count, self.retries, repr(error)
))
return True
else:
return False
Expand Down
2 changes: 1 addition & 1 deletion dbt/adapters/bigquery/gcloud.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
https://cloud.google.com/sdk/
"""

logger = AdapterLogger("Bigquery")
logger = AdapterLogger("BigQuery")


def gcloud_installed():
Expand Down
8 changes: 3 additions & 5 deletions dbt/adapters/bigquery/impl.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
from dbt.adapters.bigquery import BigQueryColumn
from dbt.adapters.bigquery import BigQueryConnectionManager
from dbt.contracts.graph.manifest import Manifest
from dbt.logger import print_timestamped_line
from dbt.events import AdapterLogger
from dbt.utils import filter_null_values

Expand All @@ -30,7 +29,7 @@
import agate
import json

logger = AdapterLogger("Bigquery")
logger = AdapterLogger("BigQuery")

# Write dispositions for bigquery.
WRITE_APPEND = google.cloud.bigquery.job.WriteDisposition.WRITE_APPEND
Expand Down Expand Up @@ -484,9 +483,8 @@ def _bq_table_to_relation(self, bq_table):
@classmethod
def warning_on_hooks(hook_type):
msg = "{} is not supported in bigquery and will be ignored"
print_timestamped_line(
msg.format(hook_type), ui.COLOR_FG_YELLOW
)
warn_msg = dbt.ui.color(msg, ui.COLOR_FG_YELLOW)
logger.info(warn_msg)

@available
def add_query(self, sql, auto_begin=True, bindings=None,
Expand Down

0 comments on commit a915fef

Please sign in to comment.