fix adapter issues

dbt-labs · Nov 16, 2021 · c5ca29f · c5ca29f
1 parent 29bbddf
commit c5ca29f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/core/dbt/events/adapter_endpoint.py b/core/dbt/events/adapter_endpoint.py
@@ -11,7 +11,7 @@ class AdapterLogger():
  name: str
 
  def debug(self, *args, **kwargs):
- event = AdapterEventDebug(self.name, *args, **kwargs)
+ event = AdapterEventDebug(self.name, args, kwargs)
 
  event.exc_info = or_none(kwargs, 'exc_info')
  event.stack_info = or_none(kwargs, 'stack_info')
@@ -20,7 +20,7 @@ def debug(self, *args, **kwargs):
  fire_event(event)
 
  def info(self, *args, **kwargs):
- event = AdapterEventInfo(self.name, *args, **kwargs)
+ event = AdapterEventInfo(self.name, args, kwargs)
 
  event.exc_info = or_none(kwargs, 'exc_info')
  event.stack_info = or_none(kwargs, 'stack_info')
@@ -29,7 +29,7 @@ def info(self, *args, **kwargs):
  fire_event(event)
 
  def warning(self, *args, **kwargs):
- event = AdapterEventWarning(self.name, *args, **kwargs)
+ event = AdapterEventWarning(self.name, args, kwargs)
 
  event.exc_info = or_none(kwargs, 'exc_info')
  event.stack_info = or_none(kwargs, 'stack_info')
@@ -38,7 +38,7 @@ def warning(self, *args, **kwargs):
  fire_event(event)
 
  def error(self, *args, **kwargs):
- event = AdapterEventError(self.name, *args, **kwargs)
+ event = AdapterEventError(self.name, args, kwargs)
 
  event.exc_info = or_none(kwargs, 'exc_info')
  event.stack_info = or_none(kwargs, 'stack_info')
@@ -47,7 +47,7 @@ def error(self, *args, **kwargs):
  fire_event(event)
 
  def exception(self, *args, **kwargs):
- event = AdapterEventError(self.name, *args, **kwargs)
+ event = AdapterEventError(self.name, args, kwargs)
 
  # defaulting exc_info=True if it is empty is what makes this method different
  x = or_none(kwargs, 'exc_info')

diff --git a/core/dbt/events/types.py b/core/dbt/events/types.py
@@ -28,7 +28,7 @@ class AdapterEventBase(Cli, File):
 
  # instead of having this inherit from one of the level classes
  def level_tag(self) -> str:
- raise Exception("level_tag not implemented for AdapterEventBase")
+ raise Exception("level_tag should never be called on AdapterEventBase")
 
  def message(self) -> str:
  # this class shouldn't be createable, but we can't make it an ABC because of a mypy bug
@@ -53,19 +53,19 @@ def message(self) -> str:
  return f"{self.name} adapter: {msg}"
 
 
-class AdapterEventDebug(DebugLevel, ShowException, AdapterEventBase):
+class AdapterEventDebug(DebugLevel, AdapterEventBase, ShowException):
  pass
 
 
-class AdapterEventInfo(InfoLevel, ShowException, AdapterEventBase):
+class AdapterEventInfo(InfoLevel, AdapterEventBase, ShowException):
  pass
 
 
-class AdapterEventWarning(WarnLevel, ShowException, AdapterEventBase):
+class AdapterEventWarning(WarnLevel, AdapterEventBase, ShowException):
  pass
 
 
-class AdapterEventError(ErrorLevel, ShowException, AdapterEventBase):
+class AdapterEventError(ErrorLevel, AdapterEventBase, ShowException):
  pass