r6391 - in trunk/gnue-common/src/datasources: . drivers/Base drivers/DBSIG2

[reinhard]

Author: reinhard
Date: 2004-09-25 09:19:25 -0500 (Sat, 25 Sep 2004)
New Revision: 6391

Modified:
   trunk/gnue-common/src/datasources/GDataSource.py
   trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
   trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py
Log:
Undid all those identifier case sensitivity changes.


Modified: trunk/gnue-common/src/datasources/GDataSource.py
===================================================================
--- trunk/gnue-common/src/datasources/GDataSource.py    2004-09-25 13:44:59 UTC 
(rev 6390)
+++ trunk/gnue-common/src/datasources/GDataSource.py    2004-09-25 14:19:25 UTC 
(rev 6391)
@@ -240,10 +240,8 @@
          self._connections.getDataObject(self.connection, self.type)
       gDebug (7, "GDataSource.py bound to %s " % dataObject)
 
+    self.name = string.lower(self.name)
     self._topObject._datasourceDictionary[self.name]=self
-    # TODO: This added so we don't break old code by
-    # TODO: removing the case-insensitivity :(
-    self._topObject._datasourceDictionary[self.name.lower()]=self
 
     dataObject._fieldReferences = self._fieldReferences
     dataObject._unboundFieldReferences = self._unboundFieldReferences
@@ -301,9 +299,6 @@
 
 
   def referenceField(self, field, defaultValue=None):
-    if self._dataObject is not None and \
-       self._dataObject._connection is not None:
-      field = self._dataObject._connection.identifier (field)
 
     gDebug (7, 'Field %s implicitly referenced' % field)
     self._fieldReferences[field] = ""
@@ -320,9 +315,6 @@
         self.referenceField(*field)
 
   def referenceUnboundField(self, field, defaultValue=None):
-    if self._dataObject is not None and \
-       self._dataObject._connection is not None:
-      field = self._dataObject._connection.identifier (field)
 
     gDebug (7,'Unbound Field %s implicitly referenced' % field)
     self._unboundFieldReferences[field] = True
@@ -390,6 +382,7 @@
 
     if hasattr(self, 'master') and self.master:
 
+      self.master = string.lower(self.master)
       gDebug (3, "Linking detail '%s' to master '%s'" \
                  % (self.name, self.master))
 
@@ -470,6 +463,7 @@
     self._inits =[self.initialize]
 
   def _buildObject(self):
+    self.name = string.lower(self.name)
     return GObjects.GObj._buildObject(self)
 
   def initialize(self):

Modified: trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2004-09-25 
13:44:59 UTC (rev 6390)
+++ trunk/gnue-common/src/datasources/drivers/Base/RecordSet.py 2004-09-25 
14:19:25 UTC (rev 6391)
@@ -116,8 +116,6 @@
 
   # Returns current value of "field"
   def getField(self, field):
-    if self._parent._dataObject and self._parent._dataObject._connection:
-      field = self._parent._dataObject._connection.identifier(field)
     try:
       return self._fields[field]
     except KeyError:
@@ -141,8 +139,6 @@
   # If trackMod is set to 0 then the modification flag isn't raised
   def setField(self, field, value, trackMod = 1):
     do = self._parent._dataObject
-    if do and do._connection:
-      field = do._connection.identifier(field)
     gDebug (3, "setField: %s to %s" % (field, value))
     # If this field is bound to a datasource and the datasource is read only,
     # generate an error.

Modified: trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py
===================================================================
--- trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py      
2004-09-25 13:44:59 UTC (rev 6390)
+++ trunk/gnue-common/src/datasources/drivers/DBSIG2/DataObject.py      
2004-09-25 14:19:25 UTC (rev 6391)
@@ -247,7 +247,7 @@
       otype = string.lower(element._type[2:])
       #print "Otype: ",otype
       if otype == 'cfield':
-        return "%s" % self._connection.identifier (element.name)
+        return "%s" % element.name
       elif otype == 'cconst':
         if element.value == None:
           return "NULL"