gnue/common/src/datasources/drivers/odbc/wodbc ...

[Bajusz Tamás]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Bajusz Tamás <address@hidden>   03/05/27 06:06:11

Modified files:
        common/src/datasources/drivers/odbc/wodbc: Driver.py 

Log message:
        fixing a parameters bug and enhancing error handling

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

Patches:
Index: gnue/common/src/datasources/drivers/odbc/wodbc/Driver.py
diff -c gnue/common/src/datasources/drivers/odbc/wodbc/Driver.py:1.20 
gnue/common/src/datasources/drivers/odbc/wodbc/Driver.py:1.21
*** gnue/common/src/datasources/drivers/odbc/wodbc/Driver.py:1.20       Fri May 
16 11:17:58 2003
--- gnue/common/src/datasources/drivers/odbc/wodbc/Driver.py    Tue May 27 
06:06:11 2003
***************
*** 258,269 ****
  
      GDebug.printMesg(1,"ODBC database driver initializing")
      self._DatabaseError = odbc.error
  
      try:
        self._dataConnection = odbc.odbc( "%s/%s/%s" % (
!                    connectData['service'],
                     connectData['_username'],
                     connectData['_password']))
  
      except self._DatabaseError, value:
        raise GDataObjects.LoginError, value
--- 258,277 ----
  
      GDebug.printMesg(1,"ODBC database driver initializing")
      self._DatabaseError = odbc.error
+ 
+     try:
+       service = connectData['service']
+     except KeyError:
+       service = ""
  
      try:
        self._dataConnection = odbc.odbc( "%s/%s/%s" % (
!                    service,
                     connectData['_username'],
                     connectData['_password']))
+ 
+     except dbi.opError, value:
+       raise GDataObjects.LoginError, value
  
      except self._DatabaseError, value:
        raise GDataObjects.LoginError, value
***************
*** 292,301 ****
    def _postConnect(self):
      self.triggerExtensions = TriggerExtensions(self._dataConnection)
  
!   def _createResultSet(self, conditions={}, readOnly=0, masterRecordSet=None):
      try:
        cursor = self._dataConnection.cursor()
        cursor.execute(self._buildQuery(conditions))
  
      except self._DatabaseError, err:
        raise GDataObjects.ConnectionError, err
--- 300,312 ----
    def _postConnect(self):
      self.triggerExtensions = TriggerExtensions(self._dataConnection)
  
!   def _createResultSet(self, conditions={}, readOnly=0, 
masterRecordSet=None,sql=""):
      try:
        cursor = self._dataConnection.cursor()
        cursor.execute(self._buildQuery(conditions))
+ 
+     except dbi.progError, err:
+       raise GDataObjects.ConnectionError, err
  
      except self._DatabaseError, err:
        raise GDataObjects.ConnectionError, err