r5833 - trunk/gnue-common/src/datasources/drivers/interbase/interbase

[btami]

Author: btami
Date: 2004-05-26 09:42:09 -0500 (Wed, 26 May 2004)
New Revision: 5833

Modified:
   trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py
   trunk/gnue-common/src/datasources/drivers/interbase/interbase/ResultSet.py
Log:
fixed ResulSet's incorrect _recordCount in interbase dbdriver

Modified: 
trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py 
2004-05-26 08:27:53 UTC (rev 5832)
+++ trunk/gnue-common/src/datasources/drivers/interbase/interbase/DataObject.py 
2004-05-26 14:42:09 UTC (rev 5833)
@@ -35,11 +35,13 @@
 from gnue.common.datasources import GDataObjects
 from gnue.common.apps import GDebug
 from gnue.common.datasources.drivers import DBSIG2
+from ResultSet import ResultSet
 
 class _Base(DBSIG2.DataObject):  
   # The date/time format used in insert/select statements
   # (based on format used for time.strftime())
   _dateTimeFormat = "cast('%Y-%m-%d %H:%M:%S' as timestamp)"
+  _resultSetClass = ResultSet
 
   def _createResultSet(self, conditions={}, readOnly=0, 
masterRecordSet=None,sql=""):
 
@@ -64,7 +66,8 @@
     except self._DatabaseError, err:
       raise GDataObjects.ConnectionError, err
 
-    rs = self._resultSetClass(self, cursor=cursor, 
masterRecordSet=masterRecordSet)
+    rs = self._resultSetClass(self, cursor=cursor, 
masterRecordSet=masterRecordSet, conditions=conditions, sql=sql)
+
     if self._strictQueryCount:
       rs._recordCount = recordCount
     if readOnly:

Modified: 
trunk/gnue-common/src/datasources/drivers/interbase/interbase/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/interbase/interbase/ResultSet.py  
2004-05-26 08:27:53 UTC (rev 5832)
+++ trunk/gnue-common/src/datasources/drivers/interbase/interbase/ResultSet.py  
2004-05-26 14:42:09 UTC (rev 5833)
@@ -38,4 +38,13 @@
 #
 #
 class ResultSet(DBSIG2.ResultSet):
-  pass
+
+  def __init__(self, *args, **parms):
+    self.conditions = parms['conditions']
+    self.sql = parms['sql']
+    del parms['conditions']
+    del parms['sql']
+    
+    DBSIG2.ResultSet.__init__(self, *args, **parms)
+
+    self._recordCount = self._dataObject._getQueryCount(self.conditions, 
self.sql)