/[papo]/gnue/common/src/dbdrivers/_dbsig/DBdriver.py
ViewVC logotype

Diff of /gnue/common/src/dbdrivers/_dbsig/DBdriver.py

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.18.2.6 by apronotti, Thu May 22 15:58:05 2003 UTC revision 1.18.2.7 by apronotti, Tue May 27 22:27:04 2003 UTC
# Line 218  class DBSIG_RecordSet(GDataObjects.Recor Line 218  class DBSIG_RecordSet(GDataObjects.Recor
218      pkFields = []      pkFields = []
219      if self._parent._dataObject._primaryKeys:      if self._parent._dataObject._primaryKeys:
220        pkFields.extend(self._parent._dataObject._primaryKeys[table])        pkFields.extend(self._parent._dataObject._primaryKeys[table])
221      for field in self._modifiedFlags.keys():      for field in self._fields.keys():
222        if self._parent.isFieldBound(field):        if self._parent.isFieldBound(field):
223          a = len (field.split ('.'))          a = len (field.split ('.'))
224          if (a == 2):          if (a == 2):
# Line 231  class DBSIG_RecordSet(GDataObjects.Recor Line 231  class DBSIG_RecordSet(GDataObjects.Recor
231            # raise            # raise
232            pass            pass
233    
234          try:          if pkFields.count(auxField) > 0 : continue
235            if self._fields[field]:  
236              pkFields.remove(auxField)          #try:
237            else:          #  if self._fields[field]:
238              continue          #    pkFields.remove(auxField)
239          except ValueError:          #  else:
240            pass          #    continue
241            #except ValueError:
242            #  pass
243                    
244          fields.append(auxField)          fields.append(auxField)
245          if self._fields[field] == None or self._fields[field] == '':          if self._fields[field] == None or self._fields[field] == '':
# Line 254  class DBSIG_RecordSet(GDataObjects.Recor Line 256  class DBSIG_RecordSet(GDataObjects.Recor
256    
257      for iterField in self._parent._dataObject._joinConditions.keys():      for iterField in self._parent._dataObject._joinConditions.keys():
258        [auxTable, auxField] = iterField.split('.')        [auxTable, auxField] = iterField.split('.')
259        if auxTable == table:        if auxTable == table and fields.count(auxField) == 0:
260          fields.append(auxField)          fields.append(auxField)
261          vals.append (self._parent._dataObject._toSqlString(\          vals.append (self._parent._dataObject._toSqlString(\
262              self._fields[self._parent._dataObject._joinConditions[iterField]]))              self._fields[self._parent._dataObject._joinConditions[iterField]]))
# Line 270  class DBSIG_RecordSet(GDataObjects.Recor Line 272  class DBSIG_RecordSet(GDataObjects.Recor
272                   string.join(statementElement[2],',') )                   string.join(statementElement[2],',') )
273    
274      try:      try:
275          GDebug.printMesg(5, "_doInsertStatementWHist: statement=%s" % statement)
276        self._parent._update_cursor.execute(statement)        self._parent._update_cursor.execute(statement)
277                
278      except self._parent._dataObject._DatabaseError, err:      except self._parent._dataObject._DatabaseError, err:
# Line 329  class DBSIG_RecordSet(GDataObjects.Recor Line 332  class DBSIG_RecordSet(GDataObjects.Recor
332    
333      for iterField in self._parent._dataObject._joinConditions.keys():      for iterField in self._parent._dataObject._joinConditions.keys():
334        [auxTable, auxField] = iterField.split('.')        [auxTable, auxField] = iterField.split('.')
335        if auxTable == table:        if auxTable == table and fields.count(auxField) == 0:
336          fields.append(auxField)          fields.append(auxField)
337          vals.append (self._parent._dataObject._toSqlString(\          vals.append (self._parent._dataObject._toSqlString(\
338              self._fields[self._parent._dataObject._joinConditions[iterField]]))              self._fields[self._parent._dataObject._joinConditions[iterField]]))
# Line 551  class DBSIG_DataObject(GDataObjects.Data Line 554  class DBSIG_DataObject(GDataObjects.Data
554          for table in self._primaryKeys.keys():          for table in self._primaryKeys.keys():
555            for field in self._primaryKeys[table]:            for field in self._primaryKeys[table]:
556              if not self._fieldReferences.has_key(table+"."+field) and not self._fieldReferences.has_key(field):              if not self._fieldReferences.has_key(table+"."+field) and not self._fieldReferences.has_key(field):
557                self._fieldReferences[table+"."+field] = ""                              self._fieldReferences[table+"."+field] = ""
558                            
559          prefixedFields = self._fieldReferences.keys()          prefixedFields = self._fieldReferences.keys()
560                  
561        if tableCount > 1 and not prefixedFields:        if tableCount > 1 and not prefixedFields:
562          prefixedFields = []          prefixedFields = []
563          for iterTable in tables:          for iterTable in tables:

Legend:
Removed from v.1.18.2.6  
changed lines
  Added in v.1.18.2.7

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26