[jToolkit-cvs] jToolkit/data PyADO.py,1.6,1.7 _PyADO.py,1.1,1.2

[<dav...@us...>]

Update of /cvsroot/jtoolkit/jToolkit/data
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8759

Modified Files:
	PyADO.py _PyADO.py 
Log Message:
created class wrappers that wrap every attribute of Recordset, Connection



Index: PyADO.py
===================================================================
RCS file: /cvsroot/jtoolkit/jToolkit/data/PyADO.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** PyADO.py	9 Feb 2004 14:03:31 -0000	1.6
--- PyADO.py	9 Feb 2004 14:04:47 -0000	1.7
***************
*** 95,99 ****
      def __init__(self):
          """Initialises the internal connection object using _PyADO"""
!         self.Conn = _PyADO.makeConn()
  
      def connect(self, dsn,user=None,password=None,host=None,database=None,provider=None):
--- 95,99 ----
      def __init__(self):
          """Initialises the internal connection object using _PyADO"""
!         self.Conn = _PyADO.Connection()
  
      def connect(self, dsn,user=None,password=None,host=None,database=None,provider=None):
***************
*** 223,227 ****
          Parameters may be provided as sequence or mapping
          and will be bound to variables in the operation."""
!         self.rs = _PyADO.makeRS()
          self.rsList = [self.rs]
          self.rsListPos = 0
--- 223,227 ----
          Parameters may be provided as sequence or mapping
          and will be bound to variables in the operation."""
!         self.rs = _PyADO.Recordset()
          self.rsList = [self.rs]
          self.rsListPos = 0
***************
*** 341,345 ****
          self.rsListPos = 0
          for rownumber in range(size):
!             rs = _PyADO.makeRS()
              Query = operation % parameters[rownumber]
              rs.Open(Query, ActiveConnection = self.PassConn)
--- 341,345 ----
          self.rsListPos = 0
          for rownumber in range(size):
!             rs = _PyADO.Recordset()
              Query = operation % parameters[rownumber]
              rs.Open(Query, ActiveConnection = self.PassConn)

Index: _PyADO.py
===================================================================
RCS file: /cvsroot/jtoolkit/jToolkit/data/_PyADO.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** _PyADO.py	9 Feb 2004 14:03:31 -0000	1.1
--- _PyADO.py	9 Feb 2004 14:04:47 -0000	1.2
***************
*** 28,44 ****
  error = pythoncom.error
  
! def makeConn():
!   try:
!     Conn = win32com.client.Dispatch("ADODB.Connection")
!     return Conn
!   except win32com.client.pythoncom.com_error, com_error:
!     if com_error.args[0] == 0x800401f0:
!       # this is the COM not initialized problem
!       raise WindowsError("COM not initialized")
!     else:
!       raise
  
! def makeRS():
!   return win32com.client.Dispatch("ADODB.Recordset")
  
  
--- 28,112 ----
  error = pythoncom.error
  
! class ConnectionProperty(object):
!   def __init__(self, Property):
!     self.Property = Property
!   def getValue(self):
!     return self.Property.Value
!   def setValue(self, newValue):
!     self.Property.Value = newValue
!   Value = property(getValue, setValue)
  
! class Connection(object):
!   def __init__(self):
!     try:
!       self.Conn = win32com.client.Dispatch("ADODB.Connection")
!     except win32com.client.pythoncom.com_error, com_error:
!       if com_error.args[0] == 0x800401f0:
!         # this is the COM not initialized problem
!         raise WindowsError("COM not initialized")
!       else:
!         raise
!   def Open(self, datasource, user, passwd):
!     return self.Conn.Open(datasource, user, passwd)
!   def Close(self):
!     return self.Conn.Close()
!   def getState(self):
!     return self.Conn.State
!   def getProvider(self):
!     return self.Conn.Provider
!   def setProvider(self, newProvider):
!     self.Conn.Provider = newProvider
!   def Properties(self, name):
!     return ConnectionProperty(self.Conn.Properties(name))
!   State = property(getState)
!   Provider = property(getProvider, setProvider)
! 
! class RecordsetField(object):
!   def __init__(self, Field):
!     self.Field = Field
!   def getValue(self):         return self.Field.Value
!   def getName(self):          return self.Field.Name
!   def getType(self):          return self.Field.Type
!   def getDefinedSize(self):   return self.Field.DefinedSize
!   def getActualSize(self):    return self.Field.ActualSize
!   def getPrecision(self):     return self.Field.Precision
!   def getNumericScale(self):  return self.Field.NumericScale
!   def getAttributes(self):    return self.Field.Attributes
!   Value = property(getValue)
!   Name = property(getName)
!   Type = property(getType)
!   DefinedSize = property(getDefinedSize)
!   ActualSize = property(getActualSize)
!   Precision = property(getPrecision)
!   NumericScale = property(getNumericScale)
!   Attributes = property(getAttributes)
! 
! class RecordsetFields(object):
!   def __init__(self, Fields):
!     self.Fields = Fields
!   def getCount(self):
!     return self.Fields.Count
!   def Item(self, col):
!     return RecordsetField(self.Fields.Item(col))
!   Count = property(getCount)
! 
! class Recordset(object):
!   def __init__(self):
!     self.rs = win32com.client.Dispatch("ADODB.Recordset")
!   def Open(self, operation, ActiveConnection):
!     return self.rs.Open(operation, ActiveConnection.Conn)
!   def Close(self):
!     return self.rs.Close()
!   def MoveNext(self):
!     return self.rs.MoveNext()
!   def getEOF(self):
!     return self.rs.EOF
!   def getRecordCount(self):
!     return self.rs.RecordCount
!   def getFields(self):
!     return RecordsetFields(self.rs.Fields)
!   EOF = property(getEOF)
!   RecordCount = property(getRecordCount)
!   Fields = property(getFields)