gnue/common/src/dbdrivers _dbsig/DBdriver.py my...

[James Thompson]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     James Thompson <address@hidden> 02/03/31 14:38:05

Modified files:
        common/src/dbdrivers/_dbsig: DBdriver.py 
        common/src/dbdrivers/mysql: DBdriver.py 

Log message:
        mysql switched to fetchany() in place of fetchmany()
        comments that didn't belong in the dbsig driver removed

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/_dbsig/DBdriver.py.diff?tr1=1.43&tr2=1.44&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/mysql/DBdriver.py.diff?tr1=1.11&tr2=1.12&r1=text&r2=text

Patches:
Index: gnue/common/src/dbdrivers/_dbsig/DBdriver.py
diff -c gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.43 
gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.44
*** gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.43   Tue Mar  5 16:52:46 2002
--- gnue/common/src/dbdrivers/_dbsig/DBdriver.py        Sun Mar 31 14:38:05 2002
***************
*** 154,164 ****
          rsets = self._cursor.fetchmany()
        except self._dataObject._DatabaseError, err:
          raise GDataObjects.ConnectionError, err
- # TODO: It seems that popy does what the other drivers don't
- # TODO: and raises this error ALOT need to find out why
- # TODO: BTW - This should not be in here :(
- #
- # TODO: Since popy fails the fetchmany() with
        if rsets and len(rsets):
          for rs in(rsets):
            if rs:
--- 154,159 ----
Index: gnue/common/src/dbdrivers/mysql/DBdriver.py
diff -c gnue/common/src/dbdrivers/mysql/DBdriver.py:1.11 
gnue/common/src/dbdrivers/mysql/DBdriver.py:1.12
*** gnue/common/src/dbdrivers/mysql/DBdriver.py:1.11    Sat Feb  9 12:50:32 2002
--- gnue/common/src/dbdrivers/mysql/DBdriver.py Sun Mar 31 14:38:05 2002
***************
*** 59,66 ****
--- 59,90 ----
      DBSIG_ResultSet.__init__(self, dataObject, \
              cursor, defaultValues, masterRecordSet)
      self._recordSetClass = MySQL_RecordSet
+   def _loadNextRecord(self):
+     if self._cursor:
+       rs = None
  
+       try:
+         rsets = self._cursor.fetchall()
+       except self._dataObject._DatabaseError, err:
+         raise GDataObjects.ConnectionError, err
  
+       if rsets and len(rsets):
+         for rs in(rsets):
+           if rs:
+             i = 0
+             dict = {}
+             for f in (rs):
+               dict[string.lower(self._fieldNames[i])] = f
+               i += 1
+             self._cachedRecords.append (self._recordSetClass(parent=self, \
+                                                              
initialData=dict))
+           else:
+             return 0
+         return 1
+       else:
+         return 0
+     else:
+      return 0
  
  class MySQL_DataObject(DBSIG_DataObject):
    def __init__(self):