gnue-common/src/datasources/drivers/adodbapi/ad...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue-common
Branch:         
Changes by:     Bajusz Tamás <address@hidden>   03/08/29 15:36:57

Modified files:
        src/datasources/drivers/adodbapi/adodbapi: Driver.py 

Log message:
        more work on adodbapi driver

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue-common/src/datasources/drivers/adodbapi/adodbapi/Driver.py.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: gnue-common/src/datasources/drivers/adodbapi/adodbapi/Driver.py
diff -c gnue-common/src/datasources/drivers/adodbapi/adodbapi/Driver.py:1.1 
gnue-common/src/datasources/drivers/adodbapi/adodbapi/Driver.py:1.2
*** gnue-common/src/datasources/drivers/adodbapi/adodbapi/Driver.py:1.1 Thu Aug 
28 18:07:46 2003
--- gnue-common/src/datasources/drivers/adodbapi/adodbapi/Driver.py     Fri Aug 
29 15:36:57 2003
***************
*** 32,46 ****
  #
  #   Supported attributes (via connections.conf or <database> tag)
  #
! #     connstr = This is the full connection string to use, like:
! #
! # connstr = Provider=Microsoft.Jet.OLEDB.4.0;Data Source=C:\mydb.mdb;
  #
  # You can find more connection strings here:
  # http://www.able-consulting.com/MDAC/ADO/Connection/OLEDB_Providers.htm
  #
  
! import sys, string, types
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
  from gnue.common.datasources.drivers.DBSIG2.Driver \
--- 32,62 ----
  #
  #   Supported attributes (via connections.conf or <database> tag)
  #
! #     oledb_provider   (required)
! #     data_source      (required)
! #     initial_catalog   (optional for SQL Server)
! #     network_library (optional for SQL Server)
! #     data_provider    (optional for SQL Server)
  #
  # You can find more connection strings here:
  # http://www.able-consulting.com/MDAC/ADO/Connection/OLEDB_Providers.htm
  #
  
! _examples = """
! [access]
! comment = MS Access database
! provider = adodbapi
! oledb_provider = Microsoft.Jet.OLEDB.4.0
! data_source = C:\mydb.mdb
! 
! [sqlserver]
! comment = MS SQL Server database
! provider = adodbapi
! oledb_provider = sqloledb
! data_source = myServerName
! initial_catalog = myDatabaseName
! """
! 
  from gnue.common.datasources import GDataObjects, GConditions, GConnections
  from gnue.common.apps import GDebug
  from gnue.common.datasources.drivers.DBSIG2.Driver \
***************
*** 81,99 ****
      self._DatabaseError = SIG2api.DatabaseError
      self._resultSetClass = Adodbapi_ResultSet
  
- 
    def connect(self, connectData={}):
      GDebug.printMesg(1,"Adodbapi database driver initializing")
-     
-     try:
-       adoConn=win32com.client.Dispatch("ADODB.Connection")
-     except:
-       tmsg = _("SetUpError: Is MDAC installed?\n\n[%s") % message
-       raise GConnections.AdapterNotInstalled, tmsg
  
      try:
!       connStr = r"%s" % connectData['connstr']
        self._dataConnection = SIG2api.connect(connStr)
      except self._DatabaseError, value:
        raise GDataObjects.LoginError, value
  
--- 97,124 ----
      self._DatabaseError = SIG2api.DatabaseError
      self._resultSetClass = Adodbapi_ResultSet
  
    def connect(self, connectData={}):
      GDebug.printMesg(1,"Adodbapi database driver initializing")
  
      try:
!       connPar = {'Provider': connectData['oledb_provider'],
!                       'Data Source' : connectData['data_source'],
!                       'User Id' : connectData['_username'],
!                       'Password' : connectData['_password']
!                      }
!       # optional parameters for MS SQL Server
!       for gnueName, oledbName in [('initial_catalog', 'Initial Catalog'),
!                                               ('network_library', 'Network 
Library'),
!                                               ('data_provider', 'Data 
Provider'),
!                                               ]:
!           if connectData.has_key(gnueName):
!               connPar[oledbName] = connectData[gnueName]
! 
!       connStr = ';'.join([r"%s=%s" % (k,v) for k,v in connPar.items()])
!       GDebug.printMesg(1,'Adodbapi connection string="%s"' % connStr)
! 
        self._dataConnection = SIG2api.connect(connStr)
+ 
      except self._DatabaseError, value:
        raise GDataObjects.LoginError, value