[gnue] r7468 - in trunk/gnue-common/src/datasources: . drivers/Base drivers/DBSIG2 drivers/appserver/appserver drivers/file

[reinhard]

Author: reinhard
Date: 2005-04-23 05:04:00 -0500 (Sat, 23 Apr 2005)
New Revision: 7468

Modified:
   trunk/gnue-common/src/datasources/GDataSource.py
   trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
   trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
   trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py
   trunk/gnue-common/src/datasources/drivers/appserver/appserver/Connection.py
   trunk/gnue-common/src/datasources/drivers/appserver/appserver/DataObject.py
   trunk/gnue-common/src/datasources/drivers/file/Base.py
Log:
Moved _resultSetClass from DataObject to Connection.


Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py    2005-04-22 23:14:44 UTC 
(rev 7467)
+++ trunk/gnue-common/src/datasources/GDataSource.py    2005-04-23 10:04:00 UTC 
(rev 7468)
@@ -53,9 +53,15 @@
 
     GObjects.GObj.__init__ (self, parent, type)
 
+    # Manually set a few defaults for properties in case the datasource was not
+    # created with XML, but with e.g. DataSourceWrapper.
     self.type = "object"
-    self.connection = None              # Connection name
-    self.table = None                   # Table name
+    self.connection = None
+    self.table = None
+    self.cache = 5
+    self.distinct = False
+    self.requery = True
+
     self._connections = None
     self._connection = None             # GConnection object
     self._dataObject = None
@@ -296,6 +302,7 @@
       # enough
       from gnue.common.datasources.drivers import Base
       dataObject = Base.DataObject (None, self)
+      self.__resultSetClass = Base.ResultSet
     else:
       self.connection = string.lower(self.connection)
       # This will throw a GConnections.NotFoundError if an unknown
@@ -305,6 +312,7 @@
          self._connections.getDataObject (self.connection, self.type,
              datasource = self)
       self._connection = dataObject._connection
+      self.__resultSetClass = self._connection._resultSetClass
       
       # Check if the connection has a fixed primary key name
       primarykeyFields = self._connection._primarykeyFields
@@ -567,7 +575,7 @@
 
   def __newResultSet (self, readOnly, masterRecord):
 
-    return self._dataObject._resultSetClass (
+    return self.__resultSetClass (
         defaultData       = self._defaultData,
         connection        = self._connection,
         tablename         = self.table,
@@ -898,8 +906,7 @@
                               'form startup. If false (default), the form '
                               'starts out with an empty record until the user '
                               'or a trigger queries the database.',
-               'Typecast': GTypecast.boolean,
-               'Default':  False },
+               'Typecast': GTypecast.boolean},
             'distinct':    {
                'Typecast': GTypecast.boolean,
                'Default':  False,

Modified: trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-22 23:14:44 UTC (rev 7467)
+++ trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-23 10:04:00 UTC (rev 7468)
@@ -23,11 +23,6 @@
 
 __all__ = ['DataObject']
 
-from ResultSet import ResultSet
-
 class DataObject:
-
-  _resultSetClass = ResultSet
-
   def __init__(self, connection, dataSource):
     self._connection = connection

Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py      
2005-04-22 23:14:44 UTC (rev 7467)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/Connection.py      
2005-04-23 10:04:00 UTC (rev 7468)
@@ -34,6 +34,7 @@
 from gnue.common.datasources.drivers import Base
 
 import DataObject
+import ResultSet
 
 
 # =============================================================================
@@ -63,6 +64,8 @@
     sequence (True) or as mapping (False). Can be overwritten by descendants.
   """
 
+  _resultSetClass = ResultSet.ResultSet
+
   supportedDataObjects = {'object': DataObject.DataObject_Object,
                           'sql':    DataObject.DataObject_SQL}
 

Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py      
2005-04-22 23:14:44 UTC (rev 7467)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py      
2005-04-23 10:04:00 UTC (rev 7468)
@@ -37,10 +37,8 @@
 
 from gnue.common.datasources.drivers import Base
 
-from ResultSet import ResultSet
-
 class DataObject (Base.DataObject):
-  _resultSetClass = ResultSet
+  pass
 
 class DataObject_Object (DataObject):
   pass

Modified: 
trunk/gnue-common/src/datasources/drivers/appserver/appserver/Connection.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/appserver/appserver/Connection.py 
2005-04-22 23:14:44 UTC (rev 7467)
+++ trunk/gnue-common/src/datasources/drivers/appserver/appserver/Connection.py 
2005-04-23 10:04:00 UTC (rev 7468)
@@ -29,6 +29,7 @@
 from gnue.common.rpc import client
 
 import DataObject
+import ResultSet
 
 from gnue.common.datasources.drivers.appserver.Schema.Discovery.Introspection 
import Introspection
 
@@ -42,6 +43,8 @@
   Connection class for GNUe-AppServer backends.
   """
 
+  _resultSetClass = ResultSet.ResultSet
+
   defaultBehavior = Introspection
 
   supportedDataObjects = {'object': DataObject.DataObject}

Modified: 
trunk/gnue-common/src/datasources/drivers/appserver/appserver/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/appserver/appserver/DataObject.py 
2005-04-22 23:14:44 UTC (rev 7467)
+++ trunk/gnue-common/src/datasources/drivers/appserver/appserver/DataObject.py 
2005-04-23 10:04:00 UTC (rev 7468)
@@ -33,4 +33,4 @@
   """
   Handles a dataobject in the GNUe-AppServer backend.
   """
-  _resultSetClass = ResultSet.ResultSet
+  pass

Modified: trunk/gnue-common/src/datasources/drivers/file/Base.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/file/Base.py      2005-04-22 
23:14:44 UTC (rev 7467)
+++ trunk/gnue-common/src/datasources/drivers/file/Base.py      2005-04-23 
10:04:00 UTC (rev 7468)
@@ -124,10 +124,9 @@
   """
   Generic DataObject class for file based backends.
   """
+  pass
 
-  _resultSetClass = ResultSet
 
-
 # =============================================================================
 # Connection class
 # =============================================================================
@@ -137,6 +136,8 @@
   Generic Connection class for file based backends.
   """
 
+  _resultSetClass = ResultSet
+
   defaultBehavior = Introspection
 
   supportedDataObjects = {'object': DataObject}