[gnue] r7474 - in trunk/gnue-common/src/datasources: . drivers/Base

[reinhard]

Author: reinhard
Date: 2005-04-23 08:05:56 -0500 (Sat, 23 Apr 2005)
New Revision: 7474

Modified:
   trunk/gnue-common/src/datasources/GDataSource.py
   trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
Log:
Added cache parameter to ResultSet.query.


Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py    2005-04-23 12:49:09 UTC 
(rev 7473)
+++ trunk/gnue-common/src/datasources/GDataSource.py    2005-04-23 13:05:56 UTC 
(rev 7474)
@@ -509,7 +509,7 @@
     resultset =  self.__newResultSet (readOnly, masterRecord)
 
     if self.type == 'object':
-      resultset.query ('object',
+      resultset.query ('object', self.cache,
           table      = self.table,
           fieldnames = self._fieldReferences.keys (),
           condition  = cond,
@@ -517,10 +517,10 @@
           distinct   = self.distinct)
 
     elif self.type == 'static':
-      resultset.query ('static', data = self._staticSet.data)
+      resultset.query ('static', self.cache, data = self._staticSet.data)
 
     elif self.type == 'sql':
-      resultset.query ('sql', sql = self._rawSQL.getChildrenAsContent ())
+      resultset.query ('sql', self.cache, sql = 
self._rawSQL.getChildrenAsContent ())
 
     return resultset
 

Modified: trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-23 
12:49:09 UTC (rev 7473)
+++ trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-23 
13:05:56 UTC (rev 7474)
@@ -126,7 +126,7 @@
   # Execute a query
   # ---------------------------------------------------------------------------
 
-  def query (self, type, **kwargs):
+  def query (self, type, cache, **kwargs):
     """
     Populate the resultset with data.
 
@@ -140,7 +140,7 @@
 
     getattr (self, queryfunc) (self.__connection, **kwargs)
 
-    self.__generator = self._fetch (self.__dataSource.cache)
+    self.__generator = self._fetch (cache)
 
     # (TODO: could be delayed to first call of getRecordCount)
     self._recordCount = self._count ()