[Modeling-cvs] ProjectModeling/Modeling/tests/xmlmodels model_StoreEmployees.xml,1.1,1.2 model_Store
Status: Abandoned
Brought to you by:
sbigaret
Menu
▾
▴
[Modeling-cvs] ProjectModeling/Modeling/tests/xmlmodels model_StoreEmployees.xml,1.1,1.2 model_StoreEmployees.xml2,1.1,1.2 model_StoreEmployees.xml3,1.1,1.2 README.txt,1.1.1.1,1.2 model_AuthorBooks.xml,1.1.1.1,1.2
Update of /cvsroot/modeling/ProjectModeling/Modeling/tests/xmlmodels
In directory sc8-pr-cvs1:/tmp/cvs-serv21164/tests/xmlmodels
Modified Files:
README.txt model_AuthorBooks.xml
Added Files:
model_StoreEmployees.xml model_StoreEmployees.xml2
model_StoreEmployees.xml3
Log Message:
Merged changes from brch-0_9pre6-1-ModelMasons_base_generation_scheme to trunk
Index: README.txt
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/xmlmodels/README.txt,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** README.txt 30 Jul 2002 15:38:55 -0000 1.1.1.1
--- README.txt 26 May 2003 15:44:50 -0000 1.2
***************
*** 1,23 ****
The following models are defined:
! 'model_testBothSidesRels.xml' -- used by test_Relationship and
! test_RelationshipManipulation
! 'model_AuthorBook.xml' -- used in test_Attribute, test_Entity,
! test_ImportExport, test_Qualifier, test_SQLExpression and test_SortOrderings
! **Important Note**: please do not use this model as a working example. It is
! here for historical reasons and will be removed as soon as the tests that
! rely on it will be adapted. It has a major flaw in its design: it uses a
! flattened attribute in a very bad way (flattened attributes can only be
! used when inheritance in mapped to a database schema using the 'vertical'
! approach, i.e. a subclass instance gets its data from both the superclass'
! table and its own table which only holds the attributes the subclass adds
! to the superclass' set of attributes).
! 'model_Author_Books.xml' -- used in test_EditingContext
! Note:
- Removed 'used for locking' for attributes 'id' and 'FK_Writer_id' in
- entity 'Writer' so that we can test that the 'usedForLocking' stuff is
- not needed for fetching&saving!
--- 1,47 ----
The following models are defined:
! * 'model_AuthorBooks.xml'
! 'model_StoreEmployees.xml' (.xml/.xml2/.xml3)
! Both models correspond to the one stored, resp., in modules
! testPackages.AuthorBooks and testPackages.StoreEmployees
! They are used by the test-script test_generate_python_code.sh which makes
! sure that every generated packages behave correctly as far as the
! modeling's unittests are concerned (specifically,
! test_EditingContext_Global.py is used for AuthorBooks, and
! test_EditingContext_Global_Inheritance.py for StoreEmployees)
! Note for AuthorBooks:
!
! Removed 'used for locking' for attributes 'id' and 'FK_Writer_id' in
! entity 'Writer' so that we can test that the 'usedForLocking' stuff is
! not needed for fetching&saving!
!
! Note for StoreEmployees:
!
! .xml -- the standard model as stored in testPackages.StoreEmployees
!
! .xml2 -- the same except that entities Executive and SalesClerk share the
! same module 'Employees'
!
! .xml3 -- entities same but entities Executive, SalesClerk and Employee
! share the module 'Employees' (making it impossible to generate
! python code with option -B ie the ''base'' generation scheme)
!
! * 'model_AuthorBook.xml' -- used in test_Attribute, test_Entity,
! test_ImportExport, test_Qualifier, test_SQLExpression and
! test_SortOrderings
!
! **Important Note**: please do not use this model as a working example. It
! is here for historical reasons and will be removed as soon as the tests
! that rely on it will be adapted. It has a major flaw in its design: it
! uses a flattened attribute in a very bad way (flattened attributes can
! only be used when inheritance in mapped to a database schema using the
! 'vertical' approach, i.e. a subclass instance gets its data from both
! the superclass' table and its own table which only holds the attributes
! the subclass adds to the superclass' set of attributes).
!
! * 'model_testBothSidesRels.xml' -- used by test_Relationship and
! test_RelationshipManipulation
Index: model_AuthorBooks.xml
===================================================================
RCS file: /cvsroot/modeling/ProjectModeling/Modeling/tests/xmlmodels/model_AuthorBooks.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** model_AuthorBooks.xml 30 Jul 2002 15:38:56 -0000 1.1.1.1
--- model_AuthorBooks.xml 26 May 2003 15:44:50 -0000 1.2
***************
*** 1,5 ****
<?xml version='1.0' encoding='iso-8859-1'?>
! <!DOCTYPE model>
! <model name='AuthorBooks' packageName='AuthorBooks' adaptorName='Postgresql' connectionDictionary="{'database': 'AUTHOR_BOOKS', 'user': 'postgres', 'password': '', 'host': 'localhost'}">
<entity isReadOnly='0' externalName='WRITER' name='Writer' parentEntity='' className='Writer' typeName='Writer' isAbstract='0'>
<primaryKey attributeName='id'/>
--- 1,5 ----
<?xml version='1.0' encoding='iso-8859-1'?>
! <!-- <!DOCTYPE model SYSTEM "mdl_model.dtd"> -->
! <model name='AuthorBooks' packageName='AuthorBooks' adaptorName='' connectionDictionary="{'database': 'AUTHOR_BOOKS', 'user': '', 'password': '', 'host': ''}">
<entity isReadOnly='0' externalName='WRITER' name='Writer' parentEntity='' className='Writer' typeName='Writer' isAbstract='0'>
<primaryKey attributeName='id'/>
***************
*** 7,16 ****
<attributesUsedForLocking attributeName='lastName'/>
<attributesUsedForLocking attributeName='age'/>
! <attribute isClassProperty='1' width='40' columnName='FIRST_NAME' isRequired='0' precision='0' defaultValue='None' externalType='VARCHAR' name='firstName' scale='0' type='string' displayLabel='First Name'/>
! <attribute isClassProperty='1' width='30' columnName='LAST_NAME' isRequired='1' precision='0' defaultValue='None' externalType='VARCHAR' name='lastName' scale='0' type='string' displayLabel='Last Name'/>
! <attribute isClassProperty='1' width='0' columnName='AGE' isRequired='0' precision='0' defaultValue='0' externalType='INTEGER' name='age' scale='0' type='int' displayLabel='Age'/>
! <attribute isClassProperty='0' width='0' columnName='ID' isRequired='1' precision='0' defaultValue='0' externalType='INTEGER' name='id' scale='0' type='int' displayLabel=''/>
! <attribute isClassProperty='0' width='0' columnName='FK_WRITER_ID' isRequired='0' precision='0' defaultValue='0' externalType='INTEGER' name='FK_Writer_id' scale='0' type='int' displayLabel=''/>
! <attribute isClassProperty='1' width='0' columnName='BIRTHDAY' isRequired='0' precision='0' defaultValue='None' externalType='TIMESTAMP' name='birthday' scale='0' type='DateTime' displayLabel='birthday'/>
<relation deleteRule='2' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Book' name='books' displayLabel='' joinSemantic='0'>
<join sourceAttribute='id' destinationAttribute='FK_Writer_Id'/>
--- 7,16 ----
<attributesUsedForLocking attributeName='lastName'/>
<attributesUsedForLocking attributeName='age'/>
! <attribute isClassProperty='1' columnName='FIRST_NAME' name='firstName' isRequired='0' precision='0' defaultValue='None' externalType='VARCHAR' width='40' scale='0' type='string' displayLabel='First Name'/>
! <attribute isClassProperty='1' columnName='LAST_NAME' name='lastName' isRequired='1' precision='0' defaultValue='None' externalType='VARCHAR' width='30' scale='0' type='string' displayLabel='Last Name'/>
! <attribute isClassProperty='1' columnName='AGE' name='age' isRequired='0' precision='0' defaultValue='0' externalType='INTEGER' width='0' scale='0' type='int' displayLabel='Age'/>
! <attribute isClassProperty='0' columnName='ID' name='id' isRequired='1' precision='0' defaultValue='0' externalType='INTEGER' width='0' scale='0' type='int' displayLabel=''/>
! <attribute isClassProperty='0' columnName='FK_WRITER_ID' name='FK_Writer_id' isRequired='0' precision='0' defaultValue='0' externalType='INTEGER' width='0' scale='0' type='int' displayLabel=''/>
! <attribute isClassProperty='1' columnName='BIRTHDAY' name='birthday' isRequired='0' precision='0' defaultValue='None' externalType='TIMESTAMP' width='0' scale='0' type='DateTime' displayLabel='birthday'/>
<relation deleteRule='2' isClassProperty='1' multiplicityUpperBound='-1' multiplicityLowerBound='0' destinationEntity='Book' name='books' displayLabel='' joinSemantic='0'>
<join sourceAttribute='id' destinationAttribute='FK_Writer_Id'/>
***************
*** 25,32 ****
<attributesUsedForLocking attributeName='id'/>
<attributesUsedForLocking attributeName='FK_Writer_Id'/>
! <attribute isClassProperty='1' width='40' columnName='title' isRequired='1' precision='0' defaultValue='None' externalType='VARCHAR' name='title' scale='0' type='string' displayLabel='Title'/>
! <attribute isClassProperty='0' width='0' columnName='id' isRequired='1' precision='0' defaultValue='0' externalType='INT' name='id' scale='0' type='int' displayLabel=''/>
! <attribute isClassProperty='0' width='0' columnName='FK_WRITER_ID' isRequired='0' precision='0' defaultValue='None' externalType='INTEGER' name='FK_Writer_Id' scale='0' type='string' displayLabel=''/>
! <attribute isClassProperty='1' width='0' columnName='PRICE' isRequired='0' precision='10' defaultValue='None' externalType='NUMERIC' name='price' scale='2' type='float' displayLabel=''/>
<relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='1' multiplicityLowerBound='0' destinationEntity='Writer' name='author' displayLabel='' joinSemantic='0'>
<join sourceAttribute='FK_Writer_Id' destinationAttribute='id'/>
--- 25,32 ----
<attributesUsedForLocking attributeName='id'/>
<attributesUsedForLocking attributeName='FK_Writer_Id'/>
! <attribute isClassProperty='1' columnName='title' name='title' isRequired='1' precision='0' defaultValue='None' externalType='VARCHAR' width='40' scale='0' type='string' displayLabel='Title'/>
! <attribute isClassProperty='1' columnName='id' name='id' isRequired='1' precision='0' defaultValue='0' externalType='INT' width='0' scale='0' type='int' displayLabel=''/>
! <attribute isClassProperty='0' columnName='FK_WRITER_ID' name='FK_Writer_Id' isRequired='0' precision='0' defaultValue='None' externalType='INTEGER' width='0' scale='0' type='string' displayLabel=''/>
! <attribute isClassProperty='1' columnName='PRICE' name='price' isRequired='0' precision='10' defaultValue='None' externalType='NUMERIC' width='0' scale='2' type='float' displayLabel=''/>
<relation deleteRule='0' isClassProperty='1' multiplicityUpperBound='1' multiplicityLowerBound='0' destinationEntity='Writer' name='author' displayLabel='' joinSemantic='0'>
<join sourceAttribute='FK_Writer_Id' destinationAttribute='id'/>
|
