db-ojb-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From arm...@apache.org
Subject cvs commit: db-ojb/src/test/org/apache/ojb repository_junit.xml repository_junit_inheritance.xml
Date Tue, 06 Dec 2005 15:22:21 GMT
arminw      2005/12/06 07:22:21

  Modified:    src/test/org/apache/ojb Tag: OJB_1_0_RELEASE
                        repository_junit.xml
                        repository_junit_inheritance.xml
  Log:
  add comments and update auto-increment settings for "multiple joined tables"-inheritance
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.112.2.18 +15 -8     db-ojb/src/test/org/apache/ojb/repository_junit.xml
  
  Index: repository_junit.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/repository_junit.xml,v
  retrieving revision 1.112.2.17
  retrieving revision 1.112.2.18
  diff -u -r1.112.2.17 -r1.112.2.18
  --- repository_junit.xml	13 Nov 2005 15:45:55 -0000	1.112.2.17
  +++ repository_junit.xml	6 Dec 2005 15:22:20 -0000	1.112.2.18
  @@ -673,12 +673,13 @@
           class="org.apache.ojb.broker.ObjectRepository$F"
           table="TABLE_F">
   
  +        <!-- auto-increment of PK field is handled by base class -->
           <field-descriptor
               name="id"
               column="ID"
               jdbc-type="INTEGER"
               primarykey="true"
  -            autoincrement="true"
  +            autoincrement="false"
           />
   
       	<field-descriptor
  @@ -693,8 +694,9 @@
               column="SOMEVALUE"
               jdbc-type="INTEGER"
           />
  -
  -  		<reference-descriptor name="super" class-ref="org.apache.ojb.broker.ObjectRepository$E">
  +        <!-- use multiple joined table inheritance -->
  +  		<reference-descriptor name="super"
  +            class-ref="org.apache.ojb.broker.ObjectRepository$E">
       		<foreignkey field-ref="eID" />
     		</reference-descriptor>
       </class-descriptor>
  @@ -704,12 +706,13 @@
           class="org.apache.ojb.broker.ObjectRepository$G"
           table="TABLE_G">
   
  +        <!-- auto-increment of PK field is handled by base class -->
           <field-descriptor
               name="id"
               column="ID"
               jdbc-type="INTEGER"
               primarykey="true"
  -            autoincrement="true"
  +            autoincrement="false"
           />
   
       	<field-descriptor
  @@ -725,7 +728,8 @@
               jdbc-type="INTEGER"
           />
   
  -  		<reference-descriptor name="super"
  +            <!-- use multiple joined table inheritance -->
  +          <reference-descriptor name="super"
     			class-ref="org.apache.ojb.broker.ObjectRepository$F">
       		<foreignkey field-ref="fID" />
     		</reference-descriptor>
  @@ -736,6 +740,7 @@
           class="org.apache.ojb.broker.ObjectRepository$F1"
           table="TABLE_F1">
   
  +        <!-- auto-increment of PK field is handled by base class -->
           <field-descriptor
               name="id"
               column="ID"
  @@ -749,7 +754,8 @@
               jdbc-type="INTEGER"
           />
   
  -  		<reference-descriptor name="super"
  +            <!-- use multiple joined table inheritance -->
  +          <reference-descriptor name="super"
     			class-ref="org.apache.ojb.broker.ObjectRepository$E">
       		<foreignkey field-ref="id" />
     		</reference-descriptor>
  @@ -773,7 +779,8 @@
               jdbc-type="INTEGER"
           />
   
  -  		<reference-descriptor name="super"
  +            <!-- use multiple joined table inheritance -->
  +          <reference-descriptor name="super"
     			class-ref="org.apache.ojb.broker.ObjectRepository$F1">
       		<foreignkey field-ref="id" />
     		</reference-descriptor>
  
  
  
  1.1.2.7   +17 -5     db-ojb/src/test/org/apache/ojb/repository_junit_inheritance.xml
  
  Index: repository_junit_inheritance.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/repository_junit_inheritance.xml,v
  retrieving revision 1.1.2.6
  retrieving revision 1.1.2.7
  diff -u -r1.1.2.6 -r1.1.2.7
  --- repository_junit_inheritance.xml	3 Nov 2005 13:13:31 -0000	1.1.2.6
  +++ repository_junit_inheritance.xml	6 Dec 2005 15:22:20 -0000	1.1.2.7
  @@ -131,12 +131,13 @@
   	class="org.apache.ojb.broker.InheritanceMultipleTableTest$Executive"
   	table="INHERITANCE_EXECUTIVE"
    >
  +    <!-- auto-increment of PK field is handled by base class -->
       <field-descriptor
           name="id"
           column="OBJ_ID"
           jdbc-type="INTEGER"
           primarykey="true"
  -        autoincrement="true"
  +        autoincrement="false"
       />
       <field-descriptor
           name="id_2"
  @@ -163,6 +164,7 @@
           access="anonymous"
       />
   
  +    <!-- use multiple joined table inheritance -->
       <reference-descriptor name="super"
           class-ref="org.apache.ojb.broker.InheritanceMultipleTableTest$Employee"
       >
  @@ -185,12 +187,13 @@
   	class="org.apache.ojb.broker.InheritanceMultipleTableTest$Manager"
   	table="INHERITANCE_MANAGER"
    >
  +    <!-- auto-increment of PK field is handled by base class -->
       <field-descriptor
           name="id"
           column="OBJ_ID"
           jdbc-type="INTEGER"
           primarykey="true"
  -        autoincrement="true"
  +        autoincrement="false"
       />
       <field-descriptor
           name="id_2"
  @@ -206,6 +209,7 @@
           jdbc-type="INTEGER"
       />
   
  +    <!-- use multiple joined table inheritance -->
       <reference-descriptor name="super"
           class-ref="org.apache.ojb.broker.InheritanceMultipleTableTest$Executive"
       >
  @@ -230,12 +234,13 @@
   	class="org.apache.ojb.broker.InheritanceMultipleTableTest$Shareholder"
   	table="INHERITANCE_SHAREHOLDER"
    >
  +    <!-- auto-increment of PK field is handled by base class -->
       <field-descriptor
           name="id"
           column="OBJ_ID"
           jdbc-type="INTEGER"
           primarykey="true"
  -        autoincrement="true"
  +        autoincrement="false"
       />
       <field-descriptor
           name="id_2"
  @@ -251,6 +256,7 @@
           jdbc-type="INTEGER"
       />
   
  +    <!-- use multiple joined table inheritance -->
       <reference-descriptor name="super"
           class-ref="org.apache.ojb.broker.InheritanceMultipleTableTest$Manager"
       >
  @@ -361,18 +367,21 @@
   	class="org.apache.ojb.broker.InheritanceMultipleTableTest$Dog"
   	table="INHERITANCE_DOG"
    >
  +    <!-- auto-increment of PK field is handled by base class -->
       <field-descriptor
           name="id"
           column="OBJ_ID"
           jdbc-type="INTEGER"
           primarykey="true"
  -        autoincrement="true"
  +        autoincrement="false"
       />
       <field-descriptor
           name="legs"
           column="LEGS"
           jdbc-type="INTEGER"
       />
  +
  +    <!-- use multiple joined table inheritance -->
       <reference-descriptor name="super"
           class-ref="org.apache.ojb.broker.InheritanceMultipleTableTest$Animal"
       >
  @@ -384,18 +393,21 @@
   	class="org.apache.ojb.broker.InheritanceMultipleTableTest$Food"
   	table="INHERITANCE_FOOD"
    >
  +    <!-- auto-increment of PK field is handled by base class -->
       <field-descriptor
           name="id"
           column="OBJ_ID"
           jdbc-type="INTEGER"
           primarykey="true"
  -        autoincrement="true"
  +        autoincrement="false"
       />
       <field-descriptor
           name="fkAnimal"
           column="FK_ANIMAL"
           jdbc-type="INTEGER"
       />
  +
  +    <!-- use multiple joined table inheritance -->
       <reference-descriptor name="super"
           class-ref="org.apache.ojb.broker.InheritanceMultipleTableTest$Entity"
       >
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org
For additional commands, e-mail: ojb-dev-help@db.apache.org


Mime
View raw message