[gnue] r7329 - trunk/gnue-common/src/datasources/drivers/Base

[reinhard]

Author: reinhard
Date: 2005-04-08 18:49:10 -0500 (Fri, 08 Apr 2005)
New Revision: 7329

Modified:
   trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
Log:
Phased out even more old stuff that's not used any more.


Modified: trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-08 23:37:46 UTC (rev 7328)
+++ trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-08 23:49:10 UTC (rev 7329)
@@ -53,7 +53,6 @@
 
     self._masterObject = None
     self._detailObjects = []
-    self._dataConnection = None
     self._fieldReferences = {}  # Set by GDataSource; lists all fields
                                 # a client explicitly references
 
@@ -78,14 +77,9 @@
   def hasMaster(self):
     return self._masterObject != None
 
-  # Do not over-ride by vendor code
   def createResultSet(self, conditions={}, readOnly=0, masterRecordSet=None, 
sql=""):
-    return self._createResultSet(
-       GConditions.combineConditions(conditions, self._staticCondition),
-       readOnly=readOnly, masterRecordSet=masterRecordSet, sql=sql)
 
-  # Designed to be replaced by vendor-specific code
-  def _createResultSet(self, conditions, readOnly, masterRecordSet, sql):
+    cond = GConditions.combineConditions (conditions, self._staticCondition)
 
     resultset = self._resultSetClass (dataObject      = self,
                                       readonly        = readOnly,
@@ -95,7 +89,7 @@
       resultset.query ('object',
                        table      = self.table,
                        fieldnames = self._fieldReferences.keys (),
-                       condition  = GConditions.buildCondition (conditions),
+                       condition  = cond
                        sortorder  = self.sorting and self.sorting or [],
                        distinct   = self.distinct)
 
@@ -112,10 +106,7 @@
     return self._buildQuery(conditions,forDetailSQL,additionalSQL)
 
   def createEmptyResultSet(self, readOnly=0, masterRecordSet=None):
-    return self._createEmptyResultSet(readOnly, masterRecordSet)
 
-  # Designed to be replaced by vendor-specific code
-  def _createEmptyResultSet(self, readOnly, masterRecordSet):
     return self._resultSetClass (dataObject      = self,
                                  readonly        = readOnly,
                                  masterRecordSet = masterRecordSet)
@@ -159,10 +150,7 @@
   # Connect to database from a GConnection object
   #
   def connect(self):
-    # FIXME: make _dataConnection go away
-    if self._connection:
-      if hasattr (self._connection, 'native'):
-        self._dataConnection = self._connection.native
+    GDebug.printMesg(1,'WARNING: The use of DataObject.connect() is 
deprecated')
 
   def commit(self):
     GDebug.printMesg(1,'WARNING: The use of DataObject.commit() is deprecated')