gnue/common/src GDataObjects.py dbdrivers/_pgsq...

[Jason Cater]

CVSROOT:        /cvsroot/gnue
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    02/01/21 13:50:24

Modified files:
        common/src     : GDataObjects.py 
        common/src/dbdrivers/_pgsql: DBdriver.py 

Log message:
        fixed typo in pgsql schema listing method

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/GDataObjects.py.diff?tr1=1.36&tr2=1.37&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/gnue/common/src/dbdrivers/_pgsql/DBdriver.py.diff?tr1=1.6&tr2=1.7&r1=text&r2=text

Patches:
Index: gnue/common/src/GDataObjects.py
diff -c gnue/common/src/GDataObjects.py:1.36 
gnue/common/src/GDataObjects.py:1.37
*** gnue/common/src/GDataObjects.py:1.36        Thu Jan 10 15:59:17 2002
--- gnue/common/src/GDataObjects.py     Mon Jan 21 13:50:24 2002
***************
*** 664,672 ****
--- 664,677 ----
  # Used to store schema data
  class Schema:
    def __init__(self, attrs={}, getChildSchema=None):
+     self.name = None
+     self.type = None
      self.__dict__.update(attrs)
      if getChildSchema != None:
        self.getChildSchema = getChildSchema
+ 
+   def __cmp__(self, other):
+     return cmp(string.lower(self.name), string.lower(other.name))
  
    def getChildSchema(self, parent):
      return ()
Index: gnue/common/src/dbdrivers/_pgsql/DBdriver.py
diff -c gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.6 
gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.7
*** gnue/common/src/dbdrivers/_pgsql/DBdriver.py:1.6    Tue Jan 15 17:51:41 2002
--- gnue/common/src/dbdrivers/_pgsql/DBdriver.py        Mon Jan 21 13:50:24 2002
***************
*** 117,123 ****
        inClause.append ("'v'")
  
      # TODO: This excludes any system tables and views. Should it?
!     statement = "select relname, relkind from pg_class " + \
              "where relkind in (%s) " % (join(inClause,',')) + \
              "and relname not like 'pg_%' " + \
              "order by relname"
--- 117,123 ----
        inClause.append ("'v'")
  
      # TODO: This excludes any system tables and views. Should it?
!     statement = "select relname, relkind, oid from pg_class " + \
              "where relkind in (%s) " % (join(inClause,',')) + \
              "and relname not like 'pg_%' " + \
              "order by relname"
***************
*** 127,133 ****
  
      list = []
      for rs in cursor.fetchall():
!       list.append(GDataObjects.Schema(attrs={'id':lower(rs[0]), 'name':rs[0],
                           'type':rs[1] == 'v' and 'view' or 'table'},
                           getChildSchema=self.__getFieldSchema))
  
--- 127,133 ----
  
      list = []
      for rs in cursor.fetchall():
!       list.append(GDataObjects.Schema(attrs={'id':rs[2], 'name':rs[0],
                           'type':rs[1] == 'v' and 'view' or 'table'},
                           getChildSchema=self.__getFieldSchema))
  
***************
*** 150,156 ****
                             getChildSchema=self.__getFieldSchema)
      else:
        schema = None
!       
      cursor.close()
      return schema
  
--- 150,156 ----
                             getChildSchema=self.__getFieldSchema)
      else:
        schema = None
! 
      cursor.close()
      return schema