[Modeling-cvs] ProjectModeling/Modeling/tests/testPackages/StoreEmployees pymodel_StoreEmployees.py,1.3,1.4

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

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

Modified Files:
	pymodel_StoreEmployees.py 
Log Message:
Simplified pymodel, now that Model.loadModel() automatically build() the PyModel on load

Index: pymodel_StoreEmployees.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/testPackages/StoreEmployees/pymodel_StoreEmployees.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** pymodel_StoreEmployees.py	25 Jul 2003 15:39:04 -0000	1.3
--- pymodel_StoreEmployees.py	31 Jul 2003 20:52:42 -0000	1.4
***************
*** 24,91 ****
  ##
  
! def pymodel():
!   _connDict = {'database': 'STORE_EMPLOYEES'}
!   model = Model('StoreEmployees',adaptorName='Postgresql',
!                 connDict=_connDict)
!   model.doc = ' ... '
!   model.version='0.1'
!   model.entities = [
!     #
!     Entity('Store',
!            properties=[ AString('corporateName', isRequired=1), ],
!            ),
!     Entity('Employee',
!            properties=[ AString('lastName',isRequired=1,usedForLocking=1,
!                                 width=20),
!                         AString('firstName', isRequired=1, width=50,
!                                 usedForLocking=1),
!                         ]
!            ),
!     Entity('SalesClerk', parent='Employee',
!            properties=[ AString('storeArea', width=20) ]
!            ),
!     Entity('Executive', parent='Employee',
!            properties=[ AString('officeLocation', width=5) ]
!            ),
!     Entity('Address',
!            properties=[ AString('street', width=80), 
!                         AString('zipCode', width=10), 
!                         AString('town'),
!                         ]
!            ),
!     Entity('Mark',
!            properties=[ AInteger('month', isRequired=1), 
!                         AInteger('mark', isRequired=1),
!                         ]
!            ),
!     Entity('Holidays',
!            properties=[ ADateTime('startDate', isRequired=1), 
!                         ADateTime('endDate', isRequired=1),
!                         ]
!            ),
!     ]
!   model.associations=[
!     Association('Mark', 'Executive',
!                 relations=['executive', 'marks'],
!                 delete=['nullify', 'cascade'],
!                 keys=['FK_Executive_id', 'id']),
!     Association('Address', 'Employee',
!                 relations=['toEmployee', 'toAddresses'],
!                 delete=['deny', 'cascade'],
!                 keys=['fkEmployeeId', 'id'],
!                 ),
!     Association('Employee', 'Store',
!                 relations=['toStore', 'employees'],
!                 delete=['nullify', 'deny'],
!                 keys=['fkStoreId', 'id']),
!     Association('Holidays', 'Employee',
!                 relations=[None, 'holidays'],
!                 delete=[None, 'cascade'],
!                 keys=['fkEmployeeId', 'id']),
!     ]
!   
!   model.build()
!   return model
  
- def model():
-   return pymodel().component
--- 24,85 ----
  ##
  
! _connDict = {'database': 'STORE_EMPLOYEES'}
! model = Model('StoreEmployees',adaptorName='Postgresql',
!               connDict=_connDict)
! model.doc = ' ... '
! model.version='0.1'
! model.entities = [
!   #
!   Entity('Store',
!          properties=[ AString('corporateName', isRequired=1), ],
!          ),
!   Entity('Employee',
!          properties=[ AString('lastName',isRequired=1,usedForLocking=1,
!                               width=20),
!                       AString('firstName', isRequired=1, width=50,
!                               usedForLocking=1),
!                       ]
!          ),
!   Entity('SalesClerk', parent='Employee',
!          properties=[ AString('storeArea', width=20) ]
!          ),
!   Entity('Executive', parent='Employee',
!          properties=[ AString('officeLocation', width=5) ]
!          ),
!   Entity('Address',
!          properties=[ AString('street', width=80), 
!                       AString('zipCode', width=10), 
!                       AString('town'),
!                       ]
!          ),
!   Entity('Mark',
!          properties=[ AInteger('month', isRequired=1), 
!                       AInteger('mark', isRequired=1),
!                       ]
!          ),
!   Entity('Holidays',
!          properties=[ ADateTime('startDate', isRequired=1), 
!                       ADateTime('endDate', isRequired=1),
!                       ]
!          ),
!   ]
! model.associations=[
!   Association('Mark', 'Executive',
!               relations=['executive', 'marks'],
!               delete=['nullify', 'cascade'],
!               keys=['FK_Executive_id', 'id']),
!   Association('Address', 'Employee',
!               relations=['toEmployee', 'toAddresses'],
!               delete=['deny', 'cascade'],
!               keys=['fkEmployeeId', 'id'],
!               ),
!   Association('Employee', 'Store',
!               relations=['toStore', 'employees'],
!               delete=['nullify', 'deny'],
!               keys=['fkStoreId', 'id']),
!   Association('Holidays', 'Employee',
!               relations=[None, 'holidays'],
!               delete=[None, 'cascade'],
!               keys=['fkEmployeeId', 'id']),
!   ]