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

[reinhard]

Author: reinhard
Date: 2005-04-15 04:32:13 -0500 (Fri, 15 Apr 2005)
New Revision: 7370

Modified:
   trunk/gnue-common/src/datasources/GDataSource.py
   trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
   trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
   trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
Log:
Renamed defaultValues to defaultData for consistency with initialData.


Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py    2005-04-14 23:06:42 UTC 
(rev 7369)
+++ trunk/gnue-common/src/datasources/GDataSource.py    2005-04-15 09:32:13 UTC 
(rev 7370)
@@ -55,7 +55,7 @@
                                         # otherwise a "SELECT *" will be used
     self._fieldReferences = {}
     self._unboundFieldReferences = {}
-    self._defaultValues = {}
+    self._defaultData = {}
     self._rowidField = None
     self._primarykeyFields = []
     self._ignoreDispatchEvent = None
@@ -331,7 +331,7 @@
 
     dataObject._fieldReferences = self._fieldReferences
     dataObject._unboundFieldReferences = self._unboundFieldReferences
-    dataObject._defaultValues = self._defaultValues
+    dataObject._defaultData = self._defaultData
     dataObject._dataSource = self
 
     hasRaw = False
@@ -388,7 +388,7 @@
     self._fieldReferences[field] = ""
 
     if defaultValue != None:
-      self._defaultValues[field] = defaultValue
+      self._defaultData [field] = defaultValue
 
   def referenceFields(self, fields):
     for field in fields:
@@ -404,7 +404,7 @@
     self._unboundFieldReferences[field] = True
 
     if defaultValue != None:
-      self._defaultValues[field] = defaultValue
+      self._defaultData [field] = defaultValue
 
 
   #
@@ -610,9 +610,6 @@
     if self._topObject._datasourceDictionary.has_key (self.name):
       del self._topObject._datasourceDictionary
 
-    self._fieldReferences = None
-    self._unboundFieldReferences = None
-    self._defaultValues = None
     self._ignoreDispatchEvent = None
 
     self._inits = None

Modified: trunk/gnue-common/src/datasources/drivers/Base/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-14 23:06:42 UTC (rev 7369)
+++ trunk/gnue-common/src/datasources/drivers/Base/DataObject.py        
2005-04-15 09:32:13 UTC (rev 7370)
@@ -59,7 +59,7 @@
     self._unboundFieldReferences = {}  # Contains names of all unbound
                                        # field references
 
-    self._defaultValues = {}
+    self._defaultData = {}
 
     # TODO: This is to keep old code from breaking.
     # TODO: 0.5.1 was last version to support
@@ -84,7 +84,7 @@
     cond = GConditions.combineConditions (cond, mastercond)
 
     resultset = self._resultSetClass (dataObject      = self,
-                                      defaultValues   = self._defaultValues,
+                                      defaultData     = self._defaultData,
                                       readonly        = readOnly,
                                       masterRecordSet = masterRecordSet)
 
@@ -108,6 +108,7 @@
   def createEmptyResultSet(self, readOnly=0, masterRecordSet=None):
 
     return self._resultSetClass (dataObject      = self,
+                                 defaultData     = self._defaultData,
                                  readonly        = readOnly,
                                  masterRecordSet = masterRecordSet)
 

Modified: trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2005-04-14 
23:06:42 UTC (rev 7369)
+++ trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2005-04-15 
09:32:13 UTC (rev 7370)
@@ -37,9 +37,9 @@
   # Constructor
   # ---------------------------------------------------------------------------
 
-  def __init__ (self, parent, initialData = {}, connection = None,
-      tablename = '', boundFields = [], readonly = False, masterRecord = None,
-      masterKeyFields = [], masterLinkFields = [], defaultValues = {},
+  def __init__ (self, parent, initialData = {}, defaultData = {},
+      connection = None, tablename = '', boundFields = [], readonly = False,
+      masterRecord = None, masterKeyFields = [], masterLinkFields = []
       rowidField = None, primarykeyFields = []):
     """
     Create a new RecordSet instance.
@@ -47,6 +47,8 @@
     @param parent: ResultSet this RecordSet is a part of.
     @param initialData: Dictionary with the record's data if it's an existing
       record. Keys of the dictionary are field names.
+    @param defaultData: Dictionary with default data to be used if it is a new
+      record (i.e. initialData is an empty dictionary).
     @param connection: GConnection object the RecordSet object can use to post
       changes.
     @param tablename: Table name.
@@ -61,8 +63,6 @@
       masterLinkFields in this record.
     @param masterLinkFields: Fields in this record matching the masterKeyFields
       of the master record.
-    @param defaultValues: Dictionary with default data to be used if it is a
-      new record (i.e. initialData is an empty dictionary).
     @param rowidField: Field name of the field containing a unique row id
       generated by the backend, if available.
     @param primaryKeyFields: List of field names that make up a unique key, if
@@ -142,7 +142,7 @@
 
       # 5. Get default values from DataSource.  This has to be done after the
       #    requery, as these changes remain local until the first post.
-      for (fieldname, value) in defaultValues.items ():
+      for (fieldname, value) in defaultData.items ():
         self.__setField (fieldname, value)
 
       # 6. Link to the master record
@@ -456,13 +456,13 @@
     get lost!
     """
 
-    # Now requery ourselves
+    # First, requery ourselves
     ds = self._parent._dataObject._dataSource
     if ds and ds.requery:
       if self.__rowidField or self.__primarykeyFields:
         self.__requery (self.__boundFields)
 
-    # Requery detail resultsets
+    # Now, requery detail resultsets
     for (dataObject, resultSet) in self._cachedDetailResultSets.items ():
       newResultSet = dataObject.createResultSet (masterRecordSet = self)
       resultSet.merge (newResultSet)

Modified: trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-14 
23:06:42 UTC (rev 7369)
+++ trunk/gnue-common/src/datasources/drivers/Base/ResultSet.py 2005-04-15 
09:32:13 UTC (rev 7370)
@@ -39,10 +39,10 @@
   # Constructor
   # ---------------------------------------------------------------------------
 
-  def __init__ (self, dataObject, defaultValues = {}, readonly = False,
+  def __init__ (self, dataObject, defaultData = {}, readonly = False,
                 masterRecordSet = None):
      self._dataObject = dataObject
-     self.__defaultValues = defaultValues.copy ()
+     self.__defaultData = defaultData
      self.__readonly = readonly
      self._masterRecordSet = masterRecordSet
      self._cachedRecords = []
@@ -145,15 +145,16 @@
   # Create a new RecordSet instance
   # ---------------------------------------------------------------------------
 
-  def __createRecord (self, initialData = {}, defaultValues = {},
+  def __createRecord (self, initialData = {}, defaultData = {},
       position = None):
 
-    __defaultValues = self.__defaultValues.copy ()
-    __defaultValues.update (defaultValues)
+    __defaultData = self.__defaultData.copy ()
+    __defaultData.update (defaultData)
 
     record = RecordSet (
         parent           = self,
         initialData      = initialData,
+        defaultData      = __defaultData,
         connection       = self._dataObject._dataSource._connection,
         tablename        = self._dataObject.table,
         boundFields      = self._dataObject._fieldReferences.keys (),
@@ -161,7 +162,6 @@
         masterRecord     = self._masterRecordSet,
         masterKeyFields  = self._dataObject._masterfields,
         masterLinkFields = self._dataObject._detailfields,
-        defaultValues    = __defaultValues,
         rowidField       = self.__rowidField,
         primarykeyFields = self.__primarykeyFields)
 
@@ -410,7 +410,7 @@
   # Insert a new record after the current one
   # ---------------------------------------------------------------------------
 
-  def insertRecord (self, defaultValues = {}):
+  def insertRecord (self, defaultData = {}):
 
     if self.__readonly:
       raise Exceptions.ReadOnlyInsertError
@@ -419,8 +419,8 @@
 
     self._recordCount += 1
     self._currentRecord += 1
-    record = self.__createRecord (defaultValues = defaultValues,
-                                  position = self._currentRecord)
+    record = self.__createRecord (defaultData = defaultData,
+                                  position    = self._currentRecord)
     self.__sync ()
     return record