Allow parameterized queries

Author: aaronfriedman6

src/nypl_py_utils/classes/redshift_client.py

@@ -80,8 +80,9 @@ def execute_transaction(self, queries):
 
         Parameters
         ----------
-        queries: list<str>
-            A list of the queries to execute in order
+        queries: list<tuple>
+            A list of tuples containing a query and the values to be used if
+            the query is parameterized (or None if it's not)
         """
         self.logger.info('Executing transaction against {} database'.format(
             self.database))
@@ -90,7 +91,7 @@ def execute_transaction(self, queries):
             cursor.execute('BEGIN TRANSACTION;')
             for query in queries:
                 self.logger.debug('Executing query {}'.format(query))
-                cursor.execute(query)
+                cursor.execute(query[0], query[1])
             cursor.execute('END TRANSACTION;')
             self.conn.commit()
         except Exception as e:

tests/test_redshift_client.py

@@ -69,11 +69,12 @@ def test_execute_transaction(self, mock_redshift_conn, test_instance,
         mock_cursor = mocker.MagicMock()
         test_instance.conn.cursor.return_value = mock_cursor
 
-        test_instance.execute_transaction(['query 1', 'query 2'])
+        test_instance.execute_transaction([('query 1', None),
+                                           ('query 2 %s %s', ('a', 1))])
         mock_cursor.execute.assert_has_calls([
             mocker.call('BEGIN TRANSACTION;'),
-            mocker.call('query 1'),
-            mocker.call('query 2'),
+            mocker.call('query 1', None),
+            mocker.call('query 2 %s %s', ('a', 1)),
             mocker.call('END TRANSACTION;')])
         test_instance.conn.commit.assert_called_once()
         mock_cursor.close.assert_called_once()
@@ -87,12 +88,13 @@ def test_execute_transaction_with_exception(
         test_instance.conn.cursor.return_value = mock_cursor
 
         with pytest.raises(RedshiftClientError):
-            test_instance.execute_transaction(['query 1', 'query 2'])
+            test_instance.execute_transaction(
+                [('query 1', None), ('query 2', None)])
 
         mock_cursor.execute.assert_has_calls([
             mocker.call('BEGIN TRANSACTION;'),
-            mocker.call('query 1'),
-            mocker.call('query 2')])
+            mocker.call('query 1', None),
+            mocker.call('query 2', None)])
         test_instance.conn.commit.assert_not_called()
         test_instance.conn.rollback.assert_called_once()
         mock_cursor.close.assert_called_once()