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/schema ojbtest-schema.xml
Date Tue, 06 Apr 2004 19:22:43 GMT
arminw      2004/04/06 12:22:43

  Modified:    src/test/org/apache/ojb/broker M2NTest.java
               src/schema ojbtest-schema.xml
  Log:
  - add more PK fields to M2NTest test objects to simulate
  multiple PK persistent capable objects
  
  Revision  Changes    Path
  1.4       +47 -1     db-ojb/src/test/org/apache/ojb/broker/M2NTest.java
  
  Index: M2NTest.java
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/test/org/apache/ojb/broker/M2NTest.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- M2NTest.java	5 Apr 2004 17:11:48 -0000	1.3
  +++ M2NTest.java	6 Apr 2004 19:22:43 -0000	1.4
  @@ -719,6 +719,7 @@
       public static class Actor
       {
           private Integer id;
  +        private Integer id2;
           private String name;
           private MovieManageableCollection movies;
   
  @@ -751,6 +752,16 @@
               this.id = id;
           }
   
  +        public Integer getId2()
  +        {
  +            return id2;
  +        }
  +
  +        public void setId2(Integer id2)
  +        {
  +            this.id2 = id2;
  +        }
  +
           public String getName()
           {
               return name;
  @@ -773,8 +784,10 @@
   
           public void setActors(Collection actors);
   
  +        public Integer getIdInt2();
           public Integer getIdInt();
   
  +        public void setIdInt2(Integer id2Int);
           public void setIdInt(Integer idInt);
   
           public String getIdStr();
  @@ -793,6 +806,7 @@
       public static class MovieImpl implements Movie
       {
           private Integer idInt;
  +        private Integer idInt2;
           private String idStr;
           private String title;
           private String description;
  @@ -829,6 +843,16 @@
               this.idInt = idInt;
           }
   
  +        public Integer getIdInt2()
  +        {
  +            return idInt2;
  +        }
  +
  +        public void setIdInt2(Integer idInt2)
  +        {
  +            this.idInt2 = idInt2;
  +        }
  +
           public String getIdStr()
           {
               return idStr;
  @@ -868,7 +892,9 @@
       public static class Role
       {
           private Integer actorId;
  +        private Integer actorId2;
           private Integer movieIntId;
  +        private Integer movieIntId2;
           private String movieStrId;
   
           public Role()
  @@ -888,6 +914,26 @@
           public Integer getMovieIntId()
           {
               return movieIntId;
  +        }
  +
  +        public Integer getMovieIntId2()
  +        {
  +            return movieIntId2;
  +        }
  +
  +        public void setMovieIntId2(Integer movieIntId2)
  +        {
  +            this.movieIntId2 = movieIntId2;
  +        }
  +
  +        public Integer getActorId2()
  +        {
  +            return actorId2;
  +        }
  +
  +        public void setActorId2(Integer actorId2)
  +        {
  +            this.actorId2 = actorId2;
           }
   
           public void setMovieIntId(Integer movieIntId)
  
  
  
  1.73      +6 -0      db-ojb/src/schema/ojbtest-schema.xml
  
  Index: ojbtest-schema.xml
  ===================================================================
  RCS file: /home/cvs/db-ojb/src/schema/ojbtest-schema.xml,v
  retrieving revision 1.72
  retrieving revision 1.73
  diff -u -r1.72 -r1.73
  --- ojbtest-schema.xml	6 Apr 2004 15:29:21 -0000	1.72
  +++ ojbtest-schema.xml	6 Apr 2004 19:22:43 -0000	1.73
  @@ -813,11 +813,13 @@
       <!-- =================================================== -->
       <table name="M2N_TEST_ACTOR">
           <column name="OBJ_ID" required="true" primaryKey="true" type="INTEGER"/>
  +        <column name="OBJ_ID2" required="true" primaryKey="true" type="INTEGER"/>
           <column name="NAME" type="VARCHAR" size="50"/>
       </table>
   
       <table name="M2N_TEST_MOVIE">
           <column name="OBJ_ID_INT" required="true" primaryKey="true" type="INTEGER"/>
  +        <column name="OBJ_ID2_INT" required="true" primaryKey="true" type="INTEGER"/>
           <column name="OBJ_ID_STR" required="true" primaryKey="true" type="VARCHAR" size="150"/>
           <column name="TITLE" type="VARCHAR" size="150"/>
           <column name="DESCRIPTION" type="VARCHAR" size="250"/>
  @@ -825,13 +827,17 @@
   
       <table name="M2N_TEST_ROLE">
           <column name="ACTOR_ID" required="true" primaryKey="true" type="INTEGER"/>
  +        <column name="ACTOR_ID2" required="true" primaryKey="true" type="INTEGER"/>
           <column name="MOVIE_ID_INT" required="true" primaryKey="true" type="INTEGER"/>
  +        <column name="MOVIE_ID2_INT" required="true" primaryKey="true" type="INTEGER"/>
           <column name="MOVIE_ID_STR" required="true" primaryKey="true" type="VARCHAR"
size="150"/>
           <foreign-key foreignTable="M2N_TEST_ACTOR">
               <reference local="ACTOR_ID" foreign="OBJ_ID"/>
  +            <reference local="ACTOR_ID2" foreign="OBJ_ID2"/>
           </foreign-key>
           <foreign-key foreignTable="M2N_TEST_MOVIE">
               <reference local="MOVIE_ID_INT" foreign="OBJ_ID_INT"/>
  +            <reference local="MOVIE_ID2_INT" foreign="OBJ_ID2_INT"/>
               <reference local="MOVIE_ID_STR" foreign="OBJ_ID_STR"/>
           </foreign-key>
       </table>
  
  
  

---------------------------------------------------------------------
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