Merge pull request #84 from dbeatty10/feature/adapter-response

Report status as `SUCCESS` instead of `Unknown cursor state/status`

CHANGELOG.md

@@ -1,5 +1,6 @@
 ## Unreleased (TBD)
 - Support dbt v0.20.0 ([#83](https://github.com/dbeatty10/dbt-mysql/pull/83))
+- Report status as `SUCCESS` instead of `Unknown cursor state/status` ([#84](https://github.com/dbeatty10/dbt-mysql/pull/84))
 
 ## dbt-mysql 0.19.2 (March 12, 2022)
 - Support dbt v0.19.2 ([#81](https://github.com/dbeatty10/dbt-mysql/pull/81))

dbt/adapters/mariadb/connections.py

@@ -149,18 +149,18 @@ def exception_handler(self, sql):
 
  raise dbt.exceptions.RuntimeException(e) from e
 
- @classmethod
- def get_status(cls, cursor):
- # There's no real way to get this from mysql-connector-python.
- # So just return "OK".
- return "OK"
-
  @classmethod
  def get_response(cls, cursor) -> AdapterResponse:
- code = "Unknown cursor state/status"
+ code = "SUCCESS"
+ num_rows = 0
+
+ if cursor is not None and cursor.rowcount is not None:
+ num_rows = cursor.rowcount
 
+ # There's no real way to get the status from the mysql-connector-python driver.
+ # So just return the default value.
  return AdapterResponse(
- _message="{} {}".format(code, cursor.rowcount),
- rows_affected=cursor.rowcount,
+ _message="{} {}".format(code, num_rows),
+ rows_affected=num_rows,
  code=code
  )

dbt/adapters/mysql/connections.py

@@ -145,18 +145,18 @@ def exception_handler(self, sql):
 
  raise dbt.exceptions.RuntimeException(e) from e
 
- @classmethod
- def get_status(cls, cursor):
- # There's no real way to get this from mysql-connector-python.
- # So just return "OK".
- return "OK"
-
  @classmethod
  def get_response(cls, cursor) -> AdapterResponse:
- code = "Unknown cursor state/status"
+ code = "SUCCESS"
+ num_rows = 0
+
+ if cursor is not None and cursor.rowcount is not None:
+ num_rows = cursor.rowcount
 
+ # There's no real way to get the status from the mysql-connector-python driver.
+ # So just return the default value.
  return AdapterResponse(
- _message="{} {}".format(code, cursor.rowcount),
- rows_affected=cursor.rowcount,
+ _message="{} {}".format(code, num_rows),
+ rows_affected=num_rows,
  code=code
  )

dbt/adapters/mysql5/connections.py

@@ -149,18 +149,18 @@ def exception_handler(self, sql):
 
  raise dbt.exceptions.RuntimeException(e) from e
 
- @classmethod
- def get_status(cls, cursor):
- # There's no real way to get this from mysql-connector-python.
- # So just return "OK".
- return "OK"
-
  @classmethod
  def get_response(cls, cursor) -> AdapterResponse:
- code = "Unknown cursor state/status"
+ code = "SUCCESS"
+ num_rows = 0
+
+ if cursor is not None and cursor.rowcount is not None:
+ num_rows = cursor.rowcount
 
+ # There's no real way to get the status from the mysql-connector-python driver.
+ # So just return the default value.
  return AdapterResponse(
- _message="{} {}".format(code, cursor.rowcount),
- rows_affected=cursor.rowcount,
+ _message="{} {}".format(code, num_rows),
+ rows_affected=num_rows,
  code=code
  )