Merge pull request #174 from jonstace-hsf/mssql-verbose-error

MSSQL: TypeError when --verbose is enabled.

Author: rwnx

CHANGELOG.md

@@ -18,6 +18,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased]
 ## Fixed
 - Fixed a issue when updates to MSSQL data would result in multiple messages coming back from the server, e.g. when triggers update multiple tables and NOCOUNT is OFF. Another scenario is before or after scripts that call stored procs wth PRINT statements in them or that return multiple resultsets before completing. Without the fix, this issue can result in tables only partially anonymized.
+- Fix error messages when running MSSQL anonymization with --verbose enabled
 
 ## [2.4.0] 2024-07-30
 ## Changed

pynonymizer/database/mssql/__init__.py

@@ -137,28 +137,29 @@ def __db_connection(self):
         return self.__db_conn
 
     def __execute_dml(self, statement, *args):
-        logger.debug(statement, args)
+        logger.debug("sql: %s, args: %s", statement, args)
         c = self.__db_connection()
         # If timeout is set, then apply it to the connection. PyODBC will then assign that value to the Cursor created during execute()
         if self.timeout:
             c.timeout = self.timeout
         cur = c.execute(statement, *args)
+        logger.debug("%s row(s) affected", cur.rowcount)
         # If the SQL query causes multiple messages to come back (either extra row counts from triggers, or PRINT statements),
         # then we need to keep running nextset() for PyODBC to get the query to run to completion
         while cur.nextset():
-            pass
+            logger.debug("%s row(s) affected", cur.rowcount)
         return cur
 
     def __execute_ddl(self, statement, *args):
-        logger.debug(statement, args)
+        logger.debug("sql: %s, args: %s", statement, args)
         c = self.__db_connection()
         # If timeout is set, then apply it to the connection. PyODBC will then assign that value to the Cursor created during execute()
         if self.timeout:
             c.timeout = self.timeout
         return c.execute(statement, *args)
 
     def __execute_server(self, statement, *args):
-        logger.debug(statement, args)
+        logger.debug("sql: %s, args: %s", statement, args)
         c = self.__connection()
         # If timeout is set, then apply it to the connection. PyODBC will then assign that value to the Cursor created during execute()
         if self.timeout: