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

[reinhard]

Author: reinhard
Date: 2005-04-12 02:24:35 -0500 (Tue, 12 Apr 2005)
New Revision: 7341

Modified:
   trunk/gnue-common/src/datasources/GDataSource.py
   trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
Log:
Removed sql parameter from createResultSet.


Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py    2005-04-12 07:17:27 UTC 
(rev 7340)
+++ trunk/gnue-common/src/datasources/GDataSource.py    2005-04-12 07:24:35 UTC 
(rev 7341)
@@ -366,9 +366,9 @@
   def hasMaster(self):
     return self._dataObject != None and self._dataObject.hasMaster()
 
-  def createResultSet(self, conditions={}, readOnly=False, sql=""):
-      resultSet= self._dataObject.createResultSet(conditions,readOnly,sql=sql)
-      self.__setResultSet( resultSet )
+  def createResultSet (self, conditions = {}, readOnly = False):
+      resultSet = self._dataObject.createResultSet (conditions, readOnly)
+      self.__setResultSet (resultSet)
       return resultSet
 
   def addDetailDataObject(self, dataObject, handler=None):

Modified: trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-12 07:17:27 UTC (rev 7340)
+++ trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-12 07:24:35 UTC (rev 7341)
@@ -71,7 +71,7 @@
   def hasMaster(self):
     return self._masterObject != None
 
-  def createResultSet(self, conditions={}, readOnly=0, masterRecordSet=None, 
sql=""):
+  def createResultSet (self, conditions ={}, readOnly=0, masterRecordSet=None):
 
     cond = GConditions.combineConditions (conditions, self._staticCondition)