Use fetchall to retrieve database rows

Not all database interfaces (eg. JayDeBeApi) support the cursor
iteration extension to PEP-249. Since we're going to retrieve all the
rows anyway, this doesn't make much difference, other than having to
retrieve them all up-front before starting any processing, but that is
likely to have negligible impact.

Fixes #71

Author: kadler

src/itoolkit/transport/database.py

@@ -76,7 +76,9 @@ def _call(self, tk):
         # cursor type, which we ascertained in the constructor
         getattr(cursor, self.func)(self.query, parms)
 
-        return "".join(row[0] for row in cursor).rstrip('\0')
+        # Use fetchall since not all adapters support the PEP-249 cursor
+        # iteration extension eg. JayDeBeApi
+        return "".join(row[0] for row in cursor.fetchall()).rstrip('\0')
 
     def _close(self):
         self.conn.close()

tests/conftest.py

@@ -44,7 +44,7 @@ def mock_database(use_callproc):
     conn = Mock()
 
     cursor = MagicMock()
-    cursor.__iter__.return_value = [(XML,)]
+    cursor.fetchall.return_value = [(XML,)]
 
     if use_callproc:
         cursor.callproc.return_value = True

tests/test_unit_idb2call.py

@@ -22,7 +22,7 @@ def test_idb2call_transport_minimal_callproc(database_callproc):
     cursor = database_callproc.cursor()
 
     cursor.callproc.assert_called_once()
-    cursor.__iter__.assert_called_once()
+    cursor.fetchall.assert_called_once()
 
 
 def test_idb2call_transport_minimal_execute(database_execute):
@@ -35,7 +35,7 @@ def test_idb2call_transport_minimal_execute(database_execute):
     cursor = database_execute.cursor()
 
     cursor.execute.assert_called_once()
-    cursor.__iter__.assert_called_once()
+    cursor.fetchall.assert_called_once()
 
 
 def test_idb2call_with_ibm_db(mocker, database_callproc):
@@ -61,7 +61,7 @@ class MockConn(object):
     cursor = database_callproc.cursor()
 
     cursor.callproc.assert_called_once()
-    cursor.__iter__.assert_called_once()
+    cursor.fetchall.assert_called_once()
 
 
 def test_idb2call_with_uid_pwd(mocker, database_callproc):
@@ -90,4 +90,4 @@ class MockConn(object):
     cursor = database_callproc.cursor()
 
     cursor.callproc.assert_called_once()
-    cursor.__iter__.assert_called_once()
+    cursor.fetchall.assert_called_once()

tests/test_unit_transport_database.py

@@ -13,7 +13,7 @@ def test_database_transport_callproc(database_callproc):
     cursor = database_callproc.cursor()
 
     cursor.callproc.assert_called_once()
-    cursor.__iter__.assert_called_once()
+    cursor.fetchall.assert_called_once()
 
 
 def test_database_transport_execute(database_execute):
@@ -26,7 +26,7 @@ def test_database_transport_execute(database_execute):
     cursor = database_execute.cursor()
 
     cursor.execute.assert_called_once()
-    cursor.__iter__.assert_called_once()
+    cursor.fetchall.assert_called_once()
 
 
 def test_database_transport_execute_schema(database_execute):
@@ -40,7 +40,7 @@ def test_database_transport_execute_schema(database_execute):
     cursor = database_execute.cursor()
 
     cursor.execute.assert_called_once()
-    cursor.__iter__.assert_called_once()
+    cursor.fetchall.assert_called_once()
 
     assert len(cursor.execute.call_args[0]) > 0
     assert schema in cursor.execute.call_args[0][0]
@@ -57,7 +57,7 @@ def test_database_transport_callproc_schema(database_execute):
     cursor = database_execute.cursor()
 
     cursor.execute.assert_called_once()
-    cursor.__iter__.assert_called_once()
+    cursor.fetchall.assert_called_once()
 
     assert len(cursor.execute.call_args[0]) > 0
     assert schema in cursor.execute.call_args[0][0]