gnue/common/src/dbdrivers/odbc DBdriver.py

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/01/29 16:02:43

Modified files:
        common/src/dbdrivers/odbc: DBdriver.py 

Log message:
        oops... typo

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/odbc/DBdriver.py.diff?tr1=1.13&tr2=1.14&r1=text&r2=text

Patches:
Index: gnue/common/src/dbdrivers/odbc/DBdriver.py
diff -c gnue/common/src/dbdrivers/odbc/DBdriver.py:1.13 
gnue/common/src/dbdrivers/odbc/DBdriver.py:1.14
*** gnue/common/src/dbdrivers/odbc/DBdriver.py:1.13     Tue Jan 29 15:23:09 2002
--- gnue/common/src/dbdrivers/odbc/DBdriver.py  Tue Jan 29 16:02:43 2002
***************
*** 48,55 ****
  
  
  
! class ODBC_RecordSet(GDataObjects.RecordSet): 
!   def _postChanges(self): 
      if not self.isPending(): return
      if self._deleteFlag:
        statement = self._buildDeleteStatement()
--- 48,55 ----
  
  
  
! class ODBC_RecordSet(GDataObjects.RecordSet):
!   def _postChanges(self):
      if not self.isPending(): return
      if self._deleteFlag:
        statement = self._buildDeleteStatement()
***************
*** 60,75 ****
  
      GDebug.printMesg(5, "_postChanges: statement=%s" % statement)
  
!     try: 
        self._parent._update_cursor.execute(statement)
  
        # Set _initialData to be the just-now posted values
!       if not self._deleteFlag: 
          self._initialData = {}
!         for key in self._fields.keys(): 
            self._initialData[key] = self._fields[key]
  
!     except self._parent._dataObject._DatabaseError, err: 
        raise GDataObjects.ConnectionError, err
  
      self._updateFlag = 0
--- 60,75 ----
  
      GDebug.printMesg(5, "_postChanges: statement=%s" % statement)
  
!     try:
        self._parent._update_cursor.execute(statement)
  
        # Set _initialData to be the just-now posted values
!       if not self._deleteFlag:
          self._initialData = {}
!         for key in self._fields.keys():
            self._initialData[key] = self._fields[key]
  
!     except self._parent._dataObject._DatabaseError, err:
        raise GDataObjects.ConnectionError, err
  
      self._updateFlag = 0
***************
*** 121,127 ****
                vals.append ("%s" % (self._fields[field]))
              else: 
                vals.append ("'%s'" % (self._fields[field]))
!           except ValueError: 
              vals.append ("%s" % (self._fields[field]))
  
      return "INSERT INTO %s (%s) VALUES (%s)" % \
--- 121,127 ----
                vals.append ("%s" % (self._fields[field]))
              else: 
                vals.append ("'%s'" % (self._fields[field]))
!           except ValueError:
              vals.append ("%s" % (self._fields[field]))
  
      return "INSERT INTO %s (%s) VALUES (%s)" % \
***************
*** 132,160 ****
    def _buildUpdateStatement(self):
      updates = []
      for field in self._modifiedFlags.keys():
!       try: 
!         if self._parent._fieldTypes[field] == 'number': 
            updates.append ("%s=%s" % (field, self._fields[field]))
!         else: 
            updates.append ("%s='%s'" % (field, self._fields[field]))
!       except KeyError: 
          updates.append ("%s='%s'" % (field, self._fields[field]))
!         
!     if self._initialData.has_key(self._parent._primaryIdField): 
        where = [self._parent._primaryIdFormat % \
            self._initialData[self._parent._primaryIdField]  ]
!     else: 
        where = []
!       for field in self._initialData.keys(): 
!         if self._initialData[field] == None: 
            where.append ("%s IS NULL" % field)
!         else: 
!           try: 
!             if self._parent._fieldTypes[field] == 'number': 
                where.append ("%s=%s" % (field, self._initialData[field]))
!             else: 
                where.append ("%s='%s'" % (field, self._initialData[field]))
!           except KeyError: 
              where.append ("%s='%s'" % (field, self._initialData[field]))
  
      return "UPDATE %s SET %s WHERE %s" % \
--- 132,160 ----
    def _buildUpdateStatement(self):
      updates = []
      for field in self._modifiedFlags.keys():
!       try:
!         if self._parent._fieldTypes[field] == 'number':
            updates.append ("%s=%s" % (field, self._fields[field]))
!         else:
            updates.append ("%s='%s'" % (field, self._fields[field]))
!       except KeyError:
          updates.append ("%s='%s'" % (field, self._fields[field]))
! 
!     if self._initialData.has_key(self._parent._primaryIdField):
        where = [self._parent._primaryIdFormat % \
            self._initialData[self._parent._primaryIdField]  ]
!     else:
        where = []
!       for field in self._initialData.keys():
!         if self._initialData[field] == None:
            where.append ("%s IS NULL" % field)
!         else:
!           try:
!             if self._parent._fieldTypes[field] == 'number':
                where.append ("%s=%s" % (field, self._initialData[field]))
!             else:
                where.append ("%s='%s'" % (field, self._initialData[field]))
!           except KeyError:
              where.append ("%s='%s'" % (field, self._initialData[field]))
  
      return "UPDATE %s SET %s WHERE %s" % \
***************
*** 238,245 ****
         'notlike':         (2,   2, '%s NOT LIKE %s',         None     ),
         'between':         (3,   3, '%s BETWEEN %s AND %s',   None     ) }
  
!   def __init__(self):
!     GDataObjects.DataObject.__init__(self, strictQueryCount=1)
  
      GDebug.printMesg (1,"DB-SIG database driver backend initializing")
  
--- 238,245 ----
         'notlike':         (2,   2, '%s NOT LIKE %s',         None     ),
         'between':         (3,   3, '%s BETWEEN %s AND %s',   None     ) }
  
!   def __init__(self, strictQueryCount=1):
!     GDataObjects.DataObject.__init__(self)
  
      GDebug.printMesg (1,"DB-SIG database driver backend initializing")
  
***************
*** 261,267 ****
      try:
        self._dataConnection = odbc.odbc( "%s/%s/%s" % (
                     connectData['service'],
!                    connectData['_username'], 
                     connectData['_password']))
  
      except self._DatabaseError, value:
--- 261,267 ----
      try:
        self._dataConnection = odbc.odbc( "%s/%s/%s" % (
                     connectData['service'],
!                    connectData['_username'],
                     connectData['_password']))
  
      except self._DatabaseError, value: