[Pymerase-cvs-commit] pymerase ClassMembers.py,1.11,1.12

[<ki...@us...>]

Update of /cvsroot/pymerase/pymerase
In directory sc8-pr-cvs1:/tmp/cvs-serv2557

Modified Files:
	ClassMembers.py 
Log Message:
updated getAll util inheritance functions for namemangling


Index: ClassMembers.py
===================================================================
RCS file: /cvsroot/pymerase/pymerase/ClassMembers.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ClassMembers.py	19 Nov 2002 00:53:11 -0000	1.11
--- ClassMembers.py	11 Dec 2002 17:30:43 -0000	1.12
***************
*** 23,27 ****
  from util.iPymeraseUtil import getClassByName
  
! def getBasePrimaryKeyName(tables, tbl):
    """
    Takes a list of all the table objects and a tbl object which you would like
--- 23,27 ----
  from util.iPymeraseUtil import getClassByName
  
! def getBasePrimaryKeyName(tables, tbl, TRANSLATOR_NAME):
    """
    Takes a list of all the table objects and a tbl object which you would like
***************
*** 34,38 ****
    return tbl.getBasePrimaryKeyName()
  
! def getAllAttributes(tables, tbl):
    """
    Takes a list of all the table objects, and a tbl object which you would like
--- 34,38 ----
    return tbl.getBasePrimaryKeyName()
  
! def getAllAttributes(tables, tbl, TRANSLATOR_NAME):
    """
    Takes a list of all the table objects, and a tbl object which you would like
***************
*** 42,47 ****
    """
    atts = []
!   if len(tbl.getBaseClassNames()) > 0:
!     for tblName in tbl.getBaseClassNames():
        atts += getAllAttributes(tables, getClassByName(tables, tblName))
        atts += tbl.getAttributes()
--- 42,47 ----
    """
    atts = []
!   if len(tbl.getBaseClassNames(TRANSLATOR_NAME)) > 0:
!     for tblName in tbl.getBaseClassNames(TRANSLATOR_NAME):
        atts += getAllAttributes(tables, getClassByName(tables, tblName))
        atts += tbl.getAttributes()
***************
*** 51,55 ****
      return atts
  
! def getAllAssociations(tables, tbl):
    """
    Takes a list of all the table objects, and a tbl object which you would like
--- 51,55 ----
      return atts
  
! def getAllAssociations(tables, tbl, TRANSLATOR_NAME):
    """
    Takes a list of all the table objects, and a tbl object which you would like
***************
*** 60,65 ****
    """
    assoc = []
!   if len(tbl.getBaseClassNames()) > 0:
!     for tblName in tbl.getBaseClassNames():
        assoc += getAllAssociations(tables, getClassByName(tables, tblName))
        assoc += tbl.getAssociations()
--- 60,65 ----
    """
    assoc = []
!   if len(tbl.getBaseClassNames(TRANSLATOR_NAME)) > 0:
!     for tblName in tbl.getBaseClassNames(TRANSLATOR_NAME):
        assoc += getAllAssociations(tables, getClassByName(tables, tblName))
        assoc += tbl.getAssociations()