Update iDB2Call

Major change is how connections are handled:
- Allow users to pass in a PEP-249 connection object
- Use ibm_db_dbi instead of ibm_db for everything, wrapping
  any ibm_db connection objects passed
- Use callproc if available
- No longer connect/disconnect during call(), only at init time

Other changes: general clean up and unused import removal

Author: kadler

itoolkit/db2/idb2call.py

@@ -22,22 +22,11 @@
   3) QXMLSERV -- IBM PTF library (DG1 PTFs)
 
 """
-import sys
 import os
-import re
-import urllib
-if sys.version_info >= (3,0):
-  """
-  urllib has been split up in Python 3. 
-  The urllib.urlencode() function is now urllib.parse.urlencode(), 
-  and the urllib.urlopen() function is now urllib.request.urlopen().
-  """
-  import urllib.request
-  import urllib.parse
-import xml.dom.minidom
-# import inspect
+
 try:
     import ibm_db
+    import ibm_db_dbi
 except ImportError:
     pass
 
@@ -66,38 +55,23 @@ class iDB2Call(object):
     Returns:
        (obj)
     """
-    def __init__(self, iuid, ipwd=0, idb2=0, ictl=0, ipc=0, isiz=0, ilib=0):
-        # manditory
-        self.uid = iuid
-        if not isinstance(self.uid, str):
-          if ipwd == 0:
-            ipwd = "*NONE"  
-        # optional
-        if ipwd == 0:
-          self.pwd = os.environ['PASSWORD']
-        else:
-          self.pwd = ipwd
-        if idb2 == 0:
-          self.db2 = '*LOCAL'
-        else:
-          self.db2 = idb2
-        if ictl == 0:
-          self.ctl = '*here *cdata'
-        else:
-          self.ctl = ictl
-        if ipc == 0:
-          self.ipc = '*na'
-        else:
-          self.ipc = ipc
-        if isiz == 0:
-          self.siz = 512000
-        else:
-          self.siz = isiz
-        if ilib == 0:
-          self.lib = os.getenv('XMLSERVICE','QXMLSERV');
+    def __init__(self, iuid=None, ipwd=None, idb2='*LOCAL', ictl='*here *cdata', ipc='*na', isiz=512000, ilib=None):
+        if hasattr(iuid, 'cursor'):
+            # iuid is a PEP-249 connection object, just store it
+            self.conn = iuid
+        elif isinstance(iuid, ibm_db.IBM_DBConnection):
+            # iuid is a ibm_db connection object, wrap it in a ibm_db_dbi connection object
+            self.conn = ibm_db_dbi.Connection(iuid)
         else:
-          self.lib = ilib
-
+            # user id and password passed, connect using ibm_db_dbi
+            ipwd = ipwd if ipwd else os.getenv('PASSWORD', None)
+            self.conn = ibm_db_dbi.connect(database=idb2, user=iuid, password=ipwd)
+        
+        self.ctl = ictl
+        self.ipc = ipc
+        self.siz = isiz
+        self.lib = ilib if ilib else os.getenv('XMLSERVICE', 'QXMLSERV')
+        
     def trace_data(self):
         """Return trace driver data.
 
@@ -110,12 +84,10 @@ def trace_data(self):
         data = ""
         data += " ctl (" + str(self.ctl) + ")"
         data += " ipc (" + str(self.ipc) + ")"
-        data += " uid (" + str(self.uid) + ")"
-        data += " db2 (" + str(self.db2) + ")"
-        data += " siz (" + str(self.siz) + ")"
+        data += " siz (" + str(self.siz) + ") (unused)"
         data += " lib (" + str(self.lib) + ")"
         return data
-
+    
     def call(self, itool):
         """Call xmlservice with accumulated input XML.
 
@@ -125,29 +97,19 @@ def call(self, itool):
         Returns:
           xml
         """
-        if isinstance(self.uid, str):
-          conn = ibm_db.connect(self.db2, self.uid, self.pwd)
+        cursor = self.conn.cursor()
+        
+        parms = (self.ipc, self.ctl, itool.xml_in())
+
+        if hasattr(cursor, 'callproc'):
+            cursor.callproc(self.lib + ".iPLUGR512K", parms)
         else:
-          conn = self.uid  
-        # sql = "call " + self.lib + ".iPLUG512K(?,?,?,?)"
-        sql = "call " + self.lib + ".iPLUGR512K(?,?,?)"
-        stmt = ibm_db.prepare(conn, sql)
-        ipc = self.ipc
-        ctl = self.ctl
-        xml_in = itool.xml_in()
+            cursor.execute("call {}.iPLUGR512K(?,?,?)".format(self.lib), parms)
+        
         xml_out = ""
-        ibm_db.bind_param(stmt, 1, ipc, ibm_db.SQL_PARAM_INPUT)
-        ibm_db.bind_param(stmt, 2, ctl, ibm_db.SQL_PARAM_INPUT)
-        ibm_db.bind_param(stmt, 3, xml_in, ibm_db.SQL_PARAM_INPUT)
-        # ibm_db.bind_param(stmt, 4, xml_out, ibm_db.SQL_PARAM_OUTPUT)
-        result = ibm_db.execute(stmt) 
-        if ( result ):
-          row = ibm_db.fetch_tuple(stmt)
-          while ( row ):
-            for i in row:
-              xml_out += i
-            row = ibm_db.fetch_tuple(stmt)
-        ibm_db.close(conn)
-        return xml_out
-
-
+        for row in cursor:
+            xml_out += row[0]
+        
+        print(xml_out)
+        return xml_out.rstrip('\0')
+