From a915fef0ae6194b17215265bf1e7236e9ebe871d Mon Sep 17 00:00:00 2001
From: Jeremy Cohen <jeremy@dbtlabs.com>
Date: Wed, 10 Nov 2021 13:32:50 +0100
Subject: [PATCH] Fix connections.py call sites

---
 dbt/adapters/bigquery/connections.py | 14 +++++++++-----
 dbt/adapters/bigquery/gcloud.py      |  2 +-
 dbt/adapters/bigquery/impl.py        |  8 +++-----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/dbt/adapters/bigquery/connections.py b/dbt/adapters/bigquery/connections.py
index 4a69b35b2..984da6888 100644
--- a/dbt/adapters/bigquery/connections.py
+++ b/dbt/adapters/bigquery/connections.py
@@ -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-----'
 
@@ -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
@@ -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
@@ -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
diff --git a/dbt/adapters/bigquery/gcloud.py b/dbt/adapters/bigquery/gcloud.py
index fed379cbe..28e7e1a74 100644
--- a/dbt/adapters/bigquery/gcloud.py
+++ b/dbt/adapters/bigquery/gcloud.py
@@ -9,7 +9,7 @@
 https://cloud.google.com/sdk/
 """
 
-logger = AdapterLogger("Bigquery")
+logger = AdapterLogger("BigQuery")
 
 
 def gcloud_installed():
diff --git a/dbt/adapters/bigquery/impl.py b/dbt/adapters/bigquery/impl.py
index a3bea2b97..8e3384dd1 100644
--- a/dbt/adapters/bigquery/impl.py
+++ b/dbt/adapters/bigquery/impl.py
@@ -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
 
@@ -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
@@ -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,