[Modeling-cvs] ProjectModeling/Modeling/tests test_AdaptorLayer.py,1.1,1.2

[<sbi...@us...>]

Update of /cvsroot/modeling/ProjectModeling/Modeling/tests
In directory sc8-pr-cvs1:/tmp/cvs-serv19571

Modified Files:
	test_AdaptorLayer.py 
Log Message:
Fixed: utils.parseConfigFile_and_updateModel() does not exist anymore, this func. is now implemented by Model.updateModelWithCFG()

Index: test_AdaptorLayer.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/test_AdaptorLayer.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** test_AdaptorLayer.py	20 Feb 2003 15:12:47 -0000	1.1
--- test_AdaptorLayer.py	30 Jul 2003 17:14:36 -0000	1.2
***************
*** 34,42 ****
  import unittest, sys
  import utils
- from utils import parseConfigFile_and_updateModel
  if __name__ == "__main__":
    utils.fixpath()
  
! from Modeling import ModelSet
  from Modeling.EditingContext import EditingContext
  from Modeling.FetchSpecification import FetchSpecification
--- 34,41 ----
  import unittest, sys
  import utils
  if __name__ == "__main__":
    utils.fixpath()
  
! from Modeling import ModelSet, Model
  from Modeling.EditingContext import EditingContext
  from Modeling.FetchSpecification import FetchSpecification
***************
*** 135,139 ****
  
  verbose=0
! databaseAdaptorName='Postgresql'
  
  def main(args):
--- 134,138 ----
  
  verbose=0
! database_cfg='Postgresql.cfg'
  
  def main(args):
***************
*** 141,145 ****
    import getopt
    options, args = getopt.getopt(sys.argv[1:], 'vVpd:')
!   global verbose, databaseAdaptorName
  
    profile=0
--- 140,144 ----
    import getopt
    options, args = getopt.getopt(sys.argv[1:], 'vVpd:')
!   global verbose, database_cfg
  
    profile=0
***************
*** 151,155 ****
      if k=='-d':
        if v not in ('Postgresql', 'MySQL'): usage(me); return 1
!       databaseAdaptorName=v
        continue
  
--- 150,154 ----
      if k=='-d':
        if v not in ('Postgresql', 'MySQL'): usage(me); return 1
!       database_cfg='%s.cfg'%v
        continue
  
***************
*** 157,164 ****
  
    author_books_model=ModelSet.defaultModelSet().modelNamed('AuthorBooks')
!   parseConfigFile_and_updateModel(author_books_model, databaseAdaptorName)
  
    # MySQL specifics: change TIMESTAMP to DATETIME
!   if databaseAdaptorName=='MySQL':
      author_books_model.entityNamed('Writer').attributeNamed('birthday').setExternalType('DATETIME')
  
--- 156,163 ----
  
    author_books_model=ModelSet.defaultModelSet().modelNamed('AuthorBooks')
!   Model.updateModelWithCFG(author_books_model, database_cfg)
  
    # MySQL specifics: change TIMESTAMP to DATETIME
!   if database_cfg=='MySQL.cfg':
      author_books_model.entityNamed('Writer').attributeNamed('birthday').setExternalType('DATETIME')