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

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/02/27 11:19:25

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

Log message:
        fixed small tafu in the new sql string formatter

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

Patches:
Index: gnue/common/src/dbdrivers/_dbsig/DBdriver.py
diff -c gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.39 
gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.40
*** gnue/common/src/dbdrivers/_dbsig/DBdriver.py:1.39   Wed Feb 27 01:24:18 2002
--- gnue/common/src/dbdrivers/_dbsig/DBdriver.py        Wed Feb 27 11:19:25 2002
***************
*** 38,53 ****
  
  class DBSIG_RecordSet(GDataObjects.RecordSet):
  
-   def _toSqlString(self, value):
-     try:
-       return value.strftime(self._parent._dataObject._dateTimeFormat)
-     except AttributeError:
-       if value == None:
-         return "NULL"
-       else:
-         return "'%s'" % string.replace(str(value),"'",
-                     "%s'" % self._parent._dataObject._escapeSingleQuote)
- 
    def _postChanges(self):
      if not self.isPending(): return
      if self._deleteFlag:
--- 38,43 ----
***************
*** 94,100 ****
            if self._initialData[field] == None:
              where.append ("%s IS NULL" % field)
            else:
!             where.append ("%s=%s" % (field, 
self._toSqlString(self._initialData[field])))
  
      statement = "DELETE FROM %s WHERE %s" % \
         (self._parent._dataObject.table, string.join(where,' AND ') )
--- 84,91 ----
            if self._initialData[field] == None:
              where.append ("%s IS NULL" % field)
            else:
!             where.append ("%s=%s" % (field,
!               self._toSqlString(self._initialData[field])))
  
      statement = "DELETE FROM %s WHERE %s" % \
         (self._parent._dataObject.table, string.join(where,' AND ') )
***************
*** 110,116 ****
          if self._fields[field] == None or self._fields[field] == '':
            vals.append ("NULL") #  % (self._fields[field]))
          else:
!           vals.append (self._toSqlString(self._fields[field]))
  
      return "INSERT INTO %s (%s) VALUES (%s)" % \
         (self._parent._dataObject.table, string.join(fields,','), \
--- 101,107 ----
          if self._fields[field] == None or self._fields[field] == '':
            vals.append ("NULL") #  % (self._fields[field]))
          else:
!           vals.append 
(self._parent._dataObject._toSqlString(self._fields[field]))
  
      return "INSERT INTO %s (%s) VALUES (%s)" % \
         (self._parent._dataObject.table, string.join(fields,','), \
***************
*** 119,125 ****
    def _buildUpdateStatement(self):
      updates = []
      for field in self._modifiedFlags.keys():
!       updates.append ("%s=%s" % (field, 
self._toSqlString(self._fields[field])))
  
      if self._parent._dataObject._primaryIdField:
        where = [self._parent._dataObject._primaryIdFormat % \
--- 110,117 ----
    def _buildUpdateStatement(self):
      updates = []
      for field in self._modifiedFlags.keys():
!       updates.append ("%s=%s" % (field,
!          self._parent._dataObject._toSqlString(self._fields[field])))
  
      if self._parent._dataObject._primaryIdField:
        where = [self._parent._dataObject._primaryIdFormat % \
***************
*** 130,136 ****
          if self._initialData[field] == None:
            where.append ("%s IS NULL" % field)
          else:
!           where.append ("%s=%s" % (field, 
self._toSqlString(self._initialData[field])))
  
      return "UPDATE %s SET %s WHERE %s" % \
         (self._parent._dataObject.table, string.join(updates,','), \
--- 122,128 ----
          if self._initialData[field] == None:
            where.append ("%s IS NULL" % field)
          else:
!           where.append ("%s=%s" % (field, 
self._parent._dataObject._toSqlString(self._initialData[field])))
  
      return "UPDATE %s SET %s WHERE %s" % \
         (self._parent._dataObject.table, string.join(updates,','), \
***************
*** 239,244 ****
--- 231,247 ----
      # The date/time format used in insert/select statements
      # (based on format used for time.strftime())
      self._dateTimeFormat = "'%c'"
+ 
+ 
+   def _toSqlString(self, value):
+     try:
+       return value.strftime(self._dateTimeFormat)
+     except AttributeError:
+       if value == None:
+         return "NULL"
+       else:
+         return "'%s'" % string.replace(str(value),"'",
+                     "%s'" % self._escapeSingleQuote)
  
  
    # This should be over-ridden only if driver needs more than user/pass