r5652 - in trunk/gnue-common/src/datasources/drivers/postgresql: popy pypgsql

[reinhard]

Author: reinhard
Date: 2004-04-06 11:26:04 -0500 (Tue, 06 Apr 2004)
New Revision: 5652

Modified:
   trunk/gnue-common/src/datasources/drivers/postgresql/popy/Driver.py
   trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py
Log:
Use _broken_fetchmany where appropriate.


Modified: trunk/gnue-common/src/datasources/drivers/postgresql/popy/Driver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/popy/Driver.py 
2004-04-06 15:12:14 UTC (rev 5651)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/popy/Driver.py 
2004-04-06 16:26:04 UTC (rev 5652)
@@ -40,3 +40,4 @@
 
 class Connection(Base.Connection):
   _driver = PoPy
+  _broken_fetchmany = True

Modified: trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py      
2004-04-06 15:12:14 UTC (rev 5651)
+++ trunk/gnue-common/src/datasources/drivers/postgresql/pypgsql/Driver.py      
2004-04-06 16:26:04 UTC (rev 5652)
@@ -30,9 +30,7 @@
 
 __all__ = ('Connection')
 
-import sys
-from gnue.common.datasources import GDataObjects, GConditions, GConnections
-from gnue.common.apps import GDebug
+from gnue.common.datasources import GConnections
 from gnue.common.datasources.drivers.postgresql import Base
 
 try:
@@ -45,57 +43,7 @@
   raise GConnections.DependencyError, ('pyPgSQL', None)
 
 
-
-class ResultSet(Base.ResultSet):
-
-  # TODO: Override the base _loadNextRecord as the fetchmany() from the cursor
-  # TODO: returns an exception instead of None.  Not sure wazzup with that.
-  def _loadNextRecord(self):
-    if self._cursor:
-      rs = None
-
-      try:
-        rsets = self._cursor.fetchmany()
-      except self._dataObject._DatabaseError, err:
-        rsets = None
-      except:
-        rsets = None
-
-      if rsets and len(rsets):
-        for rs in(rsets):
-          if rs:
-            i = 0
-            dict = {}
-            for f in (rs):
-              dict[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 DataObject_Object(Base.DataObject_Object):
-  _resultSetClass = ResultSet
-
-
-class DataObject_SQL(Base.DataObject_SQL):
-  _resultSetClass = ResultSet
-
-
-class Connection(Base.Connection):
+class Connection (Base.Connection):
   _driver = PgSQL
   _pg_connectString = '%s::%s:%s:%s::%s'
-
-  supportedDataObjects = {
-    'object': DataObject_Object,
-    'sql':    DataObject_SQL
-  }
-
-
+  _broken_fetchmany = True