[Modeling-cvs] ProjectModeling/Modeling/tests/xmlmodels model_StoreEmployees.xml,1.2,1.3 model_Store
Status: Abandoned
Brought to you by:
sbigaret
Update of /cvsroot/modeling/ProjectModeling/Modeling/tests/xmlmodels
In directory sc8-pr-cvs1:/tmp/cvs-serv8307/xmlmodels
Modified Files:
model_StoreEmployees.xml model_StoreEmployees2.xml
model_StoreEmployees3.xml pymodel_StoreEmployees2.py
pymodel_StoreEmployees3.py
Log Message:
Updated: 0.9pre11 has added entity Holidays to the model, plus a tomany rel.
Employee-->Holidays having no inverse, but these models were not updated.
Index: model_StoreEmployees.xml
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/xmlmodels/model_StoreEmployees.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** model_StoreEmployees.xml 26 May 2003 15:44:50 -0000 1.2
--- model_StoreEmployees.xml 3 Aug 2003 12:48:19 -0000 1.3
***************
*** 23,26 ****
--- 23,29 ----
<join sourceAttribute='fkStoreId' destinationAttribute='id'/>
</relation>
+ <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Holidays' name='holidays' displayLabel='' joinSemantic='0'>
+ <join sourceAttribute='id' destinationAttribute='fkEmployeeId'/>
+ </relation>
</entity>
<entity isReadOnly='0' isAbstract='0' name='Address' parentEntity='' moduleName='Address' className='Address' typeName='' externalName='ADDRESS'>
***************
*** 50,53 ****
--- 53,59 ----
<join sourceAttribute='fkStoreId' destinationAttribute='id'/>
</relation>
+ <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Holidays' name='holidays' displayLabel='' joinSemantic='0'>
+ <join sourceAttribute='id' destinationAttribute='fkEmployeeId'/>
+ </relation>
</entity>
<entity isReadOnly='0' isAbstract='0' name='Executive' parentEntity='Employee' moduleName='Executive' className='Executive' typeName='' externalName='EXECUTIVE'>
***************
*** 69,72 ****
--- 75,81 ----
<join sourceAttribute='id' destinationAttribute='FK_Executive_id'/>
</relation>
+ <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Holidays' name='holidays' displayLabel='' joinSemantic='0'>
+ <join sourceAttribute='id' destinationAttribute='fkEmployeeId'/>
+ </relation>
</entity>
<entity isReadOnly='0' isAbstract='0' name='Mark' parentEntity='' moduleName='Mark' className='Mark' typeName='' externalName='MARK'>
***************
*** 79,82 ****
--- 88,98 ----
<join sourceAttribute='FK_Executive_id' destinationAttribute='id'/>
</relation>
+ </entity>
+ <entity isReadOnly='0' isAbstract='0' name='Holidays' parentEntity='' moduleName='Holidays' className='Holidays' typeName='' externalName='HOLIDAYS'>
+ <primaryKey attributeName='id'/>
+ <attribute isClassProperty='0' width='0' columnName='ID' isRequired='1' precision='0' defaultValue='None' externalType='INTEGER' name='id' scale='0' type='int' displayLabel=''/>
+ <attribute isClassProperty='1' width='0' columnName='START_DATE' isRequired='1' precision='0' defaultValue='None' externalType='TIMESTAMP' name='startDate' scale='0' type='DateTime' displayLabel=''/>
+ <attribute isClassProperty='1' width='0' columnName='END_DATE' isRequired='1' precision='0' defaultValue='None' externalType='TIMESTAMP' name='endDate' scale='0' type='DateTime' displayLabel=''/>
+ <attribute isClassProperty='0' width='0' columnName='FK_EMPLOYEE_ID' isRequired='0' precision='0' defaultValue='None' externalType='INTEGER' name='fkEmployeeId' scale='0' type='int' displayLabel=''/>
</entity>
</model>
Index: model_StoreEmployees2.xml
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/xmlmodels/model_StoreEmployees2.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** model_StoreEmployees2.xml 8 Jul 2003 16:03:58 -0000 1.1
--- model_StoreEmployees2.xml 3 Aug 2003 12:48:19 -0000 1.2
***************
*** 23,26 ****
--- 23,29 ----
<join sourceAttribute='fkStoreId' destinationAttribute='id'/>
</relation>
+ <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Holidays' name='holidays' displayLabel='' joinSemantic='0'>
+ <join sourceAttribute='id' destinationAttribute='fkEmployeeId'/>
+ </relation>
</entity>
<entity isReadOnly='0' isAbstract='0' name='Address' parentEntity='' moduleName='Address' className='Address' typeName='' externalName='ADDRESS'>
***************
*** 50,53 ****
--- 53,59 ----
<join sourceAttribute='fkStoreId' destinationAttribute='id'/>
</relation>
+ <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Holidays' name='holidays' displayLabel='' joinSemantic='0'>
+ <join sourceAttribute='id' destinationAttribute='fkEmployeeId'/>
+ </relation>
</entity>
<entity isReadOnly='0' isAbstract='0' name='Executive' parentEntity='Employee' moduleName='Employees' className='Executive' typeName='' externalName='EXECUTIVE'>
***************
*** 69,72 ****
--- 75,81 ----
<join sourceAttribute='id' destinationAttribute='FK_Executive_id'/>
</relation>
+ <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Holidays' name='holidays' displayLabel='' joinSemantic='0'>
+ <join sourceAttribute='id' destinationAttribute='fkEmployeeId'/>
+ </relation>
</entity>
<entity isReadOnly='0' isAbstract='0' name='Mark' parentEntity='' moduleName='Mark' className='Mark' typeName='' externalName='MARK'>
***************
*** 79,82 ****
--- 88,98 ----
<join sourceAttribute='FK_Executive_id' destinationAttribute='id'/>
</relation>
+ </entity>
+ <entity isReadOnly='0' isAbstract='0' name='Holidays' parentEntity='' moduleName='Holidays' className='Holidays' typeName='' externalName='HOLIDAYS'>
+ <primaryKey attributeName='id'/>
+ <attribute isClassProperty='0' width='0' columnName='ID' isRequired='1' precision='0' defaultValue='None' externalType='INTEGER' name='id' scale='0' type='int' displayLabel=''/>
+ <attribute isClassProperty='1' width='0' columnName='START_DATE' isRequired='1' precision='0' defaultValue='None' externalType='TIMESTAMP' name='startDate' scale='0' type='DateTime' displayLabel=''/>
+ <attribute isClassProperty='1' width='0' columnName='END_DATE' isRequired='1' precision='0' defaultValue='None' externalType='TIMESTAMP' name='endDate' scale='0' type='DateTime' displayLabel=''/>
+ <attribute isClassProperty='0' width='0' columnName='FK_EMPLOYEE_ID' isRequired='0' precision='0' defaultValue='None' externalType='INTEGER' name='fkEmployeeId' scale='0' type='int' displayLabel=''/>
</entity>
</model>
Index: model_StoreEmployees3.xml
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/xmlmodels/model_StoreEmployees3.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** model_StoreEmployees3.xml 8 Jul 2003 16:03:58 -0000 1.1
--- model_StoreEmployees3.xml 3 Aug 2003 12:48:19 -0000 1.2
***************
*** 23,26 ****
--- 23,29 ----
<join sourceAttribute='fkStoreId' destinationAttribute='id'/>
</relation>
+ <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Holidays' name='holidays' displayLabel='' joinSemantic='0'>
+ <join sourceAttribute='id' destinationAttribute='fkEmployeeId'/>
+ </relation>
</entity>
<entity isReadOnly='0' isAbstract='0' name='Address' parentEntity='' moduleName='Address' className='Address' typeName='' externalName='ADDRESS'>
***************
*** 50,53 ****
--- 53,59 ----
<join sourceAttribute='fkStoreId' destinationAttribute='id'/>
</relation>
+ <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Holidays' name='holidays' displayLabel='' joinSemantic='0'>
+ <join sourceAttribute='id' destinationAttribute='fkEmployeeId'/>
+ </relation>
</entity>
<entity isReadOnly='0' isAbstract='0' name='Executive' parentEntity='Employee' moduleName='Employees' className='Executive' typeName='' externalName='EXECUTIVE'>
***************
*** 69,72 ****
--- 75,81 ----
<join sourceAttribute='id' destinationAttribute='FK_Executive_id'/>
</relation>
+ <relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Holidays' name='holidays' displayLabel='' joinSemantic='0'>
+ <join sourceAttribute='id' destinationAttribute='fkEmployeeId'/>
+ </relation>
</entity>
<entity isReadOnly='0' isAbstract='0' name='Mark' parentEntity='' moduleName='Mark' className='Mark' typeName='' externalName='MARK'>
***************
*** 79,82 ****
--- 88,98 ----
<join sourceAttribute='FK_Executive_id' destinationAttribute='id'/>
</relation>
+ </entity>
+ <entity isReadOnly='0' isAbstract='0' name='Holidays' parentEntity='' moduleName='Holidays' className='Holidays' typeName='' externalName='HOLIDAYS'>
+ <primaryKey attributeName='id'/>
+ <attribute isClassProperty='0' width='0' columnName='ID' isRequired='1' precision='0' defaultValue='None' externalType='INTEGER' name='id' scale='0' type='int' displayLabel=''/>
+ <attribute isClassProperty='1' width='0' columnName='START_DATE' isRequired='1' precision='0' defaultValue='None' externalType='TIMESTAMP' name='startDate' scale='0' type='DateTime' displayLabel=''/>
+ <attribute isClassProperty='1' width='0' columnName='END_DATE' isRequired='1' precision='0' defaultValue='None' externalType='TIMESTAMP' name='endDate' scale='0' type='DateTime' displayLabel=''/>
+ <attribute isClassProperty='0' width='0' columnName='FK_EMPLOYEE_ID' isRequired='0' precision='0' defaultValue='None' externalType='INTEGER' name='fkEmployeeId' scale='0' type='int' displayLabel=''/>
</entity>
</model>
Index: pymodel_StoreEmployees2.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/xmlmodels/pymodel_StoreEmployees2.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pymodel_StoreEmployees2.py 7 Jul 2003 14:57:15 -0000 1.2
--- pymodel_StoreEmployees2.py 3 Aug 2003 12:48:19 -0000 1.3
***************
*** 59,63 ****
AInteger('mark', isRequired=1),
]
! )
]
model.associations=[
--- 59,68 ----
AInteger('mark', isRequired=1),
]
! ),
! Entity('Holidays',
! properties=[ ADateTime('startDate', isRequired=1),
! ADateTime('endDate', isRequired=1),
! ]
! ),
]
model.associations=[
***************
*** 75,78 ****
--- 80,87 ----
delete=['nullify', 'deny'],
keys=['fkStoreId', 'id']),
+ Association('Holidays', 'Employee',
+ relations=[None, 'holidays'],
+ delete=[None, 'cascade'],
+ keys=['fkEmployeeId', 'id']),
]
Index: pymodel_StoreEmployees3.py
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/xmlmodels/pymodel_StoreEmployees3.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pymodel_StoreEmployees3.py 7 Jul 2003 14:57:15 -0000 1.2
--- pymodel_StoreEmployees3.py 3 Aug 2003 12:48:19 -0000 1.3
***************
*** 60,64 ****
AInteger('mark', isRequired=1),
]
! )
]
model.associations=[
--- 60,69 ----
AInteger('mark', isRequired=1),
]
! ),
! Entity('Holidays',
! properties=[ ADateTime('startDate', isRequired=1),
! ADateTime('endDate', isRequired=1),
! ]
! ),
]
model.associations=[
***************
*** 76,79 ****
--- 81,88 ----
delete=['nullify', 'deny'],
keys=['fkStoreId', 'id']),
+ Association('Holidays', 'Employee',
+ relations=[None, 'holidays'],
+ delete=[None, 'cascade'],
+ keys=['fkEmployeeId', 'id']),
]
|