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

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/01/29 14:54:42

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

Log message:
        fixes to odbc driver

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

Patches:
Index: gnue/common/src/dbdrivers/odbc-db2/DBdriver.py
diff -c gnue/common/src/dbdrivers/odbc-db2/DBdriver.py:1.4 
gnue/common/src/dbdrivers/odbc-db2/DBdriver.py:1.5
*** gnue/common/src/dbdrivers/odbc-db2/DBdriver.py:1.4  Tue Jan 29 11:59:48 2002
--- gnue/common/src/dbdrivers/odbc-db2/DBdriver.py      Tue Jan 29 14:54:42 2002
***************
*** 38,43 ****
--- 38,44 ----
  
  import sys, string, types
  from gnue.common import GDebug
+ from gnue.common import GDataObjects
  from gnue.common.dbdrivers.odbc.DBdriver import ODBC_DataObject_Object
  
  class ODBCDB2_DataObject_Object(ODBC_DataObject_Object):
***************
*** 67,73 ****
      statement = \
        "select creator||'.'||name||'.'||type, " + \
          "creator||'.'||name, " + \
!         "type " + \
          "from sysibm.systables where type in ('%s') %s " \
                % (string.join(where_type,"','"), where_user) + \
            "order by name "
--- 68,74 ----
      statement = \
        "select creator||'.'||name||'.'||type, " + \
          "creator||'.'||name, " + \
!         "type, name " + \
          "from sysibm.systables where type in ('%s') %s " \
                % (string.join(where_type,"','"), where_user) + \
            "order by name "
***************
*** 81,88 ****
      for rs in cursor.fetchall():
        list.append(GDataObjects.Schema(attrs={'id':rs[0],
                             'name':rs[1],
!                            'type':{'A':'alias','T':'table','V':view'}[rs[2]]},
!                          getChildSchema=self.__getFieldSchema))
  
      cursor.close()
      return list
--- 82,89 ----
      for rs in cursor.fetchall():
        list.append(GDataObjects.Schema(attrs={'id':rs[0],
                             'name':rs[1],
!                            
'type':{'A':'alias','T':'table','V':'view'}[rs[2]]},
!                             getChildSchema=self.__getFieldSchema))
  
      cursor.close()
      return list
***************
*** 101,108 ****
      statement = \
        "select creator||'.'||name||'.'||type, " + \
          "creator||'.'||name, " + \
!         "type " + \
!         "from sysibm.systables where name == '%s' %s " \
                % (name, creator) + \
            "order by name "
  
--- 102,109 ----
      statement = \
        "select creator||'.'||name||'.'||type, " + \
          "creator||'.'||name, " + \
!         "type, name " + \
!         "from sysibm.systables where name = '%s' %s " \
                % (name, creator) + \
            "order by name "
  
***************
*** 114,120 ****
      list = []
      for rs in cursor.fetchall():
        list.append(GDataObjects.Schema(attrs={'id':rs[0], 'name':rs[1],
!                          'type':{'A':'alias','T':'table','V':view'}[rs[2]]},
                           getChildSchema=self.__getFieldSchema))
  
      cursor.close()
--- 115,121 ----
      list = []
      for rs in cursor.fetchall():
        list.append(GDataObjects.Schema(attrs={'id':rs[0], 'name':rs[1],
!                          'type':{'A':'alias','T':'table','V':'view'}[rs[2]]},
                           getChildSchema=self.__getFieldSchema))
  
      cursor.close()
***************
*** 150,157 ****
  
      statement = \
         "select tbcreator||'.'||tbname||'.'||name, " + \
!        "name, coltype, nulls, length, scale " + \
!        "from sysibm.syscolumns" + \
         "where tbcreator = '%s' and tbname = '%s' " % (creator, name) + \
         "order by colno"
  
--- 151,158 ----
  
      statement = \
         "select tbcreator||'.'||tbname||'.'||name, " + \
!        "name, coltype, nulls, length, scale, colno " + \
!        "from sysibm.syscolumns " + \
         "where tbcreator = '%s' and tbname = '%s' " % (creator, name) + \
         "order by colno"
  
***************
*** 189,193 ****
--- 190,195 ----
  supportedDataObjects = {
    'object': ODBCDB2_DataObject_Object,
  }
+ 
  
  
Index: gnue/common/src/dbdrivers/odbc/DBdriver.py
diff -c gnue/common/src/dbdrivers/odbc/DBdriver.py:1.11 
gnue/common/src/dbdrivers/odbc/DBdriver.py:1.12
*** gnue/common/src/dbdrivers/odbc/DBdriver.py:1.11     Thu Jan 10 15:59:18 2002
--- gnue/common/src/dbdrivers/odbc/DBdriver.py  Tue Jan 29 14:54:42 2002
***************
*** 225,232 ****
         'mul':             (2, 999, '(%s)',                   '*'      ),
         'div':             (2, 999, '(%s)',                   '/'      ),
         'and':             (1, 999, '(%s)',                   ' AND '  ),
!        'or':              (2, 999, '(%s)',                   ' OR '   ), 
!        'not':             (1,   1, '(NOT %s)',               None     ), 
         'negate':          (1,   1, '-%s',                    None     ),
         'eq':              (2,   2, '(%s = %s)',              None     ),
         'ne':              (2,   2, '(%s != %s)',             None     ),
--- 225,232 ----
         'mul':             (2, 999, '(%s)',                   '*'      ),
         'div':             (2, 999, '(%s)',                   '/'      ),
         'and':             (1, 999, '(%s)',                   ' AND '  ),
!        'or':              (2, 999, '(%s)',                   ' OR '   ),
!        'not':             (1,   1, '(NOT %s)',               None     ),
         'negate':          (1,   1, '-%s',                    None     ),
         'eq':              (2,   2, '(%s = %s)',              None     ),
         'ne':              (2,   2, '(%s != %s)',             None     ),
***************
*** 238,244 ****
         'notlike':         (2,   2, '%s NOT LIKE %s',         None     ),
         'between':         (3,   3, '%s BETWEEN %s AND %s',   None     ) }
  
!   def __init__(self): 
      GDataObjects.DataObject.__init__(self)
  
      GDebug.printMesg (1,"DB-SIG database driver backend initializing")
--- 238,244 ----
         'notlike':         (2,   2, '%s NOT LIKE %s',         None     ),
         'between':         (3,   3, '%s BETWEEN %s AND %s',   None     ) }
  
!   def __init__(self):
      GDataObjects.DataObject.__init__(self)
  
      GDebug.printMesg (1,"DB-SIG database driver backend initializing")
***************
*** 357,375 ****
        return "%s" % element
      else: 
        otype = string.lower(element.getObjectType()[2:])
!       if otype == 'field': 
          return "%s" % element.name
!       elif otype == 'const': 
!         if element.value == None: 
!           return "NULL" 
!         elif element.type == 'number': 
            return "%s" % element.value
!         else: 
            return "'%s'" % element.value
!       elif otype == 'param': 
          v = element.getValue()
          return (v == None and "NULL") or ("'%s'" % element.getValue())
!       elif self.conditionElements.has_key(otype): 
          for i in range(0, len(element._children)): 
            element._children[i] = self.__conditionToSQL(element._children[i])
          if len(element._children) < self.conditionElements[otype][0]: 
--- 357,375 ----
        return "%s" % element
      else: 
        otype = string.lower(element.getObjectType()[2:])
!       if otype == 'cfield': 
          return "%s" % element.name
!       elif otype == 'cconst':
!         if element.value == None:
!           return "NULL"
!         elif element.type == 'number':
            return "%s" % element.value
!         else:
            return "'%s'" % element.value
!       elif otype == 'param':
          v = element.getValue()
          return (v == None and "NULL") or ("'%s'" % element.getValue())
!       elif self.conditionElements.has_key(otype):
          for i in range(0, len(element._children)): 
            element._children[i] = self.__conditionToSQL(element._children[i])
          if len(element._children) < self.conditionElements[otype][0]: 
***************
*** 398,404 ****
  class ODBC_DataObject_Object(ODBC_DataObject): 
    def _buildQuery(self, conditions={}): 
      GDebug.printMesg(7,'Implicit Fields: %s' % self._fieldReferences)
!     if len(self._fieldReferences): 
        q = "SELECT %s FROM %s%s" % \
             (string.join(self._fieldReferences.keys(),","), self.table, 
              self._conditionToSQL(conditions))
--- 398,404 ----
  class ODBC_DataObject_Object(ODBC_DataObject): 
    def _buildQuery(self, conditions={}): 
      GDebug.printMesg(7,'Implicit Fields: %s' % self._fieldReferences)
!     if len(self._fieldReferences):
        q = "SELECT %s FROM %s%s" % \
             (string.join(self._fieldReferences.keys(),","), self.table, 
              self._conditionToSQL(conditions))